8247: Custom key bindings are broken for tab navigation (#8250)

There are two code paths for Ctrl+Tab and for everything else:

Ctrl + Tab is working perfectly
* On the first tab navigation TerminalPage::_SelectNextTab resets the
  tab commands, and since palette is not visible selects the relevant
  tab index
* On the second navigation Ctrl+Tab is intercepted by
  CommandPalette::_previewKeyDownHandler and everything works fine

But with custom binding things are screwed:
* On the first tab navigation TerminalPage::_SelectNextTab resets the
  tab commands, and since palette is not visible selects the relevant
  tab index
* On the second navigation keys are not intercepted and thus
  TerminalPage::_SelectNextTab is called again. It resets the commands,
  but now since the palette is visible we simply invoke
  CommandPalette::SelectNextItem. Which in turn misbehaves because no
  item is selected.

The approach for the solution is not to reset anything if the command
palette is already open.

* Manual testing of both custom and non-custom bindings with different
  amount of tabs.

Closes #8247

(cherry picked from commit 0437fe9d8e)

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

@@ -0,0 +1,25 @@
+<details>
+<summary>
+:pencil2: Contributor please read this
+</summary>
+
+By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.
+
+:warning: The command is written for posix shells. You can copy the contents of each `perl` command excluding the outer `'` marks and dropping any `'"`/`"'` quotation mark pairs into a file and then run `perl file.pl` from the root of the repository to run the code. Alternatively, you can manually insert the items...
+
+If the listed items are:
+* ... **misspelled**, then please *correct* them instead of using the command.
+* ... *names*, please add them to `.github/actions/spell-check/dictionary/names.txt`.
+* ... APIs, you can add them to a file in `.github/actions/spell-check/dictionary/`.
+* ... just things you're using, please add them to an appropriate file in `.github/actions/spell-check/expect/`.
+* ... tokens you only need in one place and shouldn't *generally be used*, you can add an item in an appropriate file in `.github/actions/spell-check/patterns/`.
+
+See the `README.md` in each directory for more information.
+
+:microscope: You can test your commits **without** *appending* to a PR by creating a new branch with that extra change and pushing it to your fork. The [:check-spelling](https://github.com/marketplace/actions/check-spelling) action will run in response to your **push** -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. :wink:
+
+</details>
+
+#### :warning: Reviewers
+At present, the action that triggered this message will not show its :x: in this PR unless the branch is within this repository.
+Thus, you **should** make sure that this comment has been addressed before encouraging the merge bot to merge this PR.

.github/actions/spell-check/dictionary/README.md

@@ -1,6 +1,6 @@
-# Allow files are lists of words to accept unconditionally
+# Dictionaries are lists of words to accept unconditionally
 
-While check spelling will complain about an expected word
+While check spelling will complain about a whitelisted word
 which is no longer present, you can include things here even if
 they are not otherwise present in the repository.
 
@@ -8,14 +8,13 @@ E.g., you could include a list of system APIs here, or potential
 contributors (so that if a future commit includes their name,
 it'll be accepted).
 
-## Files
+### Files
 
 | File | Description |
 | ---- | ----------- |
-| [Allow](allow.txt) | Supplements to the dictionary |
+| [Dictionary](dictionary.txt) | Primary US English dictionary |
 | [Chinese](chinese.txt) | Chinese words |
 | [Japanese](japanese.txt) | Japanese words |
 | [Microsoft](microsoft.txt) | Microsoft brand items |
 | [Fonts](fonts.txt) | Font names |
 | [Names](names.txt) | Names of people |
-| [Colors](colors.txt) | Names of color |

.github/actions/spell-check/dictionary/apis.txt

@@ -0,0 +1,56 @@
+ACCEPTFILES
+ACCESSDENIED
+alignof
+bitfield
+bitfields
+CLASSNOTAVAILABLE
+EXPCMDFLAGS
+EXPCMDSTATE
+fullkbd
+futex
+Hashtable
+href
+IAsync
+IBind
+IBox
+IClass
+IComparable
+ICustom
+IDialog
+IDirect
+IExplorer
+IMap
+IObject
+IStorage
+llabs
+LCID
+lround
+LSHIFT
+NCHITTEST
+NCLBUTTONDBLCLK
+NCRBUTTONDBLCLK
+NOAGGREGATION
+NOREDIRECTIONBITMAP
+oaidl
+ocidl
+otms
+OUTLINETEXTMETRICW
+PAGESCROLL
+RETURNCMD
+rfind
+roundf
+RSHIFT
+rx
+schandle
+serializer
+SIZENS
+spsc
+STDCPP
+strchr
+syscall
+tmp
+tx
+userenv
+wcstoui
+XDocument
+XElement

.github/actions/spell-check/dictionary/fonts.txt

@@ -1,10 +1,8 @@
 Consolas
 emoji
-emojis
 Extralight
 Gabriola
 Iosevka
 MDL
 Monofur
 Segoe
-wght

.github/actions/spell-check/dictionary/math.txt

@@ -0,0 +1,3 @@
+powf
+sqrtf
+isnan

.github/actions/spell-check/dictionary/microsoft.txt

@@ -0,0 +1,40 @@
+ACLs
+altform
+appendwttlogging
+backplating
+CPRs
+DACL
+DACLs
+dotnetfeed
+DWINRT
+enablewttlogging
+LKG
+mfcribbon
+microsoft
+microsoftonline
+netcore
+osgvsowi
+pgc
+pgo
+pgosweep
+powerrename
+powershell
+propkey
+pscustomobject
+robocopy
+SACLs
+Shobjidl
+Skype
+sysnative
+systemroot
+taskkill
+tasklist
+tdbuildteamid
+vcruntime
+visualstudio
+VSTHRD
+wlk
+wslpath
+wtl
+wtt
+wttlog

.github/actions/spell-check/dictionary/names.txt

@@ -1,49 +1,34 @@
 Anup
 austdi
-arkthur
 Ballmer
 bhoj
 Bhojwani
-Bluloco
 carlos
 dhowett
 Diviness
 dsafa
 duhowett
-DXP
-ekg
-eryksun
 ethanschoonover
 Firefox
 Gatta
-glsl
-Gravell
 Grie
 Griese
 Hernan
 Howett
 Illhardt
-iquilezles
-italo
 jantari
 jerrysh
 Kaiyu
 kimwalisch
 KMehrain
-KODELIFE
-Kodelife
 Kourosh
 kowalczyk
 leonmsft
 Lepilleur
-lhecker
 lukesampson
-Macbook
 Manandhar
-masserano
 mbadolato
 Mehrain
-menger
 mgravell
 michaelniksa
 michkap
@@ -57,10 +42,7 @@ nvaccess
 nvda
 oising
 oldnewthing
-opengl
 osgwiki
-pabhojwa
-panos
 paulcam
 pauldotknopf
 PGP
@@ -68,18 +50,11 @@ Pham
 Rincewind
 rprichard
 Schoonover
-shadertoy
-Shomnipotence
-simioni
 Somuah
 sonph
 sonpham
 stakx
-talo
-thereses
 Walisch
-WDX
-Wellons
 Wirt
 Wojciech
 zadjii

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

@@ -0,0 +1,63 @@
+(?:^|/)dirs$
+(?:^|/)go\.mod$
+(?:^|/)go\.sum$
+(?:^|/)package-lock\.json$
+(?:^|/)sources(?:|\.dep)$
+SUMS$
+\.ai$
+\.bmp$
+\.cer$
+\.class$
+\.crl$
+\.crt$
+\.csr$
+\.dll$
+\.DS_Store$
+\.eot$
+\.eps$
+\.exe$
+\.gif$
+\.graffle$
+\.gz$
+\.icns$
+\.ico$
+\.jar$
+\.jpeg$
+\.jpg$
+\.key$
+\.lib$
+\.lock$
+\.map$
+\.min\..
+\.mp3$
+\.mp4$
+\.otf$
+\.pbxproj$
+\.pdf$
+\.pem$
+\.png$
+\.psd$
+\.runsettings$
+\.sig$
+\.so$
+\.svg$
+\.svgz$
+\.tar$
+\.tgz$
+\.ttf$
+\.woff
+\.xcf$
+\.xls
+\.xpm$
+\.yml$
+\.zip$
+^consolegit2gitfilters\.json$
+^dep/
+^oss/
+^doc/reference/UTF8-torture-test\.txt$
+^src/interactivity/onecore/BgfxEngine\.
+^src/renderer/wddmcon/WddmConRenderer\.
+^src/terminal/parser/ft_fuzzer/VTCommandFuzzer\.cpp$
+^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
+^\.github/actions/spell-check/
+^\.gitignore$

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

@@ -0,0 +1,7 @@
+autogenerated
+CPPCORECHECK
+Debian
+filepath
+inplace
+KEYBDINPUT
+WINVER

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

@@ -1,23 +1,16 @@
-AAAa
-AAAAA
-AAAAAAAAAAAAA
-AAAAAABBBBBBCCC
-AAAAABBBBBBCCC
-abcd
 abcd
+abcde
+abcdef
+ABCDEFG
+ABCDEFGH
 ABCDEFGHIJ
 abcdefghijk
-ABCDEFGHIJKLMNO
 abcdefghijklmnop
 ABCDEFGHIJKLMNOPQRST
-ABCG
+abcdefghijklmnopqrstuvwxyz
 ABE
-abf
-BBBBB
-BBBBBBBB
-BBBBBCCC
-BBBBCCCCC
 BBGGRR
+BBBBBBBBBBBBBBDDDD
 EFG
 EFGh
 QQQQQQQQQQABCDEFGHIJ
@@ -26,6 +19,7 @@ QQQQQQQQQQABCDEFGHIJKLMNOPQRSTQQQQQQQQQQ
 QQQQQQQQQQABCDEFGHIJPQRSTQQQQQQQQQQ
 qrstuvwxyz
 qwerty
+QWERTYUIOP
 qwertyuiopasdfg
 YYYYYYYDDDDDDDDDDD
 ZAAZZ
@@ -37,4 +31,3 @@ ZYXWVUT
 ZZBBZ
 ZZZBB
 ZZZBZ
-ZZZZZ

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

@@ -0,0 +1,15 @@
+http
+td
+www
+ecma
+rapidtables
+WCAG
+freedesktop
+ycombinator
+robertelder
+kovidgoyal
+leonerd
+fixterms
+uk
+winui
+appshellintegration

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

@@ -0,0 +1,22 @@
+https://(?:(?:[-a-zA-Z0-9?&=]*\.|)microsoft\.com)/[-a-zA-Z0-9?&=_#\/.]*
+https://aka\.ms/[-a-zA-Z0-9?&=\/_]*
+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-]+\.githubusercontent\.com/[-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)
+(?:0[Xx]|\\x|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]{0,2}\b
+microsoft/cascadia-code\@[0-9a-fA-F]{40}
+\d+x\d+Logo
+Scro\&ll
+# selectionInput.cpp
+ :\\windows\\syste\b
+TestUtils::VerifyExpectedString\(tb, L"[^"]+"
+(?:hostSm|mach)\.ProcessString\(L"[^"]+"
+\b([A-Za-z])\1{3,}\b
+Base64::s_(?:En|De)code\(L"[^"]+"
+VERIFY_ARE_EQUAL\(L"[^"]+"
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\+/"
+std::memory_order_[\w]+

.github/actions/spelling/README.md

@@ -1,15 +0,0 @@
-# check-spelling/check-spelling configuration
-
-File | Purpose | Format | Info
--|-|-|-
-[allow/*.txt](allow/) | Add words to the dictionary | one word per line (only letters and `'`s allowed) | [allow](https://github.com/check-spelling/check-spelling/wiki/Configuration#allow)
-[reject.txt](reject.txt) | Remove words from the dictionary (after allow) | grep pattern matching whole dictionary words | [reject](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-reject)
-[excludes.txt](excludes.txt) | Files to ignore entirely | perl regular expression | [excludes](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-excludes)
-[patterns/*.txt](patterns/) | Patterns to ignore from checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
-[candidate.patterns](candidate.patterns) | Patterns that might be worth adding to [patterns.txt](patterns.txt) | perl regular expression with optional comment block introductions (all matches will be suggested) | [candidates](https://github.com/check-spelling/check-spelling/wiki/Feature:-Suggest-patterns)
-[line_forbidden.patterns](line_forbidden.patterns) | Patterns to flag in checked lines | perl regular expression (order matters, first match wins) | [patterns](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-patterns)
-[expect/*.txt](expect.txt) | Expected words that aren't in the dictionary | one word per line (sorted, alphabetically) | [expect](https://github.com/check-spelling/check-spelling/wiki/Configuration#expect)
-[advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
-
-Note: you can replace any of these files with a directory by the same name (minus the suffix)
-and then include multiple files inside that directory (with that suffix) to merge multiple files together.

.github/actions/spelling/advice.md

@@ -1,48 +0,0 @@
-<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
-<details>
-<summary>
-:pencil2: Contributor please read this
-</summary>
-
-By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.
-
-:warning: The command is written for posix shells. If it doesn't work for you, you can manually _add_ (one word per line) / _remove_ items to `expect.txt` and the `excludes.txt` files.
-
-If the listed items are:
-
-* ... **misspelled**, then please *correct* them instead of using the command.
-* ... *names*, please add them to `.github/actions/spelling/allow/names.txt`.
-* ... APIs, you can add them to a file in `.github/actions/spelling/allow/`.
-* ... just things you're using, please add them to an appropriate file in `.github/actions/spelling/expect/`.
-* ... tokens you only need in one place and shouldn't *generally be used*, you can add an item in an appropriate file in `.github/actions/spelling/patterns/`.
-
-See the `README.md` in each directory for more information.
-
-:microscope: You can test your commits **without** *appending* to a PR by creating a new branch with that extra change and pushing it to your fork. The [check-spelling](https://github.com/marketplace/actions/check-spelling) action will run in response to your **push** -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. :wink:
-
-
-<details><summary>If the flagged items are :exploding_head: false positives</summary>
-
-If items relate to a ...
-* binary file (or some other file you wouldn't want to check at all).
-
-  Please add a file path to the `excludes.txt` file matching the containing file.
-
-  File paths are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
-
-  `^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
-../tree/HEAD/README.md) (on whichever branch you're using).
-
-* well-formed pattern.
-
-  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
-  try adding it to the `patterns.txt` file.
-
-  Patterns are Perl 5 Regular Expressions - you can [test](
-https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
-
-  Note that patterns can't match multiline strings.
-</details>
-
-</details>

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

@@ -1,108 +0,0 @@
-admins
-allcolors
-Apc
-apc
-breadcrumb
-breadcrumbs
-bsd
-calt
-ccmp
-changelog
-clickable
-clig
-CMMI
-copyable
-cybersecurity
-dalet
-Dcs
-dcs
-dialytika
-dje
-downside
-downsides
-dze
-dzhe
-EDDB
-EDDC
-Enum'd
-Fitt
-formattings
-FTCS
-ftp
-fvar
-gantt
-gcc
-geeksforgeeks
-ghe
-github
-gje
-godbolt
-hostname
-hostnames
-https
-hyperlink
-hyperlinking
-hyperlinks
-iconify
-img
-inlined
-It'd
-kje
-libfuzzer
-libuv
-liga
-lje
-Llast
-llvm
-Lmid
-locl
-lol
-lorem
-Lorigin
-maxed
-minimalistic
-mkmk
-mnt
-mru
-nje
-noreply
-ogonek
-ok'd
-overlined
-pipeline
-postmodern
-ptys
-qof
-qps
-rclt
-reimplementation
-reserialization
-reserialize
-reserializes
-rlig
-runtimes
-shcha
-slnt
-Sos
-ssh
-timeline
-timelines
-timestamped
-TLDR
-tokenizes
-tonos
-toolset
-tshe
-ubuntu
-uiatextrange
-UIs
-und
-unregister
-versioned
-vsdevcmd
-We'd
-wildcards
-XBox
-YBox
-yeru
-zhe

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

@@ -1,248 +0,0 @@
-ACCEPTFILES
-ACCESSDENIED
-acl
-aclapi
-alignas
-alignof
-APPLYTOSUBMENUS
-appxrecipe
-bitfield
-bitfields
-BUILDBRANCH
-BUILDMSG
-BUILDNUMBER
-BYCOMMAND
-BYPOSITION
-charconv
-CLASSNOTAVAILABLE
-CLOSEAPP
-cmdletbinding
-COLORPROPERTY
-colspan
-COMDLG
-commandlinetoargv
-comparand
-cstdint
-CXICON
-CYICON
-Dacl
-dataobject
-dcomp
-DERR
-dlldata
-DNE
-DONTADDTORECENT
-DWMSBT
-DWMWA
-DWMWA
-DWORDLONG
-endfor
-ENDSESSION
-enumset
-environstrings
-EXPCMDFLAGS
-EXPCMDSTATE
-filetime
-FILTERSPEC
-FORCEFILESYSTEM
-FORCEMINIMIZE
-frac
-fullkbd
-futex
-GETDESKWALLPAPER
-GETHIGHCONTRAST
-GETMOUSEHOVERTIME
-Hashtable
-HIGHCONTRASTON
-HIGHCONTRASTW
-hotkeys
-href
-hrgn
-HTCLOSE
-hwinsta
-HWINSTA
-IActivation
-IApp
-IAppearance
-IAsync
-IBind
-IBox
-IClass
-IComparable
-IComparer
-IConnection
-ICustom
-IDialog
-IDirect
-IExplorer
-IFACEMETHOD
-IFile
-IGraphics
-IInheritable
-IMap
-IMonarch
-IObject
-iosfwd
-IPackage
-IPeasant
-ISetup
-isspace
-IStorage
-istream
-IStringable
-ITab
-ITaskbar
-itow
-IUri
-IVirtual
-KEYSELECT
-LCID
-llabs
-llu
-localtime
-lround
-Lsa
-lsass
-LSHIFT
-LTGRAY
-MAINWINDOW
-memchr
-memicmp
-MENUCOMMAND
-MENUDATA
-MENUINFO
-MENUITEMINFOW
-mmeapi
-MOUSELEAVE
-mov
-mptt
-msappx
-MULTIPLEUSE
-NCHITTEST
-NCLBUTTONDBLCLK
-NCMOUSELEAVE
-NCMOUSEMOVE
-NCRBUTTONDBLCLK
-NIF
-NIN
-NOAGGREGATION
-NOASYNC
-NOCHANGEDIR
-NOPROGRESS
-NOREDIRECTIONBITMAP
-NOREPEAT
-NOTIFYBYPOS
-NOTIFYICON
-NOTIFYICONDATA
-ntprivapi
-oaidl
-ocidl
-ODR
-offsetof
-ofstream
-onefuzz
-osver
-OSVERSIONINFOEXW
-otms
-OUTLINETEXTMETRICW
-overridable
-PACL
-PAGESCROLL
-PATINVERT
-PEXPLICIT
-PICKFOLDERS
-pmr
-ptstr
-QUERYENDSESSION
-rcx
-REGCLS
-RETURNCMD
-rfind
-ROOTOWNER
-roundf
-RSHIFT
-SACL
-schandle
-semver
-serializer
-SETVERSION
-SHELLEXECUTEINFOW
-shobjidl
-SHOWHIDE
-SHOWMINIMIZED
-SHOWTIP
-SINGLEUSE
-SIZENS
-smoothstep
-snprintf
-spsc
-sregex
-SRWLOC
-SRWLOCK
-STDCPP
-STDMETHOD
-strchr
-strcpy
-streambuf
-strtoul
-Stubless
-Subheader
-Subpage
-syscall
-SYSTEMBACKDROP
-TABROW
-TASKBARCREATED
-TBPF
-THEMECHANGED
-tlg
-TME
-tmp
-tmpdir
-tolower
-toupper
-TRACKMOUSEEVENT
-TTask
-TVal
-UChar
-UFIELD
-ULARGE
-UOI
-UPDATEINIFILE
-userenv
-USEROBJECTFLAGS
-Viewbox
-virtualalloc
-wcsstr
-wcstoui
-winmain
-winsta
-winstamin
-wmemcmp
-wpc
-WSF
-wsregex
-wwinmain
-xchg
-XDocument
-XElement
-xfacet
-xhash
-XIcon
-xiosbase
-xlocale
-xlocbuf
-xlocinfo
-xlocmes
-xlocmon
-xlocnum
-xloctime
-XMax
-xmemory
-XParse
-xpath
-xstddef
-xstring
-xtree
-xutility
-YIcon
-YMax

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

@@ -1,117 +0,0 @@
-alice
-aliceblue
-antiquewhite
-blanchedalmond
-blueviolet
-burlywood
-cadetblue
-cornflowerblue
-cornsilk
-cyan
-darkblue
-darkcyan
-darkgoldenrod
-darkgray
-darkgreen
-darkgrey
-darkkhaki
-darkmagenta
-darkolivegreen
-darkorange
-darkorchid
-darkred
-darksalmon
-darkseagreen
-darkslateblue
-darkslategray
-darkslategrey
-darkturquoise
-darkviolet
-deeppink
-deepskyblue
-dimgray
-dimgrey
-dodgerblue
-firebrick
-floralwhite
-forestgreen
-gainsboro
-ghostwhite
-greenyellow
-hotpink
-indian
-indianred
-lavenderblush
-lawngreen
-lemonchiffon
-lightblue
-lightcoral
-lightcyan
-lightgoldenrod
-lightgoldenrodyellow
-lightgray
-lightgreen
-lightgrey
-lightpink
-lightsalmon
-lightseagreen
-lightskyblue
-lightslateblue
-lightslategray
-lightslategrey
-lightsteelblue
-lightyellow
-limegreen
-mediumaquamarine
-mediumblue
-mediumorchid
-mediumpurple
-mediumseagreen
-mediumslateblue
-mediumspringgreen
-mediumturquoise
-mediumvioletred
-midnightblue
-mintcream
-mistyrose
-navajo
-navajowhite
-navyblue
-oldlace
-olivedrab
-orangered
-palegoldenrod
-palegreen
-paleturquoise
-palevioletred
-papayawhip
-peachpuff
-peru
-powderblue
-rebecca
-rebeccapurple
-rosybrown
-royalblue
-saddlebrown
-sandybrown
-seagreen
-sienna
-skyblue
-slateblue
-slategray
-slategrey
-springgreen
-steelblue
-violetred
-webgray
-webgreen
-webgrey
-webmaroon
-webpurple
-whitesmoke
-xaroon
-xray
-xreen
-xrey
-xurple
-yellowgreen

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

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

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

@@ -1,85 +0,0 @@
-ACLs
-ADMINS
-advapi
-altform
-altforms
-appendwttlogging
-appx
-appxbundle
-appxerror
-appxmanifest
-ATL
-backplating
-bitmaps
-BOMs
-CPLs
-cpptools
-cppvsdbg
-CPRs
-cryptbase
-DACL
-DACLs
-defaultlib
-diffs
-disposables
-dotnetfeed
-DTDs
-DWINRT
-enablewttlogging
-Intelli
-IVisual
-libucrt
-libucrtd
-LKG
-LOCKFILE
-Lxss
-mfcribbon
-microsoft
-microsoftonline
-MSAA
-msixbundle
-MSVC
-MSVCP
-muxc
-netcore
-Onefuzz
-osgvsowi
-PFILETIME
-pgc
-pgo
-pgosweep
-powerrename
-powershell
-propkey
-pscustomobject
-QWORD
-regedit
-robocopy
-SACLs
-sdkddkver
-Shobjidl
-Skype
-SRW
-sxs
-Sysinternals
-sysnative
-systemroot
-taskkill
-tasklist
-tdbuildteamid
-ucrt
-ucrtd
-unvirtualized
-VCRT
-vcruntime
-Virtualization
-visualstudio
-vscode
-VSTHRD
-winsdkver
-wlk
-wslpath
-wtl
-wtt
-wttlog
-Xamarin

.github/actions/spelling/candidate.patterns

@@ -1,523 +0,0 @@
-# marker to ignore all code on line
-^.*/\* #no-spell-check-line \*/.*$
-# marker for ignoring a comment to the end of the line
-// #no-spell-check.*$
-
-# patch hunk comments
-^\@\@ -\d+(?:,\d+|) \+\d+(?:,\d+|) \@\@ .*
-# git index header
-index [0-9a-z]{7,40}\.\.[0-9a-z]{7,40}
-
-# cid urls
-(['"])cid:.*?\g{-1}
-
-# data url in parens
-\(data:[^)]*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})[^)]*\)
-# data url in quotes
-([`'"])data:.*?(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,}).*\g{-1}
-# data url
-data:[-a-zA-Z=;:/0-9+]*,\S*
-
-# mailto urls
-mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
-
-# magnet urls
-magnet:[?=:\w]+
-
-# magnet urls
-"magnet:[^"]+"
-
-# obs:
-"obs:[^"]*"
-
-# The `\b` here means a break, it's the fancy way to handle urls, but it makes things harder to read
-# In this examples content, I'm using a number of different ways to match things to show various approaches
-# asciinema
-\basciinema\.org/a/[0-9a-zA-Z]+
-
-# apple
-\bdeveloper\.apple\.com/[-\w?=/]+
-# Apple music
-\bembed\.music\.apple\.com/fr/playlist/usr-share/[-\w.]+
-
-# appveyor api
-\bci\.appveyor\.com/api/projects/status/[0-9a-z]+
-# appveyor project
-\bci\.appveyor\.com/project/(?:[^/\s"]*/){2}builds?/\d+/job/[0-9a-z]+
-
-# Amazon
-
-# Amazon
-\bamazon\.com/[-\w]+/(?:dp/[0-9A-Z]+|)
-# AWS S3
-\b\w*\.s3[^.]*\.amazonaws\.com/[-\w/&#%_?:=]*
-# AWS execute-api
-\b[0-9a-z]{10}\.execute-api\.[-0-9a-z]+\.amazonaws\.com\b
-# AWS ELB
-\b\w+\.[-0-9a-z]+\.elb\.amazonaws\.com\b
-# AWS SNS
-\bsns\.[-0-9a-z]+.amazonaws\.com/[-\w/&#%_?:=]*
-# AWS VPC
-vpc-\w+
-
-# While you could try to match `http://` and `https://` by using `s?` in `https?://`, sometimes there
-# YouTube url
-\b(?:(?:www\.|)youtube\.com|youtu.be)/(?:channel/|embed/|user/|playlist\?list=|watch\?v=|v/|)[-a-zA-Z0-9?&=_%]*
-# YouTube music
-\bmusic\.youtube\.com/youtubei/v1/browse(?:[?&]\w+=[-a-zA-Z0-9?&=_]*)
-# YouTube tag
-<\s*youtube\s+id=['"][-a-zA-Z0-9?_]*['"]
-# YouTube image
-\bimg\.youtube\.com/vi/[-a-zA-Z0-9?&=_]*
-# Google Accounts
-\baccounts.google.com/[-_/?=.:;+%&0-9a-zA-Z]*
-# Google Analytics
-\bgoogle-analytics\.com/collect.[-0-9a-zA-Z?%=&_.~]*
-# Google APIs
-\bgoogleapis\.(?:com|dev)/[a-z]+/(?:v\d+/|)[a-z]+/[-@:./?=\w+|&]+
-# Google Storage
-\b[-a-zA-Z0-9.]*\bstorage\d*\.googleapis\.com(?:/\S*|)
-# Google Calendar
-\bcalendar\.google\.com/calendar(?:/u/\d+|)/embed\?src=[@./?=\w&%]+
-\w+\@group\.calendar\.google\.com\b
-# Google DataStudio
-\bdatastudio\.google\.com/(?:(?:c/|)u/\d+/|)(?:embed/|)(?:open|reporting|datasources|s)/[-0-9a-zA-Z]+(?:/page/[-0-9a-zA-Z]+|)
-# The leading `/` here is as opposed to the `\b` above
-# ... a short way to match `https://` or `http://` since most urls have one of those prefixes
-# Google Docs
-/docs\.google\.com/[a-z]+/(?:ccc\?key=\w+|(?:u/\d+|d/(?:e/|)[0-9a-zA-Z_-]+/)?(?:edit\?[-\w=#.]*|/\?[\w=&]*|))
-# Google Drive
-\bdrive\.google\.com/(?:file/d/|open)[-0-9a-zA-Z_?=]*
-# Google Groups
-\bgroups\.google\.com/(?:(?:forum/#!|d/)(?:msg|topics?|searchin)|a)/[^/\s"]+/[-a-zA-Z0-9$]+(?:/[-a-zA-Z0-9]+)*
-# Google Maps
-\bmaps\.google\.com/maps\?[\w&;=]*
-# Google themes
-themes\.googleusercontent\.com/static/fonts/[^/\s"]+/v\d+/[^.]+.
-# Google CDN
-\bclients2\.google(?:usercontent|)\.com[-0-9a-zA-Z/.]*
-# Goo.gl
-/goo\.gl/[a-zA-Z0-9]+
-# Google Chrome Store
-\bchrome\.google\.com/webstore/detail/[-\w]*(?:/\w*|)
-# Google Books
-\bgoogle\.(?:\w{2,4})/books(?:/\w+)*\?[-\w\d=&#.]*
-# Google Fonts
-\bfonts\.(?:googleapis|gstatic)\.com/[-/?=:;+&0-9a-zA-Z]*
-# Google Forms
-\bforms\.gle/\w+
-# Google Scholar
-\bscholar\.google\.com/citations\?user=[A-Za-z0-9_]+
-# Google Colab Research Drive
-\bcolab\.research\.google\.com/drive/[-0-9a-zA-Z_?=]*
-
-# GitHub SHAs (api)
-\bapi.github\.com/repos(?:/[^/\s"]+){3}/[0-9a-f]+\b
-# GitHub SHAs (markdown)
-(?:\[`?[0-9a-f]+`?\]\(https:/|)/(?:www\.|)github\.com(?:/[^/\s"]+){2,}(?:/[^/\s")]+)(?:[0-9a-f]+(?:[-0-9a-zA-Z/#.]*|)\b|)
-# GitHub SHAs
-\bgithub\.com(?:/[^/\s"]+){2}[@#][0-9a-f]+\b
-# GitHub wiki
-\bgithub\.com/(?:[^/]+/){2}wiki/(?:(?:[^/]+/|)_history|[^/]+(?:/_compare|)/[0-9a-f.]{40,})\b
-# githubusercontent
-/[-a-z0-9]+\.githubusercontent\.com/[-a-zA-Z0-9?&=_\/.]*
-# githubassets
-\bgithubassets.com/[0-9a-f]+(?:[-/\w.]+)
-# gist github
-\bgist\.github\.com/[^/\s"]+/[0-9a-f]+
-# git.io
-\bgit\.io/[0-9a-zA-Z]+
-# GitHub JSON
-"node_id": "[-a-zA-Z=;:/0-9+]*"
-# Contributor
-\[[^\]]+\]\(https://github\.com/[^/\s"]+\)
-# GHSA
-GHSA(?:-[0-9a-z]{4}){3}
-
-# GitLab commit
-\bgitlab\.[^/\s"]*/\S+/\S+/commit/[0-9a-f]{7,16}#[0-9a-f]{40}\b
-# GitLab merge requests
-\bgitlab\.[^/\s"]*/\S+/\S+/-/merge_requests/\d+/diffs#[0-9a-f]{40}\b
-# GitLab uploads
-\bgitlab\.[^/\s"]*/uploads/[-a-zA-Z=;:/0-9+]*
-# GitLab commits
-\bgitlab\.[^/\s"]*/(?:[^/\s"]+/){2}commits?/[0-9a-f]+\b
-
-# binanace
-accounts.binance.com/[a-z/]*oauth/authorize\?[-0-9a-zA-Z&%]*
-
-# bitbucket diff
-\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}diff(?:stat|)(?:/[^/\s"]+){2}:[0-9a-f]+
-# bitbucket repositories commits
-\bapi\.bitbucket\.org/\d+\.\d+/repositories/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
-# bitbucket commits
-\bbitbucket\.org/(?:[^/\s"]+/){2}commits?/[0-9a-f]+
-
-# bit.ly
-\bbit\.ly/\w+
-
-# bitrise
-\bapp\.bitrise\.io/app/[0-9a-f]*/[\w.?=&]*
-
-# bootstrapcdn.com
-\bbootstrapcdn\.com/[-./\w]+
-
-# cdn.cloudflare.com
-\bcdnjs\.cloudflare\.com/[./\w]+
-
-# circleci
-\bcircleci\.com/gh(?:/[^/\s"]+){1,5}.[a-z]+\?[-0-9a-zA-Z=&]+
-
-# gitter
-\bgitter\.im(?:/[^/\s"]+){2}\?at=[0-9a-f]+
-
-# gravatar
-\bgravatar\.com/avatar/[0-9a-f]+
-
-# ibm
-[a-z.]*ibm\.com/[-_#=:%!?~.\\/\d\w]*
-
-# imgur
-\bimgur\.com/[^.]+
-
-# Internet Archive
-\barchive\.org/web/\d+/(?:[-\w.?,'/\\+&%$#_:]*)
-
-# discord
-/discord(?:app\.com|\.gg)/(?:invite/)?[a-zA-Z0-9]{7,}
-
-# Disqus
-\bdisqus\.com/[-\w/%.()!?&=_]*
-
-# medium link
-\blink\.medium\.com/[a-zA-Z0-9]+
-# medium
-\bmedium\.com/\@?[^/\s"]+/[-\w]+
-
-# microsoft
-\b(?:https?://|)(?:(?:download\.visualstudio|docs|msdn2?|research)\.microsoft|blogs\.msdn)\.com/[-_a-zA-Z0-9()=./%]*
-# powerbi
-\bapp\.powerbi\.com/reportEmbed/[^"' ]*
-# vs devops
-\bvisualstudio.com(?::443|)/[-\w/?=%&.]*
-# microsoft store
-\bmicrosoft\.com/store/apps/\w+
-
-# mvnrepository.com
-\bmvnrepository\.com/[-0-9a-z./]+
-
-# now.sh
-/[0-9a-z-.]+\.now\.sh\b
-
-# oracle
-\bdocs\.oracle\.com/[-0-9a-zA-Z./_?#&=]*
-
-# chromatic.com
-/\S+.chromatic.com\S*[")]
-
-# codacy
-\bapi\.codacy\.com/project/badge/Grade/[0-9a-f]+
-
-# compai
-\bcompai\.pub/v1/png/[0-9a-f]+
-
-# mailgun api
-\.api\.mailgun\.net/v3/domains/[0-9a-z]+\.mailgun.org/messages/[0-9a-zA-Z=@]*
-# mailgun
-\b[0-9a-z]+.mailgun.org
-
-# /message-id/
-/message-id/[-\w@./%]+
-
-# Reddit
-\breddit\.com/r/[/\w_]*
-
-# requestb.in
-\brequestb\.in/[0-9a-z]+
-
-# sched
-\b[a-z0-9]+\.sched\.com\b
-
-# Slack url
-slack://[a-zA-Z0-9?&=]+
-# Slack
-\bslack\.com/[-0-9a-zA-Z/_~?&=.]*
-# Slack edge
-\bslack-edge\.com/[-a-zA-Z0-9?&=%./]+
-# Slack images
-\bslack-imgs\.com/[-a-zA-Z0-9?&=%.]+
-
-# shields.io
-\bshields\.io/[-\w/%?=&.:+;,]*
-
-# stackexchange -- https://stackexchange.com/feeds/sites
-\b(?:askubuntu|serverfault|stack(?:exchange|overflow)|superuser).com/(?:questions/\w+/[-\w]+|a/)
-
-# Sentry
-[0-9a-f]{32}\@o\d+\.ingest\.sentry\.io\b
-
-# Twitter markdown
-\[\@[^[/\]:]*?\]\(https://twitter.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)\)
-# Twitter hashtag
-\btwitter\.com/hashtag/[\w?_=&]*
-# Twitter status
-\btwitter\.com/[^/\s"')]*(?:/status/\d+(?:\?[-_0-9a-zA-Z&=]*|)|)
-# Twitter profile images
-\btwimg\.com/profile_images/[_\w./]*
-# Twitter media
-\btwimg\.com/media/[-_\w./?=]*
-# Twitter link shortened
-\bt\.co/\w+
-
-# facebook
-\bfburl\.com/[0-9a-z_]+
-# facebook CDN
-\bfbcdn\.net/[\w/.,]*
-# facebook watch
-\bfb\.watch/[0-9A-Za-z]+
-
-# dropbox
-\bdropbox\.com/sh?/[^/\s"]+/[-0-9A-Za-z_.%?=&;]+
-
-# ipfs protocol
-ipfs://[0-9a-z]*
-# ipfs url
-/ipfs/[0-9a-z]*
-
-# w3
-\bw3\.org/[-0-9a-zA-Z/#.]+
-
-# loom
-\bloom\.com/embed/[0-9a-f]+
-
-# regex101
-\bregex101\.com/r/[^/\s"]+/\d+
-
-# figma
-\bfigma\.com/file(?:/[0-9a-zA-Z]+/)+
-
-# freecodecamp.org
-\bfreecodecamp\.org/[-\w/.]+
-
-# image.tmdb.org
-\bimage\.tmdb\.org/[/\w.]+
-
-# mermaid
-\bmermaid\.ink/img/[-\w]+|\bmermaid-js\.github\.io/mermaid-live-editor/#/edit/[-\w]+
-
-# Wikipedia
-\ben\.wikipedia\.org/wiki/[-\w%.#]+
-
-# gitweb
-[^"\s]+/gitweb/\S+;h=[0-9a-f]+
-
-# HyperKitty lists
-/archives/list/[^@/]+\@[^/\s"]*/message/[^/\s"]*/
-
-# lists
-/thread\.html/[^"\s]+
-
-# list-management
-\blist-manage\.com/subscribe(?:[?&](?:u|id)=[0-9a-f]+)+
-
-# kubectl.kubernetes.io/last-applied-configuration
-"kubectl.kubernetes.io/last-applied-configuration": ".*"
-
-# pgp
-\bgnupg\.net/pks/lookup[?&=0-9a-zA-Z]*
-
-# Spotify
-\bopen\.spotify\.com/embed/playlist/\w+
-
-# Mastodon
-\bmastodon\.[-a-z.]*/(?:media/|\@)[?&=0-9a-zA-Z_]*
-
-# scastie
-\bscastie\.scala-lang\.org/[^/]+/\w+
-
-# images.unsplash.com
-\bimages\.unsplash\.com/(?:(?:flagged|reserve)/|)[-\w./%?=%&.;]+
-
-# pastebin
-\bpastebin\.com/[\w/]+
-
-# heroku
-\b\w+\.heroku\.com/source/archive/\w+
-
-# quip
-\b\w+\.quip\.com/\w+(?:(?:#|/issues/)\w+)?
-
-# badgen.net
-\bbadgen\.net/badge/[^")\]'\s]+
-
-# statuspage.io
-\w+\.statuspage\.io\b
-
-# media.giphy.com
-\bmedia\.giphy\.com/media/[^/]+/[\w.?&=]+
-
-# tinyurl
-\btinyurl\.com/\w+
-
-# getopts
-\bgetopts\s+(?:"[^"]+"|'[^']+')
-
-# ANSI color codes
-(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
-
-# URL escaped characters
-\%[0-9A-F][A-F]
-# IPv6
-\b(?:[0-9a-fA-F]{0,4}:){3,7}[0-9a-fA-F]{0,4}\b
-# c99 hex digits (not the full format, just one I've seen)
-0x[0-9a-fA-F](?:\.[0-9a-fA-F]*|)[pP]
-# Punycode
-\bxn--[-0-9a-z]+
-# sha
-sha\d+:[0-9]*[a-f]{3,}[0-9a-f]*
-# sha-... -- uses a fancy capture
-(['"]|&quot;)[0-9a-f]{40,}\g{-1}
-# hex runs
-\b[0-9a-fA-F]{16,}\b
-# hex in url queries
-=[0-9a-fA-F]*?(?:[A-F]{3,}|[a-f]{3,})[0-9a-fA-F]*?&
-# ssh
-(?:ssh-\S+|-nistp256) [-a-zA-Z=;:/0-9+]{12,}
-
-# PGP
-\b(?:[0-9A-F]{4} ){9}[0-9A-F]{4}\b
-# GPG keys
-\b(?:[0-9A-F]{4} ){5}(?: [0-9A-F]{4}){5}\b
-# Well known gpg keys
-.well-known/openpgpkey/[\w./]+
-
-# uuid:
-\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
-# hex digits including css/html color classes:
-(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
-# integrity
-integrity="sha\d+-[-a-zA-Z=;:/0-9+]{40,}"
-
-# https://www.gnu.org/software/groff/manual/groff.html
-# man troff content
-\\f[BCIPR]
-# '
-\\\(aq
-
-# .desktop mime types
-^MimeTypes?=.*$
-# .desktop localized entries
-^[A-Z][a-z]+\[[a-z]+\]=.*$
-# Localized .desktop content
-Name\[[^\]]+\]=.*
-
-# IServiceProvider
-\bI(?=(?:[A-Z][a-z]{2,})+\b)
-
-# crypt
-"\$2[ayb]\$.{56}"
-
-# scrypt / argon
-\$(?:scrypt|argon\d+[di]*)\$\S+
-
-# Input to GitHub JSON
-content: "[-a-zA-Z=;:/0-9+]*="
-
-# Python stringprefix / binaryprefix
-# Note that there's a high false positive rate, remove the `?=` and search for the regex to see if the matches seem like reasonable strings
-(?<!')\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'(?:[A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})
-
-# Regular expressions for (P|p)assword
-\([A-Z]\|[a-z]\)[a-z]+
-
-# JavaScript regular expressions
-# javascript test regex
-/.*/[gim]*\.test\(
-# javascript match regex
-\.match\(/[^/\s"]*/[gim]*\s*
-# javascript match regex
-\.match\(/\\[b].*?/[gim]*\s*\)(?:;|$)
-# javascript regex
-^\s*/\\[b].*/[gim]*\s*(?:\)(?:;|$)|,$)
-# javascript replace regex
-\.replace\(/[^/\s"]*/[gim]*\s*,
-
-# Go regular expressions
-regexp?\.MustCompile\(`[^`]*`\)
-
-# sed regular expressions
-sed 's/(?:[^/]*?[a-zA-Z]{3,}[^/]*?/){2}
-
-# go install
-go install(?:\s+[a-z]+\.[-@\w/.]+)+
-
-# kubernetes pod status lists
-# https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#pod-phase
-\w+(?:-\w+)+\s+\d+/\d+\s+(?:Running|Pending|Succeeded|Failed|Unknown)\s+
-
-# kubectl - pods in CrashLoopBackOff
-\w+-[0-9a-f]+-\w+\s+\d+/\d+\s+CrashLoopBackOff\s+
-
-# kubernetes object suffix
--[0-9a-f]{10}-\w{5}\s
-
-# posthog secrets
-posthog\.init\((['"])phc_[^"',]+\g{-1},
-
-# xcode
-
-# xcodeproject scenes
-(?:Controller|ID|id)="\w{3}-\w{2}-\w{3}"
-
-# xcode api botches
-customObjectInstantitationMethod
-
-# font awesome classes
-\.fa-[-a-z0-9]+
-
-# Update Lorem based on your content (requires `ge` and `w` from https://github.com/jsoref/spelling; and `review` from https://github.com/check-spelling/check-spelling/wiki/Looking-for-items-locally )
-# grep '^[^#].*lorem' .github/actions/spelling/patterns.txt|perl -pne 's/.*i..\?://;s/\).*//' |tr '|' "\n"|sort -f |xargs -n1 ge|perl -pne 's/^[^:]*://'|sort -u|w|sed -e 's/ .*//'|w|review -
-# Warning, while `(?i)` is very neat and fancy, if you have some binary files that aren't proper unicode, you might run into:
-## Operation "substitution (s///)" returns its argument for non-Unicode code point 0x1C19AE (the code point will vary).
-## You could manually change `(?i)X...` to use `[Xx]...`
-## or you could add the files to your `excludes` file (a version after 0.0.19 should identify the file path)
-# Lorem
-(?:\w|\s|[,.])*\b(?i)(?:amet|consectetur|cursus|dolor|eros|ipsum|lacus|libero|ligula|lorem|magna|neque|nulla|suscipit|tempus)\b(?:\w|\s|[,.])*
-
-# Non-English
-[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
-
-# French
-# This corpus only had capital letters, but you probably want lowercase ones as well.
-\b[LN]'+[a-z]{2,}\b
-
-# latex
-\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
-
-# the negative lookahead here is to allow catching 'templatesz' as a misspelling
-# but to otherwise recognize a Windows path with \templates\foo.template or similar:
-\\(?:necessary|r(?:eport|esolve[dr]?|esult)|t(?:arget|emplates?))(?![a-z])
-# ignore long runs of a single character:
-\b([A-Za-z])\g{-1}{3,}\b
-# Note that the next example is no longer necessary if you are using
-# to match a string starting with a `#`, use a character-class:
-[#]backwards
-# version suffix <word>v#
-(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
-# Compiler flags (Scala)
-(?:^|[\t ,>"'`=(])-J-[DPWXY](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
-# Compiler flags
-#(?:^|[\t ,"'`=(])-[DPWXYLlf](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
-
-# Compiler flags (linker)
-,-B
-# curl arguments
-\b(?:\\n|)curl(?:\s+-[a-zA-Z]{1,2}\b)*(?:\s+-[a-zA-Z]{3,})(?:\s+-[a-zA-Z]+)*
-# set arguments
-\bset(?:\s+-[abefimouxE]{1,2})*\s+-[abefimouxE]{3,}(?:\s+-[abefimouxE]+)*
-# tar arguments
-\b(?:\\n|)g?tar(?:\.exe|)(?:(?:\s+--[-a-zA-Z]+|\s+-[a-zA-Z]+|\s[ABGJMOPRSUWZacdfh-pr-xz]+\b)(?:=[^ ]*|))+
-# tput arguments -- https://man7.org/linux/man-pages/man5/terminfo.5.html -- technically they can be more than 5 chars long...
-\btput\s+(?:(?:-[SV]|-T\s*\w+)\s+)*\w{3,5}\b
-# macOS temp folders
-/var/folders/\w\w/[+\w]+/(?:T|-Caches-)/

.github/actions/spelling/excludes.txt

@@ -1,117 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-excludes
-(?:(?i)\.png$)
-(?:^|/)(?i)COPYRIGHT
-(?:^|/)(?i)LICEN[CS]E
-(?:^|/)3rdparty/
-(?:^|/)dirs$
-(?:^|/)go\.mod$
-(?:^|/)go\.sum$
-(?:^|/)package(?:-lock|)\.json$
-(?:^|/)sources(?:|\.dep)$
-(?:^|/)vendor/
-\.a$
-\.ai$
-\.avi$
-\.bmp$
-\.bz2$
-\.cer$
-\.class$
-\.crl$
-\.crt$
-\.csr$
-\.dll$
-\.docx?$
-\.drawio$
-\.DS_Store$
-\.eot$
-\.eps$
-\.exe$
-\.gif$
-\.gitattributes$
-\.graffle$
-\.gz$
-\.icns$
-\.ico$
-\.jar$
-\.jks$
-\.jpeg$
-\.jpg$
-\.key$
-\.lib$
-\.lock$
-\.map$
-\.min\..
-\.mod$
-\.mp3$
-\.mp4$
-\.o$
-\.ocf$
-\.otf$
-\.pbxproj$
-\.pdf$
-\.pem$
-\.png$
-\.psd$
-\.pyc$
-\.runsettings$
-\.s$
-\.sig$
-\.so$
-\.svg$
-\.svgz$
-\.svgz?$
-\.tar$
-\.tgz$
-\.tiff?$
-\.ttf$
-\.vsdx$
-\.wav$
-\.webm$
-\.webp$
-\.woff
-\.woff2?$
-\.xcf$
-\.xls
-\.xlsx?$
-\.xpm$
-\.yml$
-\.zip$
-^\.github/actions/spelling/
-^\.github/fabricbot.json$
-^\.gitignore$
-^\Q.git-blame-ignore-revs\E$
-^\Q.github/workflows/spelling.yml\E$
-^\Qdoc/reference/windows-terminal-logo.ans\E$
-^\Qsamples/ConPTY/EchoCon/EchoCon/EchoCon.vcxproj.filters\E$
-^\Qsrc/host/exe/Host.EXE.vcxproj.filters\E$
-^\Qsrc/host/ft_host/chafa.txt\E$
-^\Qsrc/tools/closetest/CloseTest.vcxproj.filters\E$
-^\XamlStyler.json$
-^build/config/
-^consolegit2gitfilters\.json$
-^dep/
-^doc/reference/master-sequence-list.csv$
-^doc/reference/UTF8-torture-test\.txt$
-^oss/
-^src/host/ft_uia/run\.bat$
-^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$
-^src/tools/pixels/pixels\.bat$
-^src/tools/texttests/fira\.txt$
-^src/tools/U8U16Test/(?:fr|ru|zh)\.txt$
-^src/types/ut_types/UtilsTests.cpp$
-^tools/ReleaseEngineering/ServicingPipeline.ps1$
-ignore$
-SUMS$

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

@@ -1,6 +0,0 @@
-WCAG
-winui
-appshellintegration
-mdtauk
-gfycat
-Guake

.github/actions/spelling/line_forbidden.patterns

@@ -1,62 +0,0 @@
-# reject `m_data` as there's a certain OS which has evil defines that break things if it's used elsewhere
-# \bm_data\b
-
-# If you have a framework that uses `it()` for testing and `fit()` for debugging a specific test,
-# you might not want to check in code where you were debugging w/ `fit()`, in which case, you might want
-# to use this:
-#\bfit\(
-
-# s.b. GitHub
-\bGithub\b
-
-# s.b. GitLab
-\bGitlab\b
-
-# s.b. JavaScript
-\bJavascript\b
-
-# s.b. Microsoft
-\bMicroSoft\b
-
-# s.b. another
-\ban[- ]other\b
-
-# s.b. greater than
-\bgreater then\b
-
-# s.b. into
-#\sin to\s
-
-# s.b. opt-in
-\sopt in\s
-
-# s.b. less than
-\bless then\b
-
-# s.b. otherwise
-\bother[- ]wise\b
-
-# s.b. nonexistent
-\bnon existing\b
-\b[Nn]o[nt][- ]existent\b
-
-# s.b. preexisting
-[Pp]re[- ]existing
-
-# s.b. preempt
-[Pp]re[- ]empt\b
-
-# s.b. preemptively
-[Pp]re[- ]emptively
-
-# s.b. reentrancy
-[Rr]e[- ]entrancy
-
-# s.b. reentrant
-[Rr]e[- ]entrant
-
-# s.b. workaround(s)
-#\bwork[- ]arounds?\b
-
-# Reject duplicate words
-\s([A-Z]{3,}|[A-Z][a-z]{2,}|[a-z]{3,})\s\g{-1}\s

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

@@ -1,96 +0,0 @@
-# See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
-
-https?://\S+
-[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)
-(?:0[Xx]|\\x|U\+|#)[a-f0-9A-FGgRr]{2,}[Uu]?[Ll]{0,2}\b
-microsoft/cascadia-code\@[0-9a-fA-F]{40}
-\d+x\d+Logo
-Scro\&ll
-# selectionInput.cpp
- :\\windows\\syste\b
-TestUtils::VerifyExpectedString\(tb, L"[^"]+"
-(?:hostSm|mach)\.ProcessString\(L"[^"]+"
-\b([A-Za-z])\g{-1}{3,}\b
-0x[0-9A-Za-z]+
-Base64::s_(?:En|De)code\(L"[^"]+"
-VERIFY_ARE_EQUAL\(L"[^"]+"
-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789\+/"
-std::memory_order_[\w]+
-D2DERR_SHADER_COMPILE_FAILED
-TIL_FEATURE_[0-9A-Z_]+
-vcvars\w*
-ROY\sG\.\sBIV
-!(?:(?i)ESC)!\[
-!(?:(?i)CSI)!(?:\d+(?:;\d+|)m|[ABCDF])
-
-# Python stringprefix / binaryprefix
-\b(?:B|BR|Br|F|FR|Fr|R|RB|RF|Rb|Rf|U|UR|Ur|b|bR|br|f|fR|fr|r|rB|rF|rb|rf|u|uR|ur)'
-
-# Automatically suggested patterns
-# hit-count: 3831 file-count: 582
-# IServiceProvider
-\bI(?=(?:[A-Z][a-z]{2,})+\b)
-
-# hit-count: 71 file-count: 35
-# Compiler flags
-(?:^|[\t ,"'`=(])-[D](?=[A-Z]{2,}|[A-Z][a-z])
-(?:^|[\t ,"'`=(])-[X](?=[A-Z]{2,}|[A-Z][a-z]|[a-z]{2,})
-
-# hit-count: 41 file-count: 28
-# version suffix <word>v#
-(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
-
-# hit-count: 20 file-count: 9
-# hex runs
-\b[0-9a-fA-F]{16,}\b
-
-# hit-count: 10 file-count: 7
-# uuid:
-\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b
-
-# hit-count: 4 file-count: 4
-# mailto urls
-mailto:[-a-zA-Z=;:/?%&0-9+@.]{3,}
-
-# hit-count: 4 file-count: 1
-# ANSI color codes
-(?:\\(?:u00|x)1b|\x1b)\[\d+(?:;\d+|)m
-
-# hit-count: 2 file-count: 1
-# latex
-\\(?:n(?:ew|ormal|osub)|r(?:enew)|t(?:able(?:of|)|he|itle))(?=[a-z]+)
-
-# hit-count: 1 file-count: 1
-# hex digits including css/html color classes:
-(?:[\\0][xX]|\\u|[uU]\+|#x?|\%23)[0-9_a-fA-FgGrR]*?[a-fA-FgGrR]{2,}[0-9_a-fA-FgGrR]*(?:[uUlL]{0,3}|u\d+)\b
-
-# hit-count: 1 file-count: 1
-# Non-English
-[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
-
-# hit-count: 1 file-count: 1
-# French
-# This corpus only had capital letters, but you probably want lowercase ones as well.
-\b[LN]'+[a-z]{2,}\b
-
-# acceptable duplicates
-# ls directory listings
-[-bcdlpsw](?:[-r][-w][-sx]){3}\s+\d+\s+(\S+)\s+\g{-1}\s+\d+\s+
-# C/idl types + English ...
-\s(Guid|long|LONG|that) \g{-1}\s
-
-# javadoc / .net
-(?:[\\@](?:groupname|param)|(?:public|private)(?:\s+static|\s+readonly)*)\s+(\w+)\s+\g{-1}\s
-
-# Commit message -- Signed-off-by and friends
-^\s*(?:(?:Based-on-patch|Co-authored|Helped|Mentored|Reported|Reviewed|Signed-off)-by|Thanks-to): (?:[^<]*<[^>]*>|[^<]*)\s*$
-
-# Autogenerated revert commit message
-^This reverts commit [0-9a-f]{40}\.$
-
-# vtmode
---vtmode\s+(\w+)\s+\g{-1}\s
-
-# ignore long runs of a single character:
-\b([A-Za-z])\g{-1}{3,}\b

.github/actions/spelling/reject.txt

@@ -1,12 +0,0 @@
-^attache$
-^attacher$
-^attachers$
-benefitting
-occurences?
-^dependan.*
-^oer$
-Sorce
-^[Ss]pae.*
-^untill$
-^untilling$
-^wether.*

.github/linters/.markdown-lint.yml

@@ -1,40 +0,0 @@
----
-###########################
-###########################
-## Markdown Linter rules ##
-###########################
-###########################
-
-# Linter rules doc:
-# - https://github.com/DavidAnson/markdownlint
-#
-# Note:
-# To comment out a single error:
-#   <!-- markdownlint-disable -->
-#   any violations you want
-#   <!-- markdownlint-restore -->
-#
-# To run the linter locally:
-# 1. install the npm package:
-#    `npm install -g markdownlint-cli`
-# 2. Then run it in the root of the repo with
-#    `markdownlint -c .github\linters\.markdown-lint.yml ./*.md`
-
-###############
-# Rules by id #
-###############
-MD004: false                  # Unordered list style
-MD007:
-  indent: 2                   # Unordered list indentation
-MD013:
-  line_length: 400            # Line length 80 is far to short
-MD026:
-  punctuation: ".,;:!。，；:"  # List of not allowed
-MD029: false                  # Ordered list item prefix
-MD033: false                  # Allow inline HTML
-MD036: false                  # Emphasis used instead of a heading
-
-#################
-# Rules by tags #
-#################
-blank_lines: false  # Error on blank lines

.github/workflows/linter.yml

@@ -1,51 +0,0 @@
----
-###########################
-###########################
-## Linter GitHub Actions ##
-###########################
-###########################
-name: Lint Code Base
-
-#
-# Documentation:
-# https://help.github.com/en/articles/workflow-syntax-for-github-actions
-#
-
-#############################
-# Start the job on all push #
-#############################
-on:
-  pull_request:
-    branches: [master]
-
-###############
-# Set the Job #
-###############
-jobs:
-  build:
-    # Name the Job
-    name: Lint Code Base
-    # Set the agent to run on
-    runs-on: ubuntu-latest
-
-    ##################
-    # Load all steps #
-    ##################
-    steps:
-      ##########################
-      # Checkout the code base #
-      ##########################
-      - name: Checkout Code
-        uses: actions/checkout@v2
-
-      ################################
-      # Run Linter against code base #
-      ################################
-      - name: Lint Code Base
-        uses: github/super-linter@v3.10.0
-        env:
-          VALIDATE_ALL_CODEBASE: false
-          DEFAULT_BRANCH: master
-          MARKDOWN_CONFIG_FILE: .markdown-lint.yml
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VALIDATE_EDITORCONFIG: false

.github/workflows/spelling.yml

@@ -0,0 +1,20 @@
+name: Spell checking
+on:
+  push:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron: '15 * * * *'
+
+jobs:
+  build:
+    name: Spell checking
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2.0.0
+      with:
+        fetch-depth: 5
+    - uses: check-spelling/check-spelling@0.0.16-alpha
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        bucket: .github/actions
+        project: spell-check

.github/workflows/spelling2.yml

@@ -1,134 +0,0 @@
-# spelling.yml is blocked per https://github.com/check-spelling/check-spelling/security/advisories/GHSA-g86g-chm8-7r2p
-name: Spell checking
-
-# Comment management is handled through a secondary job, for details see:
-# https://github.com/check-spelling/check-spelling/wiki/Feature%3A-Restricted-Permissions
-#
-# `jobs.comment-push` runs when a push is made to a repository and the `jobs.spelling` job needs to make a comment
-#   (in odd cases, it might actually run just to collapse a commment, but that's fairly rare)
-#   it needs `contents: write` in order to add a comment.
-#
-# `jobs.comment-pr` runs when a pull_request is made to a repository and the `jobs.spelling` job needs to make a comment
-#   or collapse a comment (in the case where it had previously made a comment and now no longer needs to show a comment)
-#   it needs `pull-requests: write` in order to manipulate those comments.
-
-# Updating pull request branches is managed via comment handling.
-# For details, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-expect-list
-#
-# These elements work together to make it happen:
-#
-# `on.issue_comment`
-#   This event listens to comments by users asking to update the metadata.
-#
-# `jobs.update`
-#   This job runs in response to an issue_comment and will push a new commit
-#   to update the spelling metadata.
-#
-# `with.experimental_apply_changes_via_bot`
-#   Tells the action to support and generate messages that enable it
-#   to make a commit to update the spelling metadata.
-#
-# `with.ssh_key`
-#   In order to trigger workflows when the commit is made, you can provide a
-#   secret (typically, a write-enabled github deploy key).
-#
-#   For background, see: https://github.com/check-spelling/check-spelling/wiki/Feature:-Update-with-deploy-key
-
-on:
-  push:
-    branches:
-    - "**"
-    tags-ignore:
-    - "**"
-  pull_request_target:
-    branches:
-    - "**"
-    tags-ignore:
-    - "**"
-    types:
-    - 'opened'
-    - 'reopened'
-    - 'synchronize'
-  issue_comment:
-    types:
-    - 'created'
-
-jobs:
-  spelling:
-    name: Spell checking
-    permissions:
-      contents: read
-      pull-requests: read
-      actions: read
-    outputs:
-      followup: ${{ steps.spelling.outputs.followup }}
-    runs-on: ubuntu-latest
-    if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'"
-    concurrency:
-      group: spelling-${{ github.event.pull_request.number || github.ref }}
-      # note: If you use only_check_changed_files, you do not want cancel-in-progress
-      cancel-in-progress: true
-    steps:
-    - name: check-spelling
-      id: spelling
-      uses: check-spelling/check-spelling@v0.0.21
-      with:
-        suppress_push_for_open_pull_request: 1
-        checkout: true
-        check_file_names: 1
-        spell_check_this: check-spelling/spell-check-this@prerelease
-        post_comment: 0
-        use_magic_file: 1
-        extra_dictionary_limit: 10
-        extra_dictionaries:
-          cspell:software-terms/src/software-terms.txt
-          cspell:python/src/python/python-lib.txt
-          cspell:node/node.txt
-          cspell:cpp/src/stdlib-c.txt
-          cspell:cpp/src/stdlib-cpp.txt
-          cspell:fullstack/fullstack.txt
-          cspell:filetypes/filetypes.txt
-          cspell:html/html.txt
-          cspell:cpp/src/compiler-msvc.txt
-          cspell:python/src/common/extra.txt
-          cspell:powershell/powershell.txt
-          cspell:aws/aws.txt
-          cspell:cpp/src/lang-keywords.txt
-          cspell:npm/npm.txt
-          cspell:dotnet/dotnet.txt
-          cspell:python/src/python/python.txt
-          cspell:css/css.txt
-          cspell:cpp/src/stdlib-cmath.txt
-        check_extra_dictionaries: ''
-
-  comment-push:
-    name: Report (Push)
-    # If your workflow isn't running on push, you can remove this job
-    runs-on: ubuntu-latest
-    needs: spelling
-    permissions:
-      contents: write
-    if: (success() || failure()) && needs.spelling.outputs.followup && github.event_name == 'push'
-    steps:
-    - name: comment
-      uses: check-spelling/check-spelling@v0.0.21
-      with:
-        checkout: true
-        spell_check_this: check-spelling/spell-check-this@prerelease
-        task: ${{ needs.spelling.outputs.followup }}
-
-  comment-pr:
-    name: Report (PR)
-    # If you workflow isn't running on pull_request*, you can remove this job
-    runs-on: ubuntu-latest
-    needs: spelling
-    permissions:
-      pull-requests: write
-    if: (success() || failure()) && needs.spelling.outputs.followup && contains(github.event_name, 'pull_request')
-    steps:
-    - name: comment
-      uses: check-spelling/check-spelling@v0.0.21
-      with:
-        checkout: true
-        spell_check_this: check-spelling/spell-check-this@prerelease
-        task: ${{ needs.spelling.outputs.followup }}

CONTRIBUTING.md

@@ -140,13 +140,6 @@ Once you've discussed your proposed feature/fix/etc. with a team member, and you
 1. Create & push a feature branch
 1. Create a [Draft Pull Request (PR)](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
 1. Work on your changes
-1. Build and see if it works. Consult [How to build OpenConsole](./doc/building.md) if you have problems.
-
-### Testing
-
-Testing is a key component in the development workflow. Both Windows Terminal and Windows Console use TAEF(the Test Authoring and Execution Framework) as the main framework for testing.
-
-If your changes affect existing test cases, or you're working on brand new features and also the accompanying test cases, see [TAEF](./doc/TAEF.md) for more information about how to validate your work locally.
 
 ### Code Review
 

OpenConsole.sln

@@ -87,8 +87,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Host.Tests.Feature", "src\h
 	ProjectSection(ProjectDependencies) = postProject
 		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
 		{FC802440-AD6A-4919-8F2C-7701F2B38D79} = {FC802440-AD6A-4919-8F2C-7701F2B38D79}
-		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
+		{58A03BB2-DF5A-4B66-91A0-7EF3BA01269A} = {58A03BB2-DF5A-4B66-91A0-7EF3BA01269A}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalParser.UnitTests", "src\terminal\parser\ut_parser\Parser.UnitTests.vcxproj", "{12144E07-FE63-4D33-9231-748B8D8C3792}"
@@ -180,7 +180,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\dll\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 	EndProjectSection
@@ -226,21 +225,16 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "src\cascadia\ut_app\TerminalApp.UnitTests.vcxproj", "{CA5CAD1A-9333-4D05-B12A-1905CBF112F9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "src\cascadia\LocalTests_TerminalApp\TerminalApp.LocalTests.vcxproj", "{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RendererUia", "src\renderer\uia\lib\uia.vcxproj", "{48D21369-3D7B-4431-9967-24E81292CF63}"
@@ -256,8 +250,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestHostApp", "src\cascadia\LocalTests_TerminalApp\TestHostApp\TestHostApp.vcxproj", "{A021EDFF-45C8-4DC2-BEF7-36E1B3B8CFE8}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506} = {CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {CA5CAD1A-9B68-456A-B13E-C8218070DC42}
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDB237B6-1D1D-400F-84CC-40A58FA59C8E}"
@@ -315,24 +307,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "s
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wt", "src\cascadia\wt\wt.vcxproj", "{506FD703-BAA7-4F6E-9361-64F550EC8FCA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings.Model.Lib", "src\cascadia\TerminalSettingsModel\Microsoft.Terminal.Settings.ModelLib.vcxproj", "{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Settings.Model", "src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj", "{CA5CAD1A-082C-4476-9F33-94B339494076}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_SettingsModel", "src\cascadia\LocalTests_SettingsModel\SettingsModel.LocalTests.vcxproj", "{CA5CAD1A-9B68-456A-B13E-C8218070DC42}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
-		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AuditMode|Any CPU = AuditMode|Any CPU
@@ -2012,84 +1986,6 @@ Global
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x64.Build.0 = Release|x64
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x86.ActiveCfg = Release|Win32
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA}.Release|x86.Build.0 = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x64.ActiveCfg = Debug|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x64.Build.0 = Debug|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x86.ActiveCfg = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|x86.Build.0 = Debug|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|ARM64.Build.0 = Release|ARM64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x64.Build.0 = Release|x64
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x86.ActiveCfg = Release|Win32
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|x86.Build.0 = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x64.ActiveCfg = Debug|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x64.Build.0 = Debug|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x86.ActiveCfg = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Debug|x86.Build.0 = Debug|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|ARM64.Build.0 = Release|ARM64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x64.Build.0 = Release|x64
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x86.ActiveCfg = Release|Win32
-		{CA5CAD1A-082C-4476-9F33-94B339494076}.Release|x86.Build.0 = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|DotNet_x86Test.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.AuditMode|x86.Build.0 = AuditMode|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|ARM64.Build.0 = Debug|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|DotNet_x64Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x64.ActiveCfg = Debug|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x64.Build.0 = Debug|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x86.ActiveCfg = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Debug|x86.Build.0 = Debug|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|Any CPU.ActiveCfg = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|ARM64.ActiveCfg = Release|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|ARM64.Build.0 = Release|ARM64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|DotNet_x64Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x64.ActiveCfg = Release|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x64.Build.0 = Release|x64
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.ActiveCfg = Release|Win32
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2170,9 +2066,6 @@ Global
 		{6BAE5851-50D5-4934-8D5E-30361A8A40F3} = {81C352DB-1818-45B7-A284-18E259F1CC87}
 		{1588FD7C-241E-4E7D-9113-43735F3E6BAD} = {59840756-302F-44DF-AA47-441A9D673202}
 		{506FD703-BAA7-4F6E-9361-64F550EC8FCA} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {59840756-302F-44DF-AA47-441A9D673202}
-		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3140B1B7-C8EE-43D1-A772-D82A7061A271}

README.md

@@ -7,25 +7,21 @@ This repository contains the source code for:
 * The Windows console host (`conhost.exe`)
 * Components shared between the two projects
 * [ColorTool](https://github.com/Microsoft/Terminal/tree/master/src/tools/ColorTool)
-* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples)
-  that show how to consume the Windows Console APIs
+* [Sample projects](https://github.com/Microsoft/Terminal/tree/master/samples) that show how to consume the Windows Console APIs
 
 Related repositories include:
 
-* [Windows Terminal Documentation](https://docs.microsoft.com/windows/terminal)
-  ([Repo: Contribute to the docs](https://github.com/MicrosoftDocs/terminal))
+* [Windows Terminal Documentation](https://docs.microsoft.com/windows/terminal) ([Repo: Contribute to the docs](https://github.com/MicrosoftDocs/terminal))
 * [Console API Documentation](https://github.com/MicrosoftDocs/Console-Docs)
 * [Cascadia Code Font](https://github.com/Microsoft/Cascadia-Code)
 
 ## Installing and running Windows Terminal
 
-> 🔴 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later
+> 👉 Note: Windows Terminal requires Windows 10 1903 (build 18362) or later
 
 ### Microsoft Store [Recommended]
 
-Install the [Windows Terminal from the Microsoft Store][store-install-link].
-This allows you to always be on the latest version when we release new builds
-with automatic upgrades.
+Install the [Windows Terminal from the Microsoft Store][store-install-link]. This allows you to always be on the latest version when we release new builds with automatic upgrades.
 
 This is our preferred method.
 
@@ -33,21 +29,16 @@ This is our preferred method.
 
 #### Via GitHub
 
-For users who are unable to install Terminal from the Microsoft Store, Terminal
-builds can be manually downloaded from this repository's [Releases
-page](https://github.com/microsoft/terminal/releases).
+For users who are unable to install Terminal from the Microsoft Store, Terminal builds can be manually downloaded from this repository's [Releases page](https://github.com/microsoft/terminal/releases).
 
-> 🔴 Note: If you install Terminal manually:
+> ⚠ Note: If you install Terminal manually:
 >
-> * Terminal will not auto-update when new builds are released so you will need
->   to regularly install the latest Terminal release to receive all the latest
->   fixes and improvements!
+> * Be sure to install the [Desktop Bridge VC++ v14 Redistributable Package](https://www.microsoft.com/en-us/download/details.aspx?id=53175) otherwise Terminal may not install and/or run and may crash at startup
+> * Terminal will not auto-update when new builds are released so you will need to regularly install the latest Terminal release to receive all the latest fixes and improvements!
 
 #### Via Windows Package Manager CLI (aka winget)
 
-[winget](https://github.com/microsoft/winget-cli) users can download and install
-the latest Terminal release by installing the `Microsoft.WindowsTerminal`
-package:
+[winget](https://github.com/microsoft/winget-cli) users can download and install the latest Terminal release by installing the `Microsoft.WindowsTerminal` package:
 
 ```powershell
 winget install --id=Microsoft.WindowsTerminal -e
@@ -55,8 +46,7 @@ winget install --id=Microsoft.WindowsTerminal -e
 
 #### Via Chocolatey (unofficial)
 
-[Chocolatey](https://chocolatey.org) users can download and install the latest
-Terminal release by installing the `microsoft-windows-terminal` package:
+[Chocolatey](https://chocolatey.org) users can download and install the latest Terminal release by installing the `microsoft-windows-terminal` package:
 
 ```powershell
 choco install microsoft-windows-terminal
@@ -68,15 +58,11 @@ To upgrade Windows Terminal using Chocolatey, run the following:
 choco upgrade microsoft-windows-terminal
 ```
 
-If you have any issues when installing/upgrading the package please go to the
-[Windows Terminal package
-page](https://chocolatey.org/packages/microsoft-windows-terminal) and follow the
-[Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
+If you have any issues when installing/upgrading the package please go to the [Windows Terminal package page](https://chocolatey.org/packages/microsoft-windows-terminal) and follow the [Chocolatey triage process](https://chocolatey.org/docs/package-triage-process)
 
 #### Via Scoop (unofficial)
 
-[Scoop](https://scoop.sh) users can download and install the latest Terminal
-release by installing the `windows-terminal` package:
+[Scoop](https://scoop.sh) users can download and install the latest Terminal release by installing the `windows-terminal` package:
 
 ```powershell
 scoop install windows-terminal
@@ -88,123 +74,70 @@ To update Windows Terminal using Scoop, run the following:
 scoop update windows-terminal
 ```
 
-If you have any issues when installing/updating the package, please search for
-or report the same on the [issues
-page](https://github.com/lukesampson/scoop-extras/issues) of Scoop Extras bucket
-repository.
+If you have any issues when installing/updating the package, please search for or report the same on the [issues page](https://github.com/lukesampson/scoop-extras/issues) of Scoop Extras bucket repository.  
 
 ---
 
 ## Windows Terminal 2.0 Roadmap
 
-The plan for delivering Windows Terminal 2.0 [is described
-here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.
+The plan for delivering Windows Terminal 2.0 [is described here](/doc/terminal-v2-roadmap.md) and will be updated as the project proceeds.
 
 ## Project Build Status
 
 Project|Build Status
 ---|---
-Terminal|[![Terminal Build Status](https://dev.azure.com/ms/Terminal/_apis/build/status/Terminal%20CI?branchName=master)](https://dev.azure.com/ms/Terminal/_build?definitionId=136)
-ColorTool|![Colortool Build Status](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)
+Terminal|[![Build Status](https://dev.azure.com/ms/Terminal/_apis/build/status/Terminal%20CI?branchName=master)](https://dev.azure.com/ms/Terminal/_build?definitionId=136)
+ColorTool|![](https://microsoft.visualstudio.com/_apis/public/build/definitions/c93e867a-8815-43c1-92c4-e7dd5404f1e1/17023/badge)
 
 ---
 
 ## Terminal & Console Overview
 
-Please take a few minutes to review the overview below before diving into the
-code:
+Please take a few minutes to review the overview below before diving into the code:
 
 ### Windows Terminal
 
-Windows Terminal is a new, modern, feature-rich, productive terminal application
-for command-line users. It includes many of the features most frequently
-requested by the Windows command-line community including support for tabs, rich
-text, globalization, configurability, theming & styling, and more.
+Windows Terminal is a new, modern, feature-rich, productive terminal application for command-line users. It includes many of the features most frequently requested by the Windows command-line community including support for tabs, rich text, globalization, configurability, theming & styling, and more.
 
-The Terminal will also need to meet our goals and measures to ensure it remains
-fast and efficient, and doesn't consume vast amounts of memory or power.
+The Terminal will also need to meet our goals and measures to ensure it remains fast and efficient, and doesn't consume vast amounts of memory or power.
 
 ### The Windows Console Host
 
-The Windows Console host, `conhost.exe`, is Windows' original command-line user
-experience. It also hosts Windows' command-line infrastructure and the Windows
-Console API server, input engine, rendering engine, user preferences, etc. The
-console host code in this repository is the actual source from which the
-`conhost.exe` in Windows itself is built.
+The Windows Console host, `conhost.exe`, is Windows' original command-line user experience. It also hosts Windows' command-line infrastructure and the Windows Console API server, input engine, rendering engine, user preferences, etc. The console host code in this repository is the actual source from which the `conhost.exe` in Windows itself is built.
 
-Since taking ownership of the Windows command-line in 2014, the team added
-several new features to the Console, including background transparency,
-line-based selection, support for [ANSI / Virtual Terminal
-sequences](https://en.wikipedia.org/wiki/ANSI_escape_code), [24-bit
-color](https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/),
-a [Pseudoconsole
-("ConPTY")](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/),
-and more.
+Since taking ownership of the Windows command-line in 2014, the team added several new features to the Console, including background transparency, line-based selection, support for [ANSI / Virtual Terminal sequences](https://en.wikipedia.org/wiki/ANSI_escape_code), [24-bit color](https://devblogs.microsoft.com/commandline/24-bit-color-in-the-windows-console/), a [Pseudoconsole ("ConPTY")](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/), and more.
 
-However, because Windows Console's primary goal is to maintain backward
-compatibility, we have been unable to add many of the features the community
-(and the team) have been wanting for the last several years including tabs,
-unicode text, and emoji.
+However, because Windows Console's primary goal is to maintain backward compatibility, we have been unable to add many of the features the community (and the team) have been wanting for the last several years including tabs, unicode text, and emoji.
 
 These limitations led us to create the new Windows Terminal.
 
-> You can read more about the evolution of the command-line in general, and the
-> Windows command-line specifically in [this accompanying series of blog
-> posts](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
-> on the Command-Line team's blog.
+> You can read more about the evolution of the command-line in general, and the Windows command-line specifically in [this accompanying series of blog posts](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/) on the Command-Line team's blog.
 
 ### Shared Components
 
-While overhauling Windows Console, we modernized its codebase considerably,
-cleanly separating logical entities into modules and classes, introduced some
-key extensibility points, replaced several old, home-grown collections and
-containers with safer, more efficient [STL
-containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019),
-and made the code simpler and safer by using Microsoft's [Windows Implementation
-Libraries - WIL](https://github.com/Microsoft/wil).
+While overhauling Windows Console, we modernized its codebase considerably, cleanly separating logical entities into modules and classes, introduced some key extensibility points, replaced several old, home-grown collections and containers with safer, more efficient [STL containers](https://docs.microsoft.com/en-us/cpp/standard-library/stl-containers?view=vs-2019), and made the code simpler and safer by using Microsoft's [Windows Implementation Libraries - WIL](https://github.com/Microsoft/wil).
 
-This overhaul resulted in several of Console's key components being available
-for re-use in any terminal implementation on Windows. These components include a
-new DirectWrite-based text layout and rendering engine, a text buffer capable of
-storing both UTF-16 and UTF-8, a VT parser/emitter, and more.
+This overhaul resulted in several of Console's key components being available for re-use in any terminal implementation on Windows. These components include a new DirectWrite-based text layout and rendering engine, a text buffer capable of storing both UTF-16 and UTF-8, a VT parser/emitter, and more.
 
 ### Creating the new Windows Terminal
 
-When we started planning the new Windows Terminal application, we explored and
-evaluated several approaches and technology stacks. We ultimately decided that
-our goals would be best met by continuing our investment in our C++ codebase,
-which would allow us to reuse several of the aforementioned modernized
-components in both the existing Console and the new Terminal. Further, we
-realized that this would allow us to build much of the Terminal's core itself as
-a reusable UI control that others can incorporate into their own applications.
+When we started planning the new Windows Terminal application, we explored and evaluated several approaches and technology stacks. We ultimately decided that our goals would be best met by continuing our investment in our C++ codebase, which would allow us to reuse several of the aforementioned modernized components in both the existing Console and the new Terminal. Further, we realized that this would allow us to build much of the Terminal's core itself as a reusable UI control that others can incorporate into their own applications.
 
-The result of this work is contained within this repo and delivered as the
-Windows Terminal application you can download from the Microsoft Store, or
-[directly from this repo's
-releases](https://github.com/microsoft/terminal/releases).
+The result of this work is contained within this repo and delivered as the Windows Terminal application you can download from the Microsoft Store, or [directly from this repo's releases](https://github.com/microsoft/terminal/releases).
 
 ---
 
 ## Resources
 
-For more information about Windows Terminal, you may find some of these
-resources useful and interesting:
+For more information about Windows Terminal, you may find some of these resources useful and interesting:
 
 * [Command-Line Blog](https://devblogs.microsoft.com/commandline)
-* [Command-Line Backgrounder Blog
-  Series](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
-* Windows Terminal Launch: [Terminal "Sizzle
-  Video"](https://www.youtube.com/watch?v=8gw0rXPMMPE&list=PLEHMQNlPj-Jzh9DkNpqipDGCZZuOwrQwR&index=2&t=0s)
-* 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)
-* 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)
-* Microsoft Ignite 2019 Session: [The Modern Windows Command Line: Windows
-  Terminal -
-  BRK3321](https://myignite.techcommunity.microsoft.com/sessions/81329?source=sessions)
+* [Command-Line Backgrounder Blog Series](https://devblogs.microsoft.com/commandline/windows-command-line-backgrounder/)
+* Windows Terminal Launch: [Terminal "Sizzle Video"](https://www.youtube.com/watch?v=8gw0rXPMMPE&list=PLEHMQNlPj-Jzh9DkNpqipDGCZZuOwrQwR&index=2&t=0s)
+* 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)
+* 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)
+* Microsoft Ignite 2019 Session: [The Modern Windows Command Line: Windows Terminal - BRK3321](https://myignite.techcommunity.microsoft.com/sessions/81329?source=sessions)
 
 ---
 
@@ -214,50 +147,35 @@ resources useful and interesting:
 
 Cause: You're launching the incorrect solution in Visual Studio.
 
-Solution: Make sure you're building & deploying the `CascadiaPackage` project in
-Visual Studio.
+Solution: Make sure you're building & deploying the `CascadiaPackage` project in Visual Studio.
 
-> ⚠ Note: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic
-> Windows Console that hosts Windows' command-line infrastructure. OpenConsole
-> is used by Windows Terminal to connect to and communicate with command-line
-> applications (via
-> [ConPty](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/)).
+> ⚠ Note: `OpenConsole.exe` is just a locally-built `conhost.exe`, the classic Windows Console that hosts Windows' command-line infrastructure. OpenConsole is used by Windows Terminal to connect to and communicate with command-line applications (via [ConPty](https://devblogs.microsoft.com/commandline/windows-command-line-introducing-the-windows-pseudo-console-conpty/)).
 
 ---
 
 ## Documentation
 
-All project documentation is located at aka.ms/terminal-docs. If you would like
-to contribute to the documentation, please submit a pull request on the [Windows
-Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).
+All project documentation is located at aka.ms/terminal-docs. If you would like to contribute to the documentation, please submit a pull request on the [Windows Terminal Documentation repo](https://github.com/MicrosoftDocs/terminal).
 
 ---
 
 ## Contributing
 
-We are excited to work alongside you, our amazing community, to build and
-enhance Windows Terminal\!
+We are excited to work alongside you, our amazing community, to build and enhance Windows Terminal\!
 
-***BEFORE you start work on a feature/fix***, please read & follow our
-[Contributor's
-Guide](https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md) to
-help avoid any wasted or duplicate effort.
+***BEFORE you start work on a feature/fix***, please read & follow our [Contributor's Guide](https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md) to help avoid any wasted or duplicate effort.
 
 ## Communicating with the Team
 
 The easiest way to communicate with the team is via GitHub issues.
 
-Please file new issues, feature requests and suggestions, but **DO search for
-similar open/closed pre-existing issues before creating a new issue.**
+Please file new issues, feature requests and suggestions, but **DO search for similar open/closed pre-existing issues before creating a new issue.**
 
-If you would like to ask a question that you feel doesn't warrant an issue
-(yet), please reach out to us via Twitter:
+If you would like to ask a question that you feel doesn't warrant an issue (yet), please reach out to us via Twitter:
 
-* Kayla Cinnamon, Program Manager:
-  [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
+* Kayla Cinnamon, Program Manager: [@cinnamon\_msft](https://twitter.com/cinnamon_msft)
 * Dustin Howett, Engineering Lead: [@dhowett](https://twitter.com/DHowett)
-* Michael Niksa, Senior Developer:
-  [@michaelniksa](https://twitter.com/MichaelNiksa)
+* Michael Niksa, Senior Developer: [@michaelniksa](https://twitter.com/MichaelNiksa)
 * Mike Griese, Developer: [@zadjii](https://twitter.com/zadjii)
 * Carlos Zamora, Developer: [@cazamor_msft](https://twitter.com/cazamor_msft)
 * Leon Liang, Developer: [@leonmsft](https://twitter.com/leonmsft)
@@ -267,19 +185,11 @@ If you would like to ask a question that you feel doesn't warrant an issue
 
 ## Prerequisites
 
-* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run
-  Windows Terminal
-* You must [enable Developer Mode in the Windows Settings
-  app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development)
-  to locally install and run Windows Terminal
-* You must have the [Windows 10 1903
-  SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk)
-  installed
-* You must have at least [VS
-  2019](https://visualstudio.microsoft.com/downloads/) installed
-* You must install the following Workloads via the VS Installer. Note: Opening
-  the solution in VS 2019 will [prompt you to install missing components
-  automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
+* You must be running Windows 1903 (build >= 10.0.18362.0) or later to run Windows Terminal
+* You must [enable Developer Mode in the Windows Settings app](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development) to locally install and run Windows Terminal
+* You must have the [Windows 10 1903 SDK](https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk) installed
+* You must have at least [VS 2019](https://visualstudio.microsoft.com/downloads/) installed
+* You must install the following Workloads via the VS Installer. Note: Opening the solution in VS 2019 will [prompt you to install missing components automatically](https://devblogs.microsoft.com/setup/configure-visual-studio-across-your-organization-with-vsconfig/):
   * Desktop Development with C++
   * Universal Windows Platform Development
   * **The following Individual Components**
@@ -287,17 +197,13 @@ If you would like to ask a question that you feel doesn't warrant an issue
 
 ## Building the Code
 
-This repository uses [git
-submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its
-dependencies. To make sure submodules are restored or updated, be sure to run
-the following prior to building:
+This repository uses [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) for some of its dependencies. To make sure submodules are restored or updated, be sure to run the following prior to building:
 
 ```shell
 git submodule update --init --recursive
 ```
 
-OpenConsole.sln may be built from within Visual Studio or from the command-line
-using a set of convenience scripts & tools in the **/tools** directory:
+OpenConsole.sln may be built from within Visual Studio or from the command-line using a set of convenience scripts & tools in the **/tools** directory:
 
 ### Building in PowerShell
 
@@ -316,28 +222,19 @@ bcz
 
 ## Running & Debugging
 
-To debug the Windows Terminal in VS, right click on `CascadiaPackage` (in the
-Solution Explorer) and go to properties. In the Debug menu, change "Application
-process" and "Background task process" to "Native Only".
+To debug the Windows Terminal in VS, right click on `CascadiaPackage` (in the Solution Explorer) and go to properties. In the Debug menu, change "Application process" and "Background task process" to "Native Only".
 
-You should then be able to build & debug the Terminal project by hitting
-<kbd>F5</kbd>.
+You should then be able to build & debug the Terminal project by hitting <kbd>F5</kbd>.
 
-> 👉 You will _not_ be able to launch the Terminal directly by running the
-> WindowsTerminal.exe. For more details on why, see
-> [#926](https://github.com/microsoft/terminal/issues/926),
-> [#4043](https://github.com/microsoft/terminal/issues/4043)
+> 👉 You will _not_ be able to launch the Terminal directly by running the WindowsTerminal.exe. For more details on why, see [#926](https://github.com/microsoft/terminal/issues/926), [#4043](https://github.com/microsoft/terminal/issues/4043)
 
 ### Coding Guidance
 
 Please review these brief docs below about our coding practices.
 
-> 👉 If you find something missing from these docs, feel free to contribute to
-> any of our documentation files anywhere in the repository (or write some new
-> ones!)
+> 👉 If you find something missing from these docs, feel free to contribute to any of our documentation files anywhere in the repository (or write some new ones!)
 
-This is a work in progress as we learn what we'll need to provide people in
-order to be effective contributors to our project.
+This is a work in progress as we learn what we'll need to provide people in order to be effective contributors to our project.
 
 * [Coding Style](https://github.com/Microsoft/Terminal/blob/master/doc/STYLE.md)
 * [Code Organization](https://github.com/Microsoft/Terminal/blob/master/doc/ORGANIZATION.md)
@@ -346,12 +243,10 @@ order to be effective contributors to our project.
 
 ---
 
-## Code of Conduct
+# Code of Conduct
 
-This project has adopted the [Microsoft Open Source Code of
-Conduct][conduct-code]. For more information see the [Code of Conduct
-FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any
-additional questions or comments.
+This project has adopted the [Microsoft Open Source Code of Conduct][conduct-code].
+For more information see the [Code of Conduct FAQ][conduct-FAQ] or contact [opencode@microsoft.com][conduct-email] with any additional questions or comments.
 
 [conduct-code]: https://opensource.microsoft.com/codeofconduct/
 [conduct-FAQ]: https://opensource.microsoft.com/codeofconduct/faq/

SUPPORT.md

@@ -1,17 +0,0 @@
-# Support
-
-## How to file issues and get help  
-
-This project uses [GitHub issues][gh-issue] to [track bugs][gh-bug] and [feature requests][gh-feature]. Please search the existing issues before filing new issues to avoid duplicates. For new topics, file your bug or feature request as a new issue.
-
-For help and questions about using this project, please look at the [docs site for Windows Terminal][docs] and our [Contributor's Guide][contributor] if you want to work on Windows Terminal.
-
-## Microsoft Support Policy  
-
-Support for Windows Terminal is limited to the resources listed above.
-
-[gh-issue]: https://github.com/microsoft/terminal/issues/new/choose
-[gh-bug]: https://github.com/microsoft/terminal/issues/new?assignees=&labels=Issue-Bug&template=bug_report.md&title=
-[gh-feature]: https://github.com/microsoft/terminal/issues/new?assignees=&labels=Issue-Feature&template=Feature_Request.md&title=
-[docs]: https://docs.microsoft.com/windows/terminal
-[contributor]: https://github.com/microsoft/terminal/blob/master/CONTRIBUTING.md

build/pipelines/templates/build-console-steps.yml

@@ -41,8 +41,6 @@ steps:
     configuration: '$(BuildConfiguration)'
     msbuildArgs: "${{ parameters.additionalBuildArguments }}"
     clean: true
-    # The build agents cannot currently support parallel build due to the
-    # memory requirements of our PCH files.
     maximumCpuCount: false
 
 - task: PowerShell@2

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -106,10 +106,6 @@ Try {
         Throw "Failed to find wt.exe/wtd.exe -- check the WAP packaging project"
     }
 
-    If ($null -eq (Get-Item "$AppxPackageRootPath\OpenConsole.exe" -EA:Ignore)) {
-        Throw "Failed to find OpenConsole.exe -- check the WAP packaging project"
-    }
-
 } Finally {
     Remove-Item -Recurse -Force $AppxPackageRootPath
 }

custom.props

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

doc/TAEF.md

@@ -1,30 +1,9 @@
-### TAEF Overview ###
-
+### TAEF ###
 TAEF, the Test Authoring and Execution Framework, is used extensively within the Windows organization to test the operating system code in a unified manner for system, driver, and application code. As the console is a Windows OS Component, we strive to continue using the same system such that tests can be ran in a unified manner both externally to Microsoft as well as inside the official OS Build/Test system.
 
-The [official documentation](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/) for TAEF describes the basic architecture, usage, and functionality of the test system. It is similar to Visual Studio test, but a bit more comprehensive and flexible.
+The [official documentation](https://msdn.microsoft.com/en-us/library/windows/hardware/hh439725\(v=vs.85\).aspx) for TAEF describes the basic architecture, usage, and functionality of the test system. It is similar to Visual Studio test, but a bit more comprehensive and flexible.
 
-### Writing Tests
-
-You may want to read the section [Authoring Tests in C++](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/authoring-tests-in-c--) before getting your hands dirty. Note that the quoted header name in `#include "WexTestClass.h"` might be a bit confusing. You are not required to copy TAEF headers into the project folder.
-
-Use the [TAEF Verify Macros for C++](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/verify) in your test code to perform verifications.
-
-### Running Tests
-
-If you have Visual Studio and related C++ components installed, and you have successfully restored NuGets, you should have the TAEF test runner `te.exe` available locally as part of the `Taef.Redist.Wlk` package.
-
-> Note that you cannot easily run TAEF tests directly through Visual Studio. The `Taef.Redist.Wlk` NuGet package comes with an adapter that will let you browse and execute TAEF tests inside of Visual Studio, but its performance and reliability prevent us from recommending it here.
-
-In a "normal" CMD environment, `te.exe` may not be directly available. Try the following command to set up the development enviroment first:
-
-```shell
-.\tools\razzle.cmd
-```
-
-Then you should be able to use `%TAEF%` as an alias of the actual `te.exe`.
-
-For the purposes of the OpenConsole project, you can run the tests using the `te.exe` that matches the architecture for which the test was built (x86/x64):
+For the purposes of the console project, you can run the tests using the *TE.exe* that matches the architecture for which the test was build (x86/x64) in the pattern
 
 	te.exe Console.Unit.Tests.dll
 
@@ -36,15 +15,6 @@ Limiting the tests to be run is also useful with:
 
 Any pattern of class/method names can be specified after the */name:* flag with wildcard patterns.
 
-For any further details on the functionality of the TAEF test runner, please see the [Executing Tests](https://docs.microsoft.com/en-us/windows-hardware/drivers/taef/executing-tests) section in the official documentation. Or run the embedded help with
+For any further details on the functionality of the TAEF test runner, *TE.exe*, please see the documentation above or run the embedded help with
 
 	te.exe /!
-
-If you use PowerShell, try the following command:
-
-```powershell
-Import-Module .\tools\OpenConsole.psm1
-Invoke-OpenConsoleTests
-```
-
-`Invoke-OpenConsoleTests` supports a number of options, which you can enumerate by running `Invoke-OpenConsoleTests -?`.

doc/cascadia/profiles.schema.json

@@ -26,25 +26,11 @@
       ],
       "type": "string"
     },
-    "BellStyle": {
-      "enum": [
-        "none",
-        "audible"
-      ],
-      "type": "string"
-    },
     "ProfileGuid": {
       "default": "{}",
       "pattern": "^\\{[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\\}$",
       "type": "string"
     },
-    "Icon": {
-      "description": "Image file location or an emoji to be used as an icon. Displays within the tab, the dropdown menu, and jumplist.",
-      "type": [
-        "string",
-        "null"
-      ]
-    },
     "ShortcutActionName": {
       "enum": [
         "adjustFontSize",
@@ -479,14 +465,6 @@
               "type": "array"
             }
           ]
-        },
-        "icon": { "$ref": "#/definitions/Icon" },
-        "name": {
-          "description": "The name that will appear in the command palette. If one isn't provided, the terminal will attempt to automatically generate a name.",
-          "type": [
-            "string",
-            "null"
-          ]
         }
       },
       "required": [
@@ -519,11 +497,6 @@
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
           "$ref": "#/definitions/CopyFormat"
         },
-        "disableAnimations": {
-          "default": false,
-          "description": "When set to `true`, visual animations will be disabled across the application.",
-          "type": "boolean"
-        },
         "largePasteWarning": {
           "default": true,
           "description": "When set to true, trying to paste text with more than 5 KiB of characters will display a warning asking you whether to continue or not with the paste.",
@@ -555,18 +528,18 @@
         },
         "initialCols": {
           "default": 120,
-          "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
+          "description": "The number of columns displayed in the window upon first load.",
           "maximum": 999,
           "minimum": 1,
           "type": "integer"
         },
         "initialPosition": {
           "$ref": "#/definitions/Coordinates",
-          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), the window will be maximized on the monitor specified by those coordinates."
+          "description": "The position of the top left corner of the window upon first load. On a system with multiple displays, these coordinates are relative to the top left of the primary display. If \"launchMode\" is set to maximized, the window will be maximized on the monitor specified by those coordinates."
         },
         "initialRows": {
           "default": 30,
-          "description": "The number of rows displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
+          "description": "The number of rows displayed in the window upon first load.",
           "maximum": 999,
           "minimum": 1,
           "type": "integer"
@@ -578,13 +551,11 @@
         },
         "launchMode": {
           "default": "default",
-          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window. Setting this to \"focus\" is equivalent to launching the terminal in the \"default\" mode, but with the focus mode enabled. Similar, setting this to \"maximizedFocus\" will result in launching the terminal in a maximized window with the focus mode enabled.",
+          "description": "Defines whether the terminal will launch as maximized, full screen, or in a window.",
           "enum": [
             "fullscreen",
             "maximized",
-            "default",
-            "focus",
-            "maximizedFocus"
+            "default"
           ],
           "type": "string"
         },
@@ -649,7 +620,7 @@
           "type": "boolean"
         },
         "useTabSwitcher": {
-          "default": true,
+          "default": false,
           "description": "When set to \"true\", the \"nextTab\" and \"prevTab\" commands will use the tab switcher UI.",
           "type": "boolean"
         }
@@ -724,11 +695,6 @@
           ],
           "type": "string"
         },
-        "bellStyle": {
-          "default": "audible",
-          "description": "Controls what happens when the application emits a BEL character. When set to \"audible\", the Terminal will play a sound. When set to \"none\", nothing will happen.",
-          "$ref": "#/definitions/BellStyle"
-        },
         "closeOnExit": {
           "default": "graceful",
           "description": "Sets how the profile reacts to termination or failure to launch. Possible values:\n -\"graceful\" (close when exit is typed or the process exits normally)\n -\"always\" (always close)\n -\"never\" (never close).\ntrue and false are accepted as synonyms for \"graceful\" and \"never\" respectively.",
@@ -844,7 +810,10 @@
           "minimum": -1,
           "type": "integer"
         },
-        "icon":{ "$ref": "#/definitions/Icon" },
+        "icon": {
+          "description": "Image file location of the icon used in the profile. Displays within the tab and the dropdown menu.",
+          "type": ["string", "null"]
+        },
         "name": {
           "description": "Name of the profile. Displays in the dropdown menu.",
           "minLength": 1,

doc/creating_a_new_project.md

@@ -1,54 +0,0 @@
-# Creating a New Project
-
-## Creating a new WinRT Component DLL and referencing it in another project
-
-When creating a new DLL, it was really helpful to reference an existing DLL's `.vcxproj` like `TerminalControl.vcxproj`. While you should mostly try to copy what the existing `.vcxproj` has, here's a handful of things to double check for as you go along.
-
-- [ ] Make sure to `<Import>` our pre props at the _top_ of the vcxproj, and our post props at the _bottom_ of the vcxproj.
-```
-<!-- pre props --> 
-<Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-<Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-
-<!-- everything else -->
-
-<!-- post props -->
-<Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
-```
-- [ ] Add a `<ProjectReference>` to your new `.vcxproj` in both `WindowsTerminal.vcxproj` and `TerminalApp.vcxproj`
-- [ ] Add a `<Reference>` to `TerminalAppLib.vcxproj` similar to this:
-```
-    <Reference Include="Microsoft.Terminal.NewDLL">
-      <HintPath>$(_BinRoot)TerminalNewDLL\Microsoft.Terminal.NewDLL.winmd</HintPath>
-      <IsWinMDFile>true</IsWinMDFile>
-      <Private>false</Private>
-      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-    </Reference>
-```
-- [ ] Make sure the project has a `.def` file with the following lines. The `WINRT_GetActivationFactory` part is important to expose the new DLL's activation factory so that other projects can successfully call the DLL's `GetActivationFactory` to get the DLL's classes.
-```
-EXPORTS
-DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
-DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE
-```
-- For a bit more context on this whole process, the `AppXManifest.xml` file defines which classes belong to which DLLs. If your project wants class `X.Y.Z`, it can look it up in the manifest's definitions and see that it came from `X.Y.dll`. Then it'll load up the DLL, and call a particular function called `GetActivationFactory(L"X.Y.Z")` to get the class it wants. So, the definitions in `AppXManifest` are _required_ for this activation to work properly, and I found myself double checking the file to see that the definitions I expect are there.
-- _Note_: If your new library eventually rolls up as a reference to our Centennial Packaging project `CascadiaPackage`, you don't have to worry about manually adding your definitions to the `AppXManifest.xml` because the Centennial Packaging project automatically enumerates the reference tree of WinMDs and stitches that information into the `AppXManifest.xml`. However, if your new project does _not_ ultimately roll up to a packaging project that will automatically put the references into `AppXManifest`, you will have to add them in manually.
-
-### Troubleshooting
-- If you hit an error that looks like this: 
-    ```
-    X found processing metadata file ..\blah1\Microsoft.UI.Xaml.winmd, type already exists in file ..\blah\NewDLLProject\Microsoft.UI.Xaml.winmd.
-    ```
-    The `Microsoft.UI.Xaml.winmd` is showing up in the output folder when it shouldn't. Try adding this block at the top of your `.vcxproj`
-    ```
-    <ItemDefinitionGroup>
-    <Reference>
-        <Private>false</Private>
-    </Reference>
-    </ItemDefinitionGroup>
-    ```
-    This will make all references non-private, meaning "don't copy it into my folder" by default.
-
-- If you hit a `Class not Registered` error, this might be because a class isn't getting registered in the app manifest. You can go check `src/cascadia/CascadiaPackage/bin/x64/Debug/AppX/AppXManifest.xml` to see if there exist entries to the classes of your newly created DLL. If the references aren't there, double check that you've added `<ProjectReference>` blocks to both `WindowsTerminal.vcxproj` and `TerminalApp.vcxproj`.
-
-- If you hit an extremely vague error along the lines of `Error in the DLL`, and right before that line you notice that your new DLL is loaded and unloaded right after each other, double check that your new DLL's definitions show up in the `AppXManifest.xml` file. If your new DLL is included as a reference to a project that rolls up to `CascadiaPackage`, double check that you've created a `.def` file for the project. Otherwise if your new project _does not_ roll up to a package that populates the `AppXManifest` references for you, you'll have to add those references yourself.

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

@@ -1,251 +0,0 @@
----
-author: Carlos Zamora @carlos-zamora
-created on: 2020-07-10
-last updated: 2020-07-10
-issue id: [#885](https://github.com/microsoft/terminal/issues/885)
----
-
-# Terminal Settings Model
-
-## Abstract
-
-This spec proposes a major refactor and repurposing of the TerminalSettings project as the TerminalSettingsModel.
- TerminalSettingsModel would be responsible for exposing, serializing, and deserializing settings as WinRT objects
- for Windows Terminal. In doing so, Terminal's settings model is accessible as WinRT objects to existing components
- like TerminalApp, TerminalControl, and TerminalCore. Additionally, Terminal Settings can be used by the Settings UI or
- Shell Extensions to modify or reference Terminal's settings respectively.
-
-## Inspiration
-
-The main driver for this change is the Settings UI. The Settings UI will need to read and modify Terminal's settings
- objects. At the time of writing this spec, the Terminal's settings are serialized as objects in the TerminalApp project.
- To access these objects via XAML, the Settings UI needs them to be WinRT objects. Additional features that need the
- settings objects to be WinRT objects include future shell extensions, like jumplist.
-
-## Solution Design
-
-### Terminal Settings Model: Objects and Projections
-
-The following TerminalApp objects will become WinRT objects and will be moved to the TerminalSettingsModel project
-(formerly TerminalSettings):
-- ColorScheme
-- Profile
-- GlobalAppSettings
-- CascadiaSettings
-
-The TerminalSettingsModel project will have a root namespace of `Microsoft.Terminal.Settings.Model`.
-
-Adjacent to the introduction of these settings objects, `IControlSettings` and `ICoreSettings` will be moved
- to the `Microsoft.Terminal.TerminalControl` namespace. This allows for a better consumption of the
- settings model that is covered later in the (Consumption section)[#terminal-settings-model:-consumption].
-
-#### Moving/Splitting the Action Model
-
-Windows Terminal represents actions via several objects:
-- `AppKeyBindings`: a map of all the defined keybindings and their corresponding actions
-- `ActionAndArgs`: a (de)serializable action (this holds more objects inside of it, but we won't focus on that for now)
-- `ShortcutActionDispatch`: responsible for dispatching events pertinent to a given ActionAndArgs object
-`TerminalApp`'s `TerminalPage` handles any events dispatched by the `ShortcutActionDispatch`.
-
-With the introduction of the TerminalSettingsModel, we will split `AppKeyBindings` using a `KeyMapping` class.
- This separation will look something like the following:
-```c++
-namespace TerminalApp
-{
-    [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.TerminalControl.IKeyBindings
-    {
-        AppKeyBindings();
-
-        // NOTE: It may be possible to move both of these to the constructor instead
-        void SetDispatch(ShortcutActionDispatch dispatch);
-        void SetKeyMap(KeyMapping keymap);
-    }
-}
-
-namespace TerminalSettingsModel
-{
-    [default_interface] runtimeclass KeyMapping
-    {
-        void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.TerminalControl.KeyChord chord);
-        void ClearKeyBinding(Microsoft.Terminal.TerminalControl.KeyChord chord);
-
-        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForAction(ShortcutAction action);
-        Microsoft.Terminal.TerminalControl.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs);
-    }
-}
-```
-This separation leaves `AppKeyBindings` with the responsibility of detecting and dispatching actions, whereas
- `KeyMapping` handles the (de)serialization and navigation of the key bindings.
-
-
-### Terminal Settings Model: Serialization and Deserialization
-
-Introducing these `Microsoft.Terminal.Settings.Model` WinRT objects also allow the serialization and deserialization
- logic from TerminalApp to be moved to TerminalSettings. `JsonUtils` introduces several quick and easy methods
- for setting serialization. This will be moved into the `Microsoft.Terminal.Settings.Model` namespace too.
-
-Deserialization will be an extension of the existing `JsonUtils` `ConversionTrait` struct template. `ConversionTrait`
- already includes `FromJson` and `CanConvert`. Serialization would be handled by a `ToJson` function.
-
-
-### Terminal Settings Model: Warnings and Serialization Errors
-
-Today, if the deserialization of `CascadiaSettings` encounters any errors, an exception is thrown and caught/handled
- by falling back to a simple `CascadiaSettings` object. However, WinRT does not support exceptions.
-
-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.
-
-
-#### TerminalApp: Loading and Reloading Changes
-
-TerminalApp will construct and reference a `CascadiaSettings settings` as follows:
-- TerminalApp will have a global reference to the "settings.json" filepath
-- construct an `CascadiaSettings` using `CascadiaSettings("settings.json")`. This builds an `CascadiaSettings`
-   from the "defaults.json" file data (which is already compiled as a string literal)
-   and layers the settings.json data on top of it.
-- check for errors/warnings, and handle them appropriately
-
-This will be different from the current model which has the settings.json path hardcoded, and is simplified
- to a `LoadAll()` call wrapped in error handlers.
-
-**NOTE:** This model allows us to layer even more settings files on top of the existing Terminal Settings
- Model, if so desired. This could be helpful when importing additional settings files from an external location
- such as a marketplace.
-
-When TerminalApp detects a change to settings.json, it'll repeat the steps above. We could cache the result from
- constructing an `CascadiaSettings` from "defaults.json" data to improve performance.
-
-
-#### TerminalControl: Acquiring and Applying the Settings
-
-At the time of writing this spec, TerminalApp constructs `TerminalControl.TerminalSettings` WinRT objects
- to expose `IControlSettings` and `ICoreSettings` to any hosted terminals. In moving `IControlSettings`
- and `ICoreSettings` down to the TerminalControl layer, TerminalApp can now have better control over
- how to expose relevant settings to a TerminalControl instance.
-
-`TerminalSettings` (which implements `IControlSettings` and `ICoreSettings`) will be moved to
- TerminalApp and act as a bridge connecting `CascadiaSettings` to the TermControl. It will operate
- very similarly as it does today. On construction of the TermControl or hot-reload,
- `TerminalSettings` will be constructed by copying the relevant values of `CascadiaSettings`.
- Then, it will be passed to TermControl (and TermCore by extension).
-
-
-## UI/UX Design
-
-N/A
-
-## Capabilities
-
-### Accessibility
-
-N/A
-
-### Security
-
-N/A
-
-### Reliability
-
-N/A
-
-### Compatibility
-
-N/A
-
-### Performance, Power, and Efficiency
-
-## Potential Issues
-
-N/A
-
-## Future considerations
-
-### TerminalSettings: passing by reference
-
-`TermApp` synthesizes a `TerminalSettings` by copying the relevant values of `CascadiaSettings`,
- then giving it to a Terminal Control. Some visual keybindings and interactions like ctrl+scroll
- and ctrl+shift+scroll to change the font size and acrylic opacity operate by directly modifying
- the value of the instantiated `TerminalSettings`. However, when a settings reload occurs,
- these instanced changes are lost.
-
-`TerminalSettings` can be used as a WinRT object that references (instead of copies) the relevant
- values of `CascadiaSettings`. This would prevent those instanced changes from being lost on a settings
- reload.
-
-Since previewing commands like `setColorScheme` would require a clone of the existing `TerminalSettings`,
- a `Clone` API can be added on `TerminalSettings` to accomplish that. When passing by value,
- `TerminalSettings` can just overwrite the existing property (i.e.: color scheme). When passing
- by reference, a slightly more complex mechanism is required to override the value.
-
-Now, instead of overwriting the value, we need to override the reference to a constant value
-(i.e.: `snapOnInput=true`) or a referenced value (i.e.: `colorScheme`).
-
-### Layering Additional Settings
-As we begin to introduce more sources that affect the settings (via extensions or themes),
- we can introduce a `LayerSettings(String path)`. This layers the new settings file
- onto the existing `CascadiaSettings`. This is already done internally, we would just expose
- it via C++/WinRT.
-
-```c++
-runtimeclass CascadiaSettings
-{
-    // Load a settings file, and layer those changes on top of the existing CascadiaSettings
-    void LayerSettings(String path);
-}
-```
-
-### Settings UI: Modifying and Applying the Settings (DRAFT)
-
-```c++
-runtimeclass CascadiaSettings
-{
-    // Create a copy of the existing CascadiaSettings
-    CascadiaSettings Clone();
-
-    // Compares object to "source" and applies changes to
-    // the settings file at "outPath"
-    void Save(String outPath);
-}
-```
-
-The Settings UI will also have a reference to the `CascadiaSettings settings` from TerminalApp
- as `settingsSource`. When the Settings UI is opened up, the Settings UI will also have its own `CascadiaSettings settingsClone`
- that is a clone of TerminalApp's `CascadiaSettings`.
-```c++
-settingsClone = settingsSource.Clone()
-```
-
-As the user navigates the Settings UI, the relevant contents of `settingsClone` will be retrieved and presented.
- As the user makes changes to the Settings UI, XAML will update `settingsClone` using XAML data binding.
- When the user saves/applies the changes in the XAML, `settingsClone.Save("settings.json")` is called;
- this compares the changes between `settingsClone` and `settingsSource`, then injects the changes (if any) to `settings.json`.
-
-As mentioned earlier, TerminalApp detects a change to "settings.json" to update its `CascadiaSettings`.
- Since the above triggers a change to `settings.json`, TerminalApp will also update itself. When
- something like this occurs, `settingsSource` will automatically be updated too.
-
-In the case that a user is simultaneously updating the settings file directly and the Settings UI,
- `settingsSource` and `settingsClone` can be compared to ensure that the Settings UI, the TerminalApp,
- and the settings files are all in sync.
-
- **NOTE:** In the event that the user would want to export their current configuration, `Save`
- can be used to export the changes to a new file.
-
- ### Reserialization (DRAFT)
-
-After deserializing the settings, injecting the new json into settings.json
- should not remove the existing comments or formatting.
-
-The reserialization process takes place right after comparing the `settingsSource` and `settingsClone` objects.
- For each setting found in the diff, we go to the relevant part of the JSON and see if the key is already there.
- If it is, we update the value to be the one from `settingsClone`. Otherwise, we append the key/value pair
- at the end of the section (much like we do with dynamic profiles in `profiles`).
-
-## Resources
-
-- [Preview Commands](https://github.com/microsoft/terminal/issues/6689)
-- [New JSON Utils](https://github.com/microsoft/terminal/pull/6590)
-- [Spec: Settings UI](https://github.com/microsoft/terminal/pull/6720)

doc/terminal-v2-roadmap.md

@@ -22,14 +22,15 @@ Below is the schedule for when milestones will be included in release builds of
 | Milestone End Date | Milestone Name | Preview Release Blog Post |
 | ------------------ | -------------- | ------------------------- |
 | 2020-06-18 | [1.1] in Windows Terminal Preview | [Windows Terminal Preview 1.1 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-1-release/) |
-| 2020-07-31 | [1.2] in Windows Terminal Preview<br>[1.1] in Windows Terminal | [Windows Terminal Preview 1.2 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-2-release/) |
-| 2020-08-31 | [1.3] in Windows Terminal Preview<br>[1.2] in Windows Terminal | [Windows Terminal Preview 1.3 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-3-release/) |
-| 2020-09-30 | [1.4] in Windows Terminal Preview<br>[1.3] in Windows Terminal | [Windows Terminal Preview 1.4 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-4-release/) |
-| 2020-11-30 | [1.5] in Windows Terminal Preview<br>[1.4] in Windows Terminal | |
-| 2020-12-31 | 1.6 in Windows Terminal Preview<br>[1.5] in Windows Terminal | |
-| 2021-01-31 | 1.7 in Windows Terminal Preview<br>1.6 in Windows Terminal | |
-| 2021-02-28 | 1.8 in Windows Terminal Preview<br>1.8 in Windows Terminal | |
-| 2021-03-31 | 1.9 in Windows Terminal Preview<br>1.9 in Windows Terminal | |
+| 2020-07-31 | [1.2] in Windows Terminal Preview<br>[1.1] in Windows Terminal | |
+| 2020-08-31 | 1.3 in Windows Terminal Preview<br>[1.2] in Windows Terminal | |
+| 2020-09-30 | 1.4 in Windows Terminal Preview<br>1.3 in Windows Terminal | |
+| 2020-10-31 | 1.5 in Windows Terminal Preview<br>1.4 in Windows Terminal | |
+| 2020-11-30 | 1.6 in Windows Terminal Preview<br>1.5 in Windows Terminal | |
+| 2020-12-31 | 1.7 in Windows Terminal Preview<br>1.6 in Windows Terminal | |
+| 2021-01-31 | 1.8 in Windows Terminal Preview<br>1.7 in Windows Terminal | |
+| 2021-02-28 | 1.9 in Windows Terminal Preview<br>1.8 in Windows Terminal | |
+| 2021-03-31 | 1.10 in Windows Terminal Preview<br>1.9 in Windows Terminal | |
 | 2021-04-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
 | 2021-05-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
 
@@ -49,11 +50,11 @@ The following are a list of the key scenarios we're aiming to deliver for Termin
 
 | 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] |
-| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193]<br>Implementation: [#6635] |
+| 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] |
+| 0 | Command palette | A popup menu to list possible actions and commands.<br><br>Issues: [#5400], [#2046]<br>Spec: [#2193] |
 | 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]<br>Spec: [#2080] |
-| 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 | 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] |
+| 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] |
 | 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 tab as admin/other user | Open tab in existing Windows Terminal instance as admin (if Terminal was run unelevated) or as another user.<br><br>Issue: [#5000] |
 | 1 | Traditional opacity | Have a transparent background without the acrylic blur.<br><br>Issue: [#603] |
@@ -61,7 +62,7 @@ The following are a list of the key scenarios we're aiming to deliver for Termin
 | 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 | Jump list | Show profiles from task bar (on right click)/start menu.<br><br>Issue: [#576] |
 | 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] |
@@ -79,26 +80,16 @@ Feature Notes:
 
 [1.1]: https://github.com/microsoft/terminal/milestone/24
 [1.2]: https://github.com/microsoft/terminal/milestone/25
-[1.3]: https://github.com/microsoft/terminal/milestone/26
-[1.4]: https://github.com/microsoft/terminal/milestone/28
-[1.5]: https://github.com/microsoft/terminal/milestone/30
 [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
-[#6904]: https://github.com/microsoft/terminal/pull/6904
-[#7283]: https://github.com/microsoft/terminal/pull/7283
-[#7370]: https://github.com/microsoft/terminal/pull/7370
 [#5400]: https://github.com/microsoft/terminal/issues/5400
 [#2046]: https://github.com/microsoft/terminal/issues/2046
 [#2193]: https://github.com/microsoft/terminal/pull/2193
-[#6635]: https://github.com/microsoft/terminal/pull/6635
 [#1256]: https://github.com/microsoft/terminal/issues/1256
 [#2080]: https://github.com/microsoft/terminal/pull/2080
 [#574]: https://github.com/microsoft/terminal/issues/574
-[#7251]: https://github.com/microsoft/terminal/pull/7251
 [#492]: https://github.com/microsoft/terminal/issues/492
 [#2080]: https://github.com/microsoft/terminal/pull/2080
-[#7414]: https://github.com/microsoft/terminal/pull/7414
 [#3327]: https://github.com/microsoft/terminal/issues/3327
 [#5772]: https://github.com/microsoft/terminal/pull/5772
 [#5000]: https://github.com/microsoft/terminal/issues/5000
@@ -109,7 +100,6 @@ Feature Notes:
 [#1410]: https://github.com/microsoft/terminal/issues/1410
 [#1000]: https://github.com/microsoft/terminal/issues/1000
 [#576]: https://github.com/microsoft/terminal/issues/576
-[#7515]: https://github.com/microsoft/terminal/pull/7515
 [#756]: https://github.com/microsoft/terminal/issues/756
 [#1060]: https://github.com/microsoft/terminal/issues/1060
 [#6100]: https://github.com/microsoft/terminal/pull/6100

src/buffer/out/textBuffer.cpp

@@ -2281,32 +2281,35 @@ std::wstring TextBuffer::GetHyperlinkUriFromId(uint16_t id) const
 // - The user-defined id
 // Return value:
 // - The internal hyperlink ID
-uint16_t TextBuffer::GetHyperlinkId(std::wstring_view params)
+uint16_t TextBuffer::GetHyperlinkId(std::wstring_view uri, std::wstring_view id)
 {
-    uint16_t id = 0;
-    if (params.empty())
+    uint16_t numericId = 0;
+    if (id.empty())
     {
         // no custom id specified, return our internal count
-        id = _currentHyperlinkId;
+        numericId = _currentHyperlinkId;
         ++_currentHyperlinkId;
     }
     else
     {
         // assign _currentHyperlinkId if the custom id does not already exist
-        const auto result = _hyperlinkCustomIdMap.emplace(params, _currentHyperlinkId);
+        std::wstring newId{ id };
+        // hash the URL and add it to the custom ID - GH#7698
+        newId += L"%" + std::to_wstring(std::hash<std::wstring_view>{}(uri));
+        const auto result = _hyperlinkCustomIdMap.emplace(newId, _currentHyperlinkId);
         if (result.second)
         {
             // the custom id did not already exist
             ++_currentHyperlinkId;
         }
-        id = (*(result.first)).second;
+        numericId = (*(result.first)).second;
     }
     // _currentHyperlinkId could overflow, make sure its not 0
     if (_currentHyperlinkId == 0)
     {
         ++_currentHyperlinkId;
     }
-    return id;
+    return numericId;
 }
 
 // Method Description:
@@ -2347,11 +2350,13 @@ std::wstring TextBuffer::GetCustomIdFromId(uint16_t id) const
 }
 
 // Method Description:
-// - Copies the hyperlink/customID maps of the old buffer into this one
+// - Copies the hyperlink/customID maps of the old buffer into this one,
+//   also copies currentHyperlinkId
 // Arguments:
 // - The other buffer
 void TextBuffer::CopyHyperlinkMaps(const TextBuffer& other)
 {
     _hyperlinkMap = other._hyperlinkMap;
     _hyperlinkCustomIdMap = other._hyperlinkCustomIdMap;
+    _currentHyperlinkId = other._currentHyperlinkId;
 }

src/buffer/out/textBuffer.hpp

@@ -143,7 +143,7 @@ public:
 
     void AddHyperlinkToMap(std::wstring_view uri, uint16_t id);
     std::wstring GetHyperlinkUriFromId(uint16_t id) const;
-    uint16_t GetHyperlinkId(std::wstring_view params);
+    uint16_t GetHyperlinkId(std::wstring_view uri, std::wstring_view id);
     void RemoveHyperlinkFromMap(uint16_t id);
     std::wstring GetCustomIdFromId(uint16_t id) const;
     void CopyHyperlinkMaps(const TextBuffer& OtherBuffer);

src/cascadia/CascadiaResources.build.items

@@ -26,7 +26,7 @@
       <Link>ProfileIcons\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
     <!-- Default Settings -->
-    <Content Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\defaults.json">
+    <Content Include="$(OpenConsoleDir)src\cascadia\TerminalApp\defaults.json">
       <DeploymentContent>true</DeploymentContent>
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>

src/cascadia/LocalTests_SettingsModel/LocalTests_SettingsModel.def

@@ -1,3 +0,0 @@
-EXPORTS
-DllCanUnloadNow = WINRT_CanUnloadNow                    PRIVATE
-DllGetActivationFactory = WINRT_GetActivationFactory    PRIVATE

src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <!-- A note about this project: We're building the test code dll from this
-    project, but it _MUST_ be run in conjunction with the TestHostApp project.
-    TestHostApp actually will build a TestHost executable and packaging bits
-    that we can use to run our tests. We need TestHostApp so that our
-    dependencies, like MUX, can be aggregated correctly, and resources properly
-    combined into a resources.pri file.
-
-    TestHostApp will manually copy the output of this project into it's own
-    OutDir, so we can run the tests from there. -->
-
-  <PropertyGroup>
-    <ProjectGuid>{CA5CAD1A-9B68-456A-B13E-C8218070DC42}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SettingsModelLocalTests</RootNamespace>
-    <ProjectName>LocalTests_SettingsModel</ProjectName>
-    <TargetName>SettingsModel.LocalTests</TargetName>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <WindowsTargetPlatformMinVersion>10.0.18362.0</WindowsTargetPlatformMinVersion>
-    <WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
-    <!-- We'll manage our own OutDir/IntDir -->
-    <NoOutputRedirection>true</NoOutputRedirection>
-  </PropertyGroup>
-
-  <PropertyGroup>
-  <!-- Manually change our outdir to be in a subdirectory. We don't really want
-    to put our output in the bin root, because if we do, we'll copy
-    TerminalApp.winmd to the bin root, and then every subsequent mdmerge step
-    (in _any_ cppwinrt project) will automatically try to pick up
-    TerminalApp.winmd as a dependency (which is just wrong). This MUST be done
-    before importing common.build.pre.props -->
-    <OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir>$(SolutionDir)obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-
-  <Import Project="$(SolutionDir)\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
-  <Import Project="$(OpenConsoleDir)\src\cppwinrt.build.pre.props" />
-
-  <!-- ========================= Headers ======================== -->
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-    <ClInclude Include="JsonTestClass.h" />
-  </ItemGroup>
-
-  <!-- ========================= Cpp Files ======================== -->
-  <ItemGroup>
-    <ClCompile Include="ProfileTests.cpp" />
-    <ClCompile Include="ColorSchemeTests.cpp" />
-    <ClCompile Include="KeyBindingsTests.cpp" />
-    <ClCompile Include="CommandTests.cpp" />
-    <ClCompile Include="DeserializationTests.cpp" />
-    <ClCompile Include="pch.cpp">
-      <PrecompiledHeader>Create</PrecompiledHeader>
-    </ClCompile>
-    <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
-    you want to use jsoncpp -->
-    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-
-  <!-- ========================= Project References ======================== -->
-  <ItemGroup>
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\Microsoft.Terminal.Settings.ModelLib.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\types\lib\types.vcxproj" />
-
-    <!-- If you don't reference these projects here, the
-    _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
-  </ItemGroup>
-
-  <!-- ========================= Globals ======================== -->
-
-  <!-- ====================== Compiler & Linker Flags ===================== -->
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..;$(OpenConsoleDir)\dep;$(OpenConsoleDir)\dep\jsoncpp\json;$(OpenConsoleDir)src\inc;$(OpenConsoleDir)src\inc\test;$(WinRT_IncludePath)\..\cppwinrt\winrt;"$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\Generated Files";%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-
-      <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
-      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <PropertyGroup>
-    <GenerateManifest>true</GenerateManifest>
-    <EmbedManifest>true</EmbedManifest>
-  </PropertyGroup>
-
-  <!-- Careful reordering these. Some default props (contained in these files) are order sensitive. -->
-  <Import Project="$(OpenConsoleDir)src\common.build.post.props" />
-  <Import Project="$(OpenConsoleDir)src\common.build.tests.props" />
-
-  <PropertyGroup>
-    <_CppWinrtBinRoot>&quot;$(OpenConsoleDir)$(Platform)\$(Configuration)\&quot;</_CppWinrtBinRoot>
-    <!-- From Microsoft.UI.Xaml.targets -->
-    <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
-    <Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
-    <_MUXBinRoot>&quot;$(OpenConsoleDir)packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\runtimes\win10-$(Native-Platform)\native\&quot;</_MUXBinRoot>
-  </PropertyGroup>
-
-<!-- We actually can just straight up reference MUX here, it's fine -->
-  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.200609001\build\native\Microsoft.UI.Xaml.targets')" />
-
-</Project>

src/cascadia/LocalTests_SettingsModel/pch.cpp

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

src/cascadia/LocalTests_SettingsModel/pch.h

@@ -1,65 +0,0 @@
-/*++
-Copyright (c) Microsoft Corporation
-Licensed under the MIT license.
-
-Module Name:
-- precomp.h
-
-Abstract:
-- Contains external headers to include in the precompile phase of console build process.
-- Avoid including internal project headers. Instead include them only in the classes that need them (helps with test project building).
-
-Author(s):
-- Carlos Zamora (cazamor) April 2019
---*/
-
-#pragma once
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#define BLOCK_TIL
-// This includes support libraries from the CRT, STL, WIL, and GSL
-#include "LibraryIncludes.h"
-// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
-//      SDK definition of this function, so the only fix is to undef it.
-// from WinBase.h
-// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
-#ifdef GetCurrentTime
-#undef GetCurrentTime
-#endif
-
-#include <wil/cppwinrt.h>
-#include <unknwn.h>
-#include <hstring.h>
-
-#include <WexTestClass.h>
-#include <json.h>
-#include "consoletaeftemplates.hpp"
-
-#include <winrt/Windows.ApplicationModel.Resources.Core.h>
-#include "winrt/Windows.UI.Xaml.Markup.h"
-#include <winrt/Windows.system.h>
-#include <winrt/Windows.Foundation.h>
-#include <winrt/Windows.Foundation.Collections.h>
-#include <winrt/windows.ui.core.h>
-#include <winrt/Windows.ui.input.h>
-#include <winrt/Windows.UI.Xaml.Controls.h>
-#include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Windows.ui.xaml.media.h>
-#include <winrt/Windows.ui.xaml.input.h>
-#include <winrt/Windows.UI.Xaml.Markup.h>
-#include <winrt/Windows.UI.Xaml.Documents.h>
-
-#include <windows.ui.xaml.media.dxinterop.h>
-
-#include <winrt/windows.applicationmodel.core.h>
-
-#include <winrt/Microsoft.UI.Xaml.Controls.h>
-
-// Manually include til after we include Windows.Foundation to give it winrt superpowers
-#include "til.h"
-
-// Common includes for most tests:
-#include "../../inc/argb.h"
-#include "../../inc/conattrs.hpp"
-#include "../../types/inc/utils.hpp"
-#include "../../inc/DefaultSettings.h"

src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp

@@ -3,17 +3,18 @@
 
 #include "pch.h"
 
-#include "../TerminalSettingsModel/ColorScheme.h"
-#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../TerminalApp/ColorScheme.h"
+#include "../TerminalApp/CascadiaSettings.h"
 #include "JsonTestClass.h"
 
 using namespace Microsoft::Console;
-using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace TerminalApp;
+using namespace winrt::TerminalApp::implementation;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
     // TODO:microsoft/terminal#3838:
     // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -130,11 +131,11 @@ namespace SettingsModelLocalTests
         const auto scheme2Json = VerifyParseSucceeded(scheme2String);
 
         auto scheme0 = ColorScheme::FromJson(scheme0Json);
-        VERIFY_ARE_EQUAL(L"scheme0", scheme0->_Name);
-        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 0), scheme0->_SelectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 1), scheme0->_CursorColor);
+        VERIFY_ARE_EQUAL(L"scheme0", scheme0->_schemeName);
+        VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 0), scheme0->_selectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 1), scheme0->_cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0->_table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 1), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -143,10 +144,10 @@ namespace SettingsModelLocalTests
             L"Layering scheme1 on top of scheme0"));
         scheme0->LayerJson(scheme1Json);
 
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0->_Foreground);
-        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0->_Background);
-        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 0), scheme0->_SelectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 4, 0, 4), scheme0->_CursorColor);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0->_defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0->_defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 0), scheme0->_selectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 0, 4), scheme0->_cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 2, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0->_table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -155,10 +156,10 @@ namespace SettingsModelLocalTests
             L"Layering scheme2Json on top of (scheme0+scheme1)"));
         scheme0->LayerJson(scheme2Json);
 
-        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
-        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
-        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 0), scheme0->_SelectionBackground);
-        VERIFY_ARE_EQUAL(ARGB(0, 6, 0, 6), scheme0->_CursorColor);
+        VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
+        VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 0), scheme0->_selectionBackground);
+        VERIFY_ARE_EQUAL(ARGB(0, 6, 0, 6), scheme0->_cursorColor);
         VERIFY_ARE_EQUAL(ARGB(0, 3, 0, 0), scheme0->_table[XTERM_RED_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 3, 0), scheme0->_table[XTERM_GREEN_ATTR]);
         VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0->_table[XTERM_BLUE_ATTR]);
@@ -192,7 +193,7 @@ namespace SettingsModelLocalTests
         const auto scheme2Json = VerifyParseSucceeded(scheme2String);
         const auto scheme3Json = VerifyParseSucceeded(scheme3String);
 
-        auto settings = winrt::make_self<CascadiaSettings>();
+        auto settings = winrt::make_self<winrt::TerminalApp::implementation::CascadiaSettings>();
 
         VERIFY_ARE_EQUAL(0u, settings->_globals->ColorSchemes().Size());
         VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme0Json));
@@ -217,8 +218,8 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme1Json));
             VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
             VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
+            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
         }
 
         settings->_LayerOrCreateColorScheme(scheme1Json);
@@ -237,10 +238,10 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
             VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
             VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_Background);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
+            VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
         }
         settings->_LayerOrCreateColorScheme(scheme2Json);
 
@@ -258,10 +259,10 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
             VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
             VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
+            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
         }
         settings->_LayerOrCreateColorScheme(scheme3Json);
 
@@ -282,12 +283,12 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme1Json));
             VERIFY_IS_NOT_NULL(settings->_FindMatchingColorScheme(scheme2Json));
             VERIFY_IS_NULL(settings->_FindMatchingColorScheme(scheme3Json));
-            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_Background);
-            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_Background);
-            VERIFY_ARE_EQUAL(ARGB(0, 6, 6, 6), scheme2->_Foreground);
-            VERIFY_ARE_EQUAL(ARGB(0, 7, 7, 7), scheme2->_Background);
+            VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme1->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme1->_defaultBackground);
+            VERIFY_ARE_EQUAL(ARGB(0, 6, 6, 6), scheme2->_defaultForeground);
+            VERIFY_ARE_EQUAL(ARGB(0, 7, 7, 7), scheme2->_defaultBackground);
         }
     }
 }

src/cascadia/LocalTests_TerminalApp/CommandTests.cpp

@@ -3,19 +3,20 @@
 
 #include "pch.h"
 
-#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../TerminalApp/CascadiaSettings.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"
 
 using namespace Microsoft::Console;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace TerminalApp;
+using namespace winrt::TerminalApp;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
     // TODO:microsoft/terminal#3838:
     // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -61,7 +62,7 @@ namespace SettingsModelLocalTests
         const auto commands1Json = VerifyParseSucceeded(commands1String);
         const auto commands2Json = VerifyParseSucceeded(commands2String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         {
             auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -95,7 +96,7 @@ namespace SettingsModelLocalTests
         const auto commands2Json = VerifyParseSucceeded(commands2String);
         const auto commands3Json = VerifyParseSucceeded(commands3String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         {
             auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -153,7 +154,7 @@ namespace SettingsModelLocalTests
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -167,7 +168,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"command1");
@@ -177,7 +178,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"command2");
@@ -187,7 +188,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"command4");
@@ -197,7 +198,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"command5");
@@ -207,7 +208,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
     }
     void CommandTests::TestResourceKeyName()
@@ -217,7 +218,7 @@ namespace SettingsModelLocalTests
         const std::string commands0String{ R"([ { "name": { "key": "DuplicateTabCommandKey"}, "command": "copy" } ])" };
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         {
             auto warnings = implementation::Command::LayerJson(commands, commands0Json);
@@ -265,7 +266,7 @@ namespace SettingsModelLocalTests
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -283,7 +284,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"Split pane, split: vertical");
@@ -293,7 +294,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
         {
             auto command = commands.Lookup(L"Split pane, split: horizontal");
@@ -303,7 +304,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
         }
     }
     void CommandTests::TestLayerOnAutogeneratedName()
@@ -315,7 +316,7 @@ namespace SettingsModelLocalTests
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
 
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
+        IMap<winrt::hstring, winrt::TerminalApp::Command> commands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
@@ -329,7 +330,7 @@ namespace SettingsModelLocalTests
             const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
     }
 }

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -6,12 +6,12 @@
 
 #include "../TerminalApp/TerminalPage.h"
 #include "../TerminalApp/AppCommandlineArgs.h"
+#include "../TerminalApp/ActionArgs.h"
 
 using namespace WEX::Logging;
 using namespace WEX::Common;
 using namespace WEX::TestExecution;
 
-using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::TerminalApp;
 using namespace ::TerminalApp;
 
@@ -57,7 +57,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TestSimpleExecuteCommandlineAction);
         TEST_METHOD(TestMultipleCommandExecuteCommandlineAction);
         TEST_METHOD(TestInvalidExecuteCommandlineAction);
-        TEST_METHOD(TestLaunchMode);
 
     private:
         void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
@@ -1077,8 +1076,9 @@ namespace TerminalAppLocalTests
 
     void CommandlineTest::TestSimpleExecuteCommandlineAction()
     {
-        ExecuteCommandlineArgs args{ L"new-tab" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
+        args->Commandline(L"new-tab");
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
         VERIFY_ARE_EQUAL(1u, actions.size());
         auto actionAndArgs = actions.at(0);
         VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
@@ -1095,8 +1095,9 @@ namespace TerminalAppLocalTests
 
     void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
     {
-        ExecuteCommandlineArgs args{ L"new-tab ; split-pane" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
+        args->Commandline(L"new-tab ; split-pane");
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
         VERIFY_ARE_EQUAL(2u, actions.size());
         {
             auto actionAndArgs = actions.at(0);
@@ -1128,100 +1129,10 @@ namespace TerminalAppLocalTests
 
     void CommandlineTest::TestInvalidExecuteCommandlineAction()
     {
+        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
         // -H and -V cannot be combined.
-        ExecuteCommandlineArgs args{ L"split-pane -H -V" };
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        args->Commandline(L"split-pane -H -V");
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
         VERIFY_ARE_EQUAL(0u, actions.size());
     }
-
-    void CommandlineTest::TestLaunchMode()
-    {
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_FALSE(appArgs.GetLaunchMode().has_value());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-F" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FullscreenMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--fullscreen" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FullscreenMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-M" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-f" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::FocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"-fM" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus", L"--focus" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", L"--maximized", L"--focus", L"--maximized" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_IS_TRUE(appArgs.GetLaunchMode().has_value());
-            VERIFY_ARE_EQUAL(appArgs.GetLaunchMode().value(), LaunchMode::MaximizedFocusMode);
-        }
-    }
 }

src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp

@@ -3,20 +3,21 @@
 
 #include "pch.h"
 
-#include "../TerminalSettingsModel/ColorScheme.h"
-#include "../TerminalSettingsModel/CascadiaSettings.h"
-#include "../TerminalSettingsModel/KeyMapping.h"
+#include "../TerminalApp/ColorScheme.h"
+#include "../TerminalApp/CascadiaSettings.h"
+#include "../KeyMapping.h"
 #include "JsonTestClass.h"
 #include "TestUtils.h"
 
 using namespace Microsoft::Console;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace TerminalApp;
+using namespace winrt::TerminalApp;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
     // TODO:microsoft/terminal#3838:
     // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -66,7 +67,7 @@ namespace SettingsModelLocalTests
         const auto bindings1Json = VerifyParseSucceeded(bindings1String);
         const auto bindings2Json = VerifyParseSucceeded(bindings2String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
         VERIFY_IS_NOT_NULL(keymap);
         VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
@@ -90,7 +91,7 @@ namespace SettingsModelLocalTests
         const auto bindings1Json = VerifyParseSucceeded(bindings1String);
         const auto bindings2Json = VerifyParseSucceeded(bindings2String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
         VERIFY_IS_NOT_NULL(keymap);
         VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
@@ -120,7 +121,7 @@ namespace SettingsModelLocalTests
         const auto bindings4Json = VerifyParseSucceeded(bindings4String);
         const auto bindings5Json = VerifyParseSucceeded(bindings5String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
         VERIFY_IS_NOT_NULL(keymap);
         VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
 
@@ -189,7 +190,7 @@ namespace SettingsModelLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
         VERIFY_IS_NOT_NULL(keymap);
         VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
         keymap->LayerJson(bindings0Json);
@@ -199,7 +200,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` without args parses as Copy(SingleLine=false)"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -210,7 +211,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` with args parses them correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -221,7 +222,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` with args parses them correctly"));
             KeyChord kc{ false, true, true, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
@@ -232,7 +233,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` without args parses as NewTab(Index=null)"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('T') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -244,7 +245,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `newTab` parses args correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('T') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -258,7 +259,7 @@ namespace SettingsModelLocalTests
                 L"Verify that `newTab` with an index greater than the legacy "
                 L"args afforded parses correctly"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('Y') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -272,7 +273,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` ignores args it doesn't understand"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -284,7 +285,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `copy` null as it's `args` parses as the default option"));
             KeyChord kc{ true, false, true, static_cast<int32_t>('B') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::CopyText, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -296,7 +297,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `adjustFontSize` with a positive delta parses args correctly"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -308,7 +309,7 @@ namespace SettingsModelLocalTests
             Log::Comment(NoThrowString().Format(
                 L"Verify that `adjustFontSize` with a negative delta parses args correctly"));
             KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::AdjustFontSize, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<AdjustFontSizeArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -329,7 +330,7 @@ namespace SettingsModelLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
         VERIFY_IS_NOT_NULL(keymap);
         VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
         keymap->LayerJson(bindings0Json);
@@ -337,48 +338,48 @@ namespace SettingsModelLocalTests
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Vertical, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
         }
     }
 
@@ -392,7 +393,7 @@ namespace SettingsModelLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
         VERIFY_IS_NOT_NULL(keymap);
         VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
         keymap->LayerJson(bindings0Json);
@@ -400,7 +401,7 @@ namespace SettingsModelLocalTests
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -409,7 +410,7 @@ namespace SettingsModelLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -420,7 +421,7 @@ namespace SettingsModelLocalTests
         }
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
             const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
@@ -437,7 +438,7 @@ namespace SettingsModelLocalTests
 
         const auto bindings0Json = VerifyParseSucceeded(bindings0String);
 
-        auto keymap = winrt::make_self<implementation::KeyMapping>();
+        auto keymap = winrt::make_self<winrt::TerminalApp::implementation::KeyMapping>();
         VERIFY_IS_NOT_NULL(keymap);
         VERIFY_ARE_EQUAL(0u, keymap->_keyShortcuts.size());
         keymap->LayerJson(bindings0Json);
@@ -445,7 +446,7 @@ namespace SettingsModelLocalTests
 
         {
             KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = ::TestUtils::GetActionAndArgs(*keymap, kc);
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*keymap, kc);
             const auto& realArgs = actionAndArgs.Args().try_as<CopyTextArgs>();
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value

src/cascadia/LocalTests_TerminalApp/ProfileTests.cpp

@@ -3,17 +3,18 @@
 
 #include "pch.h"
 
-#include "../TerminalSettingsModel/ColorScheme.h"
-#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../TerminalApp/ColorScheme.h"
+#include "../TerminalApp/CascadiaSettings.h"
 #include "JsonTestClass.h"
 
 using namespace Microsoft::Console;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace TerminalApp;
+using namespace winrt::TerminalApp;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
     // TODO:microsoft/terminal#3838:
     // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
@@ -195,32 +196,32 @@ namespace SettingsModelLocalTests
         const auto profile3Json = VerifyParseSucceeded(profile3String);
 
         auto profile0 = implementation::Profile::FromJson(profile0Json);
-        VERIFY_IS_FALSE(profile0->Icon().empty());
-        VERIFY_ARE_EQUAL(L"not-null.png", profile0->Icon());
+        VERIFY_IS_FALSE(profile0->IconPath().empty());
+        VERIFY_ARE_EQUAL(L"not-null.png", profile0->IconPath());
 
         Log::Comment(NoThrowString().Format(
             L"Verify that layering an object the key set to null will clear the key"));
         profile0->LayerJson(profile1Json);
-        VERIFY_IS_TRUE(profile0->Icon().empty());
+        VERIFY_IS_TRUE(profile0->IconPath().empty());
 
         profile0->LayerJson(profile2Json);
-        VERIFY_IS_TRUE(profile0->Icon().empty());
+        VERIFY_IS_TRUE(profile0->IconPath().empty());
 
         profile0->LayerJson(profile3Json);
-        VERIFY_IS_FALSE(profile0->Icon().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile0->Icon());
+        VERIFY_IS_FALSE(profile0->IconPath().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile0->IconPath());
 
         Log::Comment(NoThrowString().Format(
             L"Verify that layering an object _without_ the key will not clear the key"));
         profile0->LayerJson(profile2Json);
-        VERIFY_IS_FALSE(profile0->Icon().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile0->Icon());
+        VERIFY_IS_FALSE(profile0->IconPath().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile0->IconPath());
 
         auto profile1 = implementation::Profile::FromJson(profile1Json);
-        VERIFY_IS_TRUE(profile1->Icon().empty());
+        VERIFY_IS_TRUE(profile1->IconPath().empty());
         profile1->LayerJson(profile3Json);
-        VERIFY_IS_FALSE(profile1->Icon().empty());
-        VERIFY_ARE_EQUAL(L"another-real.png", profile1->Icon());
+        VERIFY_IS_FALSE(profile1->IconPath().empty());
+        VERIFY_ARE_EQUAL(L"another-real.png", profile1->IconPath());
     }
 
     void ProfileTests::LayerProfilesOnArray()
@@ -252,7 +253,7 @@ namespace SettingsModelLocalTests
         const auto profile3Json = VerifyParseSucceeded(profile3String);
         const auto profile4Json = VerifyParseSucceeded(profile4String);
 
-        auto settings = winrt::make_self<implementation::CascadiaSettings>();
+        auto settings = winrt::make_self<winrt::TerminalApp::implementation::CascadiaSettings>();
 
         VERIFY_ARE_EQUAL(0u, settings->_profiles.Size());
         VERIFY_IS_NULL(settings->_FindMatchingProfile(profile0Json));

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -9,11 +9,11 @@
 #include "../TerminalApp/ShortcutActionDispatch.h"
 #include "../TerminalApp/Tab.h"
 #include "../CppWinrtTailored.h"
+#include "JsonTestClass.h"
 
 using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -26,7 +26,7 @@ namespace TerminalAppLocalTests
     // an updated TAEF that will let us install framework packages when the test
     // package is deployed. Until then, these tests won't deploy in CI.
 
-    class TabTests
+    class TabTests : public JsonTestClass
     {
         // For this set of tests, we need to activate some XAML content. For
         // release builds, the application runs as a centennial application,
@@ -62,8 +62,13 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TryDuplicateBadTab);
         TEST_METHOD(TryDuplicateBadPane);
 
+        TEST_METHOD(TryZoomPane);
+        TEST_METHOD(MoveFocusFromZoomedPane);
+        TEST_METHOD(CloseZoomedPane);
+
         TEST_CLASS_SETUP(ClassSetup)
         {
+            InitializeJsonReader();
             return true;
         }
 
@@ -74,7 +79,8 @@ namespace TerminalAppLocalTests
 
     private:
         void _initializeTerminalPage(winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage>& page,
-                                     CascadiaSettings initialSettings);
+                                     winrt::com_ptr<winrt::TerminalApp::implementation::CascadiaSettings>& initialSettings);
+        winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> _commonSetup();
     };
 
     void TabTests::EnsureTestsActivate()
@@ -189,7 +195,7 @@ namespace TerminalAppLocalTests
     // Return Value:
     // - <none>
     void TabTests::_initializeTerminalPage(winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage>& page,
-                                           CascadiaSettings initialSettings)
+                                           winrt::com_ptr<winrt::TerminalApp::implementation::CascadiaSettings>& initialSettings)
     {
         // This is super wacky, but we can't just initialize the
         // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
@@ -205,7 +211,7 @@ namespace TerminalAppLocalTests
         auto result = RunOnUIThread([&projectedPage, &page, initialSettings]() {
             projectedPage = winrt::TerminalApp::TerminalPage();
             page.copy_from(winrt::get_self<winrt::TerminalApp::implementation::TerminalPage>(projectedPage));
-            page->_settings = initialSettings;
+            page->_settings = *initialSettings;
         });
         VERIFY_SUCCEEDED(result);
 
@@ -275,8 +281,12 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
+        VerifyParseSucceeded(settingsJson0);
+        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
+        settings0->_ParseJsonString(settingsJson0, false);
+        settings0->LayerJson(settings0->_userSettings);
+        settings0->_ValidateSettings();
 
         // This is super wacky, but we can't just initialize the
         // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
@@ -333,11 +343,19 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
+        VerifyParseSucceeded(settingsJson0);
+        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
+        settings0->_ParseJsonString(settingsJson0, false);
+        settings0->LayerJson(settings0->_userSettings);
+        settings0->_ValidateSettings();
 
-        CascadiaSettings settings1{ til::u8u16(settingsJson1) };
+        VerifyParseSucceeded(settingsJson1);
+        auto settings1 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings1);
+        settings1->_ParseJsonString(settingsJson1, false);
+        settings1->LayerJson(settings1->_userSettings);
+        settings1->_ValidateSettings();
 
         const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
         const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
@@ -370,7 +388,7 @@ namespace TerminalAppLocalTests
             L"Change the settings of the TerminalPage so the first profile is "
             L"no longer in the list of profiles"));
         result = RunOnUIThread([&page, settings1]() {
-            page->_settings = settings1;
+            page->_settings = *settings1;
         });
         VERIFY_SUCCEEDED(result);
 
@@ -420,11 +438,19 @@ namespace TerminalAppLocalTests
             ]
         })" };
 
-        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
+        VerifyParseSucceeded(settingsJson0);
+        auto settings0 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings0);
+        settings0->_ParseJsonString(settingsJson0, false);
+        settings0->LayerJson(settings0->_userSettings);
+        settings0->_ValidateSettings();
 
-        CascadiaSettings settings1{ til::u8u16(settingsJson1) };
+        VerifyParseSucceeded(settingsJson1);
+        auto settings1 = winrt::make_self<implementation::CascadiaSettings>(false);
         VERIFY_IS_NOT_NULL(settings1);
+        settings1->_ParseJsonString(settingsJson1, false);
+        settings1->LayerJson(settings1->_userSettings);
+        settings1->_ValidateSettings();
 
         const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
         const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
@@ -467,7 +493,7 @@ namespace TerminalAppLocalTests
             L"Change the settings of the TerminalPage so the first profile is "
             L"no longer in the list of profiles"));
         result = RunOnUIThread([&page, settings1]() {
-            page->_settings = settings1;
+            page->_settings = *settings1;
         });
         VERIFY_SUCCEEDED(result);
 
@@ -496,4 +522,192 @@ namespace TerminalAppLocalTests
         });
     }
 
+    // Method Description:
+    // - This is a helper method for setting up a TerminalPage with some common
+    //   settings, and creating the first tab.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - The initialized TerminalPage, ready to use.
+    winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> TabTests::_commonSetup()
+    {
+        const std::string settingsJson0{ R"(
+        {
+            "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "profiles": [
+                {
+                    "name" : "profile0",
+                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+                    "historySize": 1
+                },
+                {
+                    "name" : "profile1",
+                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
+                    "historySize": 2
+                }
+            ]
+        })" };
+
+        CascadiaSettings settings0{ til::u8u16(settingsJson0) };
+        VERIFY_IS_NOT_NULL(settings0);
+
+        const auto guid1 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
+        const auto guid2 = Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
+
+        // This is super wacky, but we can't just initialize the
+        // com_ptr<impl::TerminalPage> in the lambda and assign it back out of
+        // the lambda. We'll crash trying to get a weak_ref to the TerminalPage
+        // during TerminalPage::Create() below.
+        //
+        // Instead, create the winrt object, then get a com_ptr to the
+        // implementation _from_ the winrt object. This seems to work, even if
+        // it's weird.
+        winrt::com_ptr<winrt::TerminalApp::implementation::TerminalPage> page{ nullptr };
+        _initializeTerminalPage(page, settings0);
+
+        auto result = RunOnUIThread([&page]() {
+            VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        return page;
+    }
+
+    void TabTests::TryZoomPane()
+    {
+        auto page = _commonSetup();
+
+        Log::Comment(L"Create a second pane");
+        auto result = RunOnUIThread([&page]() {
+            SplitPaneArgs args{ SplitType::Duplicate };
+            ActionEventArgs eventArgs{ args };
+            // eventArgs.Args(args);
+            page->_HandleSplitPane(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Zoom in on the pane");
+        result = RunOnUIThread([&page]() {
+            ActionEventArgs eventArgs{};
+            page->_HandleTogglePaneZoom(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_TRUE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Zoom out of the pane");
+        result = RunOnUIThread([&page]() {
+            ActionEventArgs eventArgs{};
+            page->_HandleTogglePaneZoom(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+    }
+
+    void TabTests::MoveFocusFromZoomedPane()
+    {
+        auto page = _commonSetup();
+
+        Log::Comment(L"Create a second pane");
+        auto result = RunOnUIThread([&page]() {
+            // Set up action
+            SplitPaneArgs args{ SplitType::Duplicate };
+            ActionEventArgs eventArgs{ args };
+            page->_HandleSplitPane(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Zoom in on the pane");
+        result = RunOnUIThread([&page]() {
+            // Set up action
+            ActionEventArgs eventArgs{};
+
+            page->_HandleTogglePaneZoom(nullptr, eventArgs);
+
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_TRUE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Move focus. This will cause us to un-zoom.");
+        result = RunOnUIThread([&page]() {
+            // Set up action
+            MoveFocusArgs args{ Direction::Left };
+            ActionEventArgs eventArgs{ args };
+
+            page->_HandleMoveFocus(nullptr, eventArgs);
+
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+    }
+
+    void TabTests::CloseZoomedPane()
+    {
+        auto page = _commonSetup();
+
+        Log::Comment(L"Create a second pane");
+        auto result = RunOnUIThread([&page]() {
+            // Set up action
+            SplitPaneArgs args{ SplitType::Duplicate };
+            ActionEventArgs eventArgs{ args };
+            page->_HandleSplitPane(nullptr, eventArgs);
+            auto firstTab = page->_GetStrongTabImpl(0);
+
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Zoom in on the pane");
+        result = RunOnUIThread([&page]() {
+            // Set up action
+            ActionEventArgs eventArgs{};
+
+            page->_HandleTogglePaneZoom(nullptr, eventArgs);
+
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(2, firstTab->GetLeafPaneCount());
+            VERIFY_IS_TRUE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        Log::Comment(L"Close Pane. This should cause us to un-zoom, and remove the second pane from the tree");
+        result = RunOnUIThread([&page]() {
+            // Set up action
+            ActionEventArgs eventArgs{};
+
+            page->_HandleClosePane(nullptr, eventArgs);
+
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+
+        // Introduce a slight delay to let the events finish propagating
+        Sleep(250);
+
+        Log::Comment(L"Check to ensure there's only one pane left.");
+
+        result = RunOnUIThread([&page]() {
+            auto firstTab = page->_GetStrongTabImpl(0);
+            VERIFY_ARE_EQUAL(1, firstTab->GetLeafPaneCount());
+            VERIFY_IS_FALSE(firstTab->IsZoomed());
+        });
+        VERIFY_SUCCEEDED(result);
+    }
 }

src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj

@@ -49,6 +49,7 @@
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
     <ClInclude Include="pch.h" />
+    <ClInclude Include="JsonTestClass.h" />
     <ClInclude Include="CppWinrtTailored.h" />
   </ItemGroup>
 
@@ -56,10 +57,19 @@
   <ItemGroup>
     <ClCompile Include="CommandlineTest.cpp" />
     <ClCompile Include="SettingsTests.cpp" />
+    <ClCompile Include="ProfileTests.cpp" />
+    <ClCompile Include="ColorSchemeTests.cpp" />
+    <ClCompile Include="KeyBindingsTests.cpp" />
+    <ClCompile Include="CommandTests.cpp" />
     <ClCompile Include="TabTests.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
+    <!-- You _NEED_ to include this file and the jsoncpp IncludePath (below) if
+    you want to use jsoncpp -->
+    <ClCompile Include="$(OpenConsoleDir)\dep\jsoncpp\jsoncpp.cpp">
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+    </ClCompile>
   </ItemGroup>
 
   <!-- ========================= Project References ======================== -->
@@ -71,8 +81,7 @@
     _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
   </ItemGroup>
 
   <!-- ========================= Globals ======================== -->

src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj

@@ -100,10 +100,6 @@
       <Project>{ca5cad1a-44bd-4ac7-ac72-f16e576fdd12}</Project>
     </ProjectReference>
 
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj">
-      <Project>{CA5CAD1A-082C-4476-9F33-94B339494076}</Project>
-    </ProjectReference>
-
   </ItemGroup>
 
   <PropertyGroup>
@@ -157,10 +153,6 @@
     <Copy SourceFiles="$(_TestBinRoot)\LocalTests_TerminalApp\TerminalApp.LocalTests.dll"
           DestinationFiles="$(TargetDir)\TerminalApp.LocalTests.dll" />
 
-    <!-- Copy our test code from LocalTests_TerminalApp into this directory -->
-    <Copy SourceFiles="$(_TestBinRoot)\LocalTests_SettingsModel\SettingsModel.LocalTests.dll"
-          DestinationFiles="$(TargetDir)\SettingsModel.LocalTests.dll" />
-
     <!-- Copy some dlls which TerminalConnection is dependent upon that didn't
       get rolled up into this  directory -->
     <Copy SourceFiles="@(TerminalConnectionDlls)"

src/cascadia/LocalTests_TerminalApp/TestUtils.h

@@ -12,7 +12,7 @@ Author(s):
     Mike Griese (migrie) December-2019
 --*/
 
-class TestUtils
+class TerminalAppLocalTests::TestUtils
 {
 public:
     // Function Description:
@@ -23,8 +23,8 @@ public:
     // - kc: The key chord to look up the bound ActionAndArgs for.
     // Return Value:
     // - The ActionAndArgs bound to the given key, or nullptr if nothing is bound to it.
-    static const winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs GetActionAndArgs(const winrt::Microsoft::Terminal::Settings::Model::KeyMapping& keymap,
-                                                                                             const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
+    static const winrt::TerminalApp::ActionAndArgs GetActionAndArgs(const winrt::TerminalApp::implementation::KeyMapping& keymap,
+                                                                    const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
     {
         std::wstring buffer{ L"" };
         if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Ctrl))

src/cascadia/LocalTests_TerminalApp/pch.h

@@ -54,7 +54,6 @@ Author(s):
 #include <winrt/windows.applicationmodel.core.h>
 
 #include <winrt/Microsoft.Terminal.TerminalConnection.h>
-#include <winrt/Microsoft.Terminal.Settings.Model.h>
 
 #include <winrt/Microsoft.UI.Xaml.Controls.h>
 

src/cascadia/ShellExtension/OpenTerminalHere.cpp

@@ -185,12 +185,17 @@ HRESULT OpenTerminalHere::GetState(IShellItemArray* /*psiItemArray*/,
 
 HRESULT OpenTerminalHere::GetIcon(IShellItemArray* /*psiItemArray*/,
                                   LPWSTR* ppszIcon)
+try
 {
-    // the icon ref ("dll,-<resid>") is provided here, in this case none is provided
-    *ppszIcon = nullptr;
-    // TODO GH#6111: Return the Terminal icon here
-    return E_NOTIMPL;
+    std::filesystem::path modulePath{ wil::GetModuleFileNameW<std::wstring>(wil::GetModuleInstanceHandle()) };
+    modulePath.replace_filename(WindowsTerminalExe);
+    // WindowsTerminal.exe,-101 will be the first icon group in WT
+    // We're using WindowsTerminal here explicitly, and not wt (from _getExePath), because
+    // WindowsTerminal is the only one built with the right icons.
+    const auto resource{ modulePath.wstring() + L",-101" };
+    return SHStrDupW(resource.c_str(), ppszIcon);
 }
+CATCH_RETURN();
 
 HRESULT OpenTerminalHere::GetFlags(EXPCMDFLAGS* pFlags)
 {

src/cascadia/TerminalApp/ActionAndArgs.cpp

@@ -51,9 +51,9 @@ static constexpr std::string_view ActionKey{ "action" };
 // This key is reserved to remove a keybinding, instead of mapping it to an action.
 static constexpr std::string_view UnboundKey{ "unbound" };
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
-    using namespace ::Microsoft::Terminal::Settings::Model;
+    using namespace ::TerminalApp;
 
     // Specifically use a map here over an unordered_map. We want to be able to
     // iterate over these entries in-order when we're serializing the keybindings.
@@ -105,7 +105,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         { UnboundKey, ShortcutAction::Invalid },
     };
 
-    using ParseResult = std::tuple<IActionArgs, std::vector<SettingsLoadWarnings>>;
+    using ParseResult = std::tuple<IActionArgs, std::vector<TerminalApp::SettingsLoadWarnings>>;
     using ParseActionFunction = std::function<ParseResult(const Json::Value&)>;
 
     // This is a map of ShortcutAction->function<IActionArgs(Json::Value)>. It holds
@@ -169,7 +169,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // - a deserialized ActionAndArgs corresponding to the values in json, or
     //   null if we failed to deserialize an action.
     winrt::com_ptr<ActionAndArgs> ActionAndArgs::FromJson(const Json::Value& json,
-                                                          std::vector<SettingsLoadWarnings>& warnings)
+                                                          std::vector<TerminalApp::SettingsLoadWarnings>& warnings)
     {
         // Invalid is our placeholder that the action was not parsed.
         ShortcutAction action = ShortcutAction::Invalid;
@@ -208,7 +208,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         // does, we'll try to deserialize any "args" that were provided with
         // the binding.
         IActionArgs args{ nullptr };
-        std::vector<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings> parseWarnings;
+        std::vector<TerminalApp::SettingsLoadWarnings> parseWarnings;
         const auto deserializersIter = argParsers.find(action);
         if (deserializersIter != argParsers.end())
         {

src/cascadia/TerminalApp/ActionAndArgs.h

@@ -1,33 +1,25 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #pragma once
-
 #include "ActionAndArgs.g.h"
 #include "TerminalWarnings.h"
 #include "..\inc\cppwinrt_utils.h"
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
     struct ActionAndArgs : public ActionAndArgsT<ActionAndArgs>
     {
         static const std::map<std::string_view, ShortcutAction, std::less<>> ActionKeyNamesMap;
         static winrt::com_ptr<ActionAndArgs> FromJson(const Json::Value& json,
-                                                      std::vector<SettingsLoadWarnings>& warnings);
+                                                      std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
 
         ActionAndArgs() = default;
-        ActionAndArgs(ShortcutAction action, IActionArgs args) :
-            _Action{ action },
-            _Args{ args } {};
-
         hstring GenerateName() const;
 
-        GETSET_PROPERTY(ShortcutAction, Action, ShortcutAction::Invalid);
+        GETSET_PROPERTY(TerminalApp::ShortcutAction, Action, TerminalApp::ShortcutAction::Invalid);
         GETSET_PROPERTY(IActionArgs, Args, nullptr);
     };
 }
 
-namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
+namespace winrt::TerminalApp::factory_implementation
 {
     BASIC_FACTORY(ActionAndArgs);
 }

src/cascadia/TerminalApp/ActionArgs.cpp

@@ -20,14 +20,14 @@
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
 #include "ExecuteCommandlineArgs.g.cpp"
-#include "CloseOtherTabsArgs.g.cpp"
-#include "CloseTabsAfterArgs.g.cpp"
+
+#include "Utils.h"
 
 #include <LibraryResources.h>
 
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
     winrt::hstring NewTerminalArgs::GenerateName() const
     {
@@ -212,7 +212,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         // The string will be similar to the following:
         // * "Send Input: ...input..."
 
-        auto escapedInput = til::visualize_control_codes(_Input);
+        auto escapedInput = VisualizeControlCodes(_Input);
         auto name = fmt::format(std::wstring_view(RS_(L"SendInputCommandKey")), escapedInput);
         return winrt::hstring{ name };
     }

src/cascadia/TerminalApp/ActionArgs.h

@@ -24,6 +24,7 @@
 #include "CloseTabsAfterArgs.g.h"
 
 #include "../../cascadia/inc/cppwinrt_utils.h"
+#include "Utils.h"
 #include "JsonUtils.h"
 #include "TerminalWarnings.h"
 
@@ -35,16 +36,16 @@
 // * ActionEventArgs holds a single IActionArgs. For events that don't need
 //   additional args, this can be nullptr.
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
-    using namespace ::Microsoft::Terminal::Settings::Model;
-    using FromJsonResult = std::tuple<Model::IActionArgs, std::vector<SettingsLoadWarnings>>;
+    using namespace ::TerminalApp;
+    using FromJsonResult = std::tuple<winrt::TerminalApp::IActionArgs, std::vector<TerminalApp::SettingsLoadWarnings>>;
 
     struct ActionEventArgs : public ActionEventArgsT<ActionEventArgs>
     {
         ActionEventArgs() = default;
 
-        explicit ActionEventArgs(const Model::IActionArgs& args) :
+        explicit ActionEventArgs(const TerminalApp::IActionArgs& args) :
             _ActionArgs{ args } {};
         GETSET_PROPERTY(IActionArgs, ActionArgs, nullptr);
         GETSET_PROPERTY(bool, Handled, false);
@@ -53,8 +54,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct NewTerminalArgs : public NewTerminalArgsT<NewTerminalArgs>
     {
         NewTerminalArgs() = default;
-        NewTerminalArgs(int32_t& profileIndex) :
-            _ProfileIndex{ profileIndex } {};
         GETSET_PROPERTY(winrt::hstring, Commandline, L"");
         GETSET_PROPERTY(winrt::hstring, StartingDirectory, L"");
         GETSET_PROPERTY(winrt::hstring, TabTitle, L"");
@@ -70,7 +69,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     public:
         hstring GenerateName() const;
 
-        bool Equals(const Model::NewTerminalArgs& other)
+        bool Equals(const winrt::TerminalApp::NewTerminalArgs& other)
         {
             return other.Commandline() == _Commandline &&
                    other.StartingDirectory() == _StartingDirectory &&
@@ -78,7 +77,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
                    other.ProfileIndex() == _ProfileIndex &&
                    other.Profile() == _Profile;
         };
-        static Model::NewTerminalArgs FromJson(const Json::Value& json)
+        static winrt::TerminalApp::NewTerminalArgs FromJson(const Json::Value& json)
         {
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<NewTerminalArgs>();
@@ -95,7 +94,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     {
         CopyTextArgs() = default;
         GETSET_PROPERTY(bool, SingleLine, false);
-        GETSET_PROPERTY(Windows::Foundation::IReference<TerminalControl::CopyFormat>, CopyFormatting, nullptr);
+        GETSET_PROPERTY(Windows::Foundation::IReference<Microsoft::Terminal::TerminalControl::CopyFormat>, CopyFormatting, nullptr);
 
         static constexpr std::string_view SingleLineKey{ "singleLine" };
         static constexpr std::string_view CopyFormattingKey{ "copyFormatting" };
@@ -126,9 +125,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct NewTabArgs : public NewTabArgsT<NewTabArgs>
     {
         NewTabArgs() = default;
-        NewTabArgs(const Model::NewTerminalArgs& terminalArgs) :
-            _TerminalArgs{ terminalArgs } {};
-        GETSET_PROPERTY(Model::NewTerminalArgs, TerminalArgs, nullptr);
+        GETSET_PROPERTY(winrt::TerminalApp::NewTerminalArgs, TerminalArgs, nullptr);
 
     public:
         hstring GenerateName() const;
@@ -154,8 +151,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct SwitchToTabArgs : public SwitchToTabArgsT<SwitchToTabArgs>
     {
         SwitchToTabArgs() = default;
-        SwitchToTabArgs(uint32_t& tabIndex) :
-            _TabIndex{ tabIndex } {};
         GETSET_PROPERTY(uint32_t, TabIndex, 0);
 
         static constexpr std::string_view TabIndexKey{ "index" };
@@ -184,7 +179,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct ResizePaneArgs : public ResizePaneArgsT<ResizePaneArgs>
     {
         ResizePaneArgs() = default;
-        GETSET_PROPERTY(Model::Direction, Direction, Direction::None);
+        GETSET_PROPERTY(TerminalApp::Direction, Direction, TerminalApp::Direction::None);
 
         static constexpr std::string_view DirectionKey{ "direction" };
 
@@ -205,9 +200,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<ResizePaneArgs>();
             JsonUtils::GetValueForKey(json, DirectionKey, args->_Direction);
-            if (args->_Direction == Direction::None)
+            if (args->_Direction == TerminalApp::Direction::None)
             {
-                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             else
             {
@@ -219,7 +214,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct MoveFocusArgs : public MoveFocusArgsT<MoveFocusArgs>
     {
         MoveFocusArgs() = default;
-        GETSET_PROPERTY(Model::Direction, Direction, Direction::None);
+        MoveFocusArgs(TerminalApp::Direction direction) :
+            _Direction{ direction } {};
+
+        GETSET_PROPERTY(TerminalApp::Direction, Direction, TerminalApp::Direction::None);
 
         static constexpr std::string_view DirectionKey{ "direction" };
 
@@ -240,9 +238,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             // LOAD BEARING: Not using make_self here _will_ break you in the future!
             auto args = winrt::make_self<MoveFocusArgs>();
             JsonUtils::GetValueForKey(json, DirectionKey, args->_Direction);
-            if (args->_Direction == Direction::None)
+            if (args->_Direction == TerminalApp::Direction::None)
             {
-                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             else
             {
@@ -304,7 +302,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             JsonUtils::GetValueForKey(json, InputKey, args->_Input);
             if (args->_Input.empty())
             {
-                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             return { *args, {} };
         }
@@ -313,12 +311,14 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct SplitPaneArgs : public SplitPaneArgsT<SplitPaneArgs>
     {
         SplitPaneArgs() = default;
-        SplitPaneArgs(SplitState style, const Model::NewTerminalArgs& terminalArgs) :
+        SplitPaneArgs(winrt::TerminalApp::SplitState style, const winrt::TerminalApp::NewTerminalArgs& terminalArgs) :
             _SplitStyle{ style },
             _TerminalArgs{ terminalArgs } {};
-        GETSET_PROPERTY(SplitState, SplitStyle, SplitState::Automatic);
-        GETSET_PROPERTY(Model::NewTerminalArgs, TerminalArgs, nullptr);
-        GETSET_PROPERTY(SplitType, SplitMode, SplitType::Manual);
+        SplitPaneArgs(SplitType splitMode) :
+            _SplitMode{ splitMode } {};
+        GETSET_PROPERTY(winrt::TerminalApp::SplitState, SplitStyle, winrt::TerminalApp::SplitState::Automatic);
+        GETSET_PROPERTY(winrt::TerminalApp::NewTerminalArgs, TerminalArgs, nullptr);
+        GETSET_PROPERTY(winrt::TerminalApp::SplitType, SplitMode, winrt::TerminalApp::SplitType::Manual);
 
         static constexpr std::string_view SplitKey{ "split" };
         static constexpr std::string_view SplitModeKey{ "splitMode" };
@@ -352,7 +352,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct OpenSettingsArgs : public OpenSettingsArgsT<OpenSettingsArgs>
     {
         OpenSettingsArgs() = default;
-        GETSET_PROPERTY(SettingsTarget, Target, SettingsTarget::SettingsFile);
+        GETSET_PROPERTY(TerminalApp::SettingsTarget, Target, TerminalApp::SettingsTarget::SettingsFile);
 
         static constexpr std::string_view TargetKey{ "target" };
 
@@ -403,7 +403,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             JsonUtils::GetValueForKey(json, NameKey, args->_SchemeName);
             if (args->_SchemeName.empty())
             {
-                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             return { *args, {} };
         }
@@ -471,8 +471,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct ExecuteCommandlineArgs : public ExecuteCommandlineArgsT<ExecuteCommandlineArgs>
     {
         ExecuteCommandlineArgs() = default;
-        ExecuteCommandlineArgs(winrt::hstring commandline) :
-            _Commandline{ commandline } {};
         GETSET_PROPERTY(winrt::hstring, Commandline, L"");
 
         static constexpr std::string_view CommandlineKey{ "commandline" };
@@ -496,7 +494,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             JsonUtils::GetValueForKey(json, CommandlineKey, args->_Commandline);
             if (args->_Commandline.empty())
             {
-                return { nullptr, { SettingsLoadWarnings::MissingRequiredParameter } };
+                return { nullptr, { TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
             }
             return { *args, {} };
         }
@@ -505,9 +503,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct CloseOtherTabsArgs : public CloseOtherTabsArgsT<CloseOtherTabsArgs>
     {
         CloseOtherTabsArgs() = default;
-        CloseOtherTabsArgs(uint32_t& tabIndex) :
-            _Index{ tabIndex } {};
-        GETSET_PROPERTY(Windows::Foundation::IReference<uint32_t>, Index, nullptr);
+        GETSET_PROPERTY(winrt::Windows::Foundation::IReference<uint32_t>, Index, nullptr);
 
         static constexpr std::string_view IndexKey{ "index" };
 
@@ -535,9 +531,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     struct CloseTabsAfterArgs : public CloseTabsAfterArgsT<CloseTabsAfterArgs>
     {
         CloseTabsAfterArgs() = default;
-        CloseTabsAfterArgs(uint32_t& tabIndex) :
-            _Index{ tabIndex } {};
-        GETSET_PROPERTY(Windows::Foundation::IReference<uint32_t>, Index, nullptr);
+        GETSET_PROPERTY(winrt::Windows::Foundation::IReference<uint32_t>, Index, nullptr);
 
         static constexpr std::string_view IndexKey{ "index" };
 
@@ -563,14 +557,10 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     };
 }
 
-namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
+namespace winrt::TerminalApp::factory_implementation
 {
     BASIC_FACTORY(ActionEventArgs);
-    BASIC_FACTORY(SwitchToTabArgs);
     BASIC_FACTORY(NewTerminalArgs);
-    BASIC_FACTORY(NewTabArgs);
+    BASIC_FACTORY(MoveFocusArgs);
     BASIC_FACTORY(SplitPaneArgs);
-    BASIC_FACTORY(ExecuteCommandlineArgs);
-    BASIC_FACTORY(CloseOtherTabsArgs);
-    BASIC_FACTORY(CloseTabsAfterArgs);
 }

src/cascadia/TerminalApp/ActionArgs.idl

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-namespace Microsoft.Terminal.Settings.Model
+namespace TerminalApp
 {
     interface IActionArgs
     {
@@ -47,8 +47,6 @@ namespace Microsoft.Terminal.Settings.Model
 
     [default_interface] runtimeclass NewTerminalArgs {
         NewTerminalArgs();
-        NewTerminalArgs(Int32 profileIndex);
-
         String Commandline;
         String StartingDirectory;
         String TabTitle;
@@ -63,7 +61,6 @@ namespace Microsoft.Terminal.Settings.Model
 
     [default_interface] runtimeclass ActionEventArgs : IActionEventArgs
     {
-        ActionEventArgs();
         ActionEventArgs(IActionArgs args);
     };
 
@@ -75,14 +72,12 @@ namespace Microsoft.Terminal.Settings.Model
 
     [default_interface] runtimeclass NewTabArgs : IActionArgs
     {
-        NewTabArgs(NewTerminalArgs terminalArgs);
         NewTerminalArgs TerminalArgs { get; };
     };
 
     [default_interface] runtimeclass SwitchToTabArgs : IActionArgs
     {
-        SwitchToTabArgs(UInt32 tabIndex);
-        UInt32 TabIndex;
+        UInt32 TabIndex { get; };
     };
 
     [default_interface] runtimeclass ResizePaneArgs : IActionArgs
@@ -92,6 +87,7 @@ namespace Microsoft.Terminal.Settings.Model
 
     [default_interface] runtimeclass MoveFocusArgs : IActionArgs
     {
+        MoveFocusArgs(Direction direction);
         Direction Direction { get; };
     };
 
@@ -107,7 +103,9 @@ namespace Microsoft.Terminal.Settings.Model
 
     [default_interface] runtimeclass SplitPaneArgs : IActionArgs
     {
-        SplitPaneArgs(SplitState style, NewTerminalArgs terminalArgs);
+        SplitPaneArgs(SplitState split, NewTerminalArgs terminalArgs);
+        SplitPaneArgs(SplitType splitMode);
+
         SplitState SplitStyle { get; };
         NewTerminalArgs TerminalArgs { get; };
         SplitType SplitMode { get; };
@@ -135,19 +133,16 @@ namespace Microsoft.Terminal.Settings.Model
 
     [default_interface] runtimeclass ExecuteCommandlineArgs : IActionArgs
     {
-        ExecuteCommandlineArgs(String commandline);
         String Commandline;
     };
 
     [default_interface] runtimeclass CloseOtherTabsArgs : IActionArgs
     {
-        CloseOtherTabsArgs(UInt32 tabIndex);
         Windows.Foundation.IReference<UInt32> Index { get; };
     };
 
     [default_interface] runtimeclass CloseTabsAfterArgs : IActionArgs
     {
-        CloseTabsAfterArgs(UInt32 tabIndex);
         Windows.Foundation.IReference<UInt32> Index { get; };
     };
 }

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -14,7 +14,6 @@ using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace ::TerminalApp;
@@ -28,76 +27,76 @@ namespace winrt
 namespace winrt::TerminalApp::implementation
 {
     void TerminalPage::_HandleOpenNewTabDropdown(const IInspectable& /*sender*/,
-                                                 const ActionEventArgs& args)
+                                                 const TerminalApp::ActionEventArgs& args)
     {
         _OpenNewTabDropdown();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleDuplicateTab(const IInspectable& /*sender*/,
-                                           const ActionEventArgs& args)
+                                           const TerminalApp::ActionEventArgs& args)
     {
         _DuplicateTabViewItem();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleCloseTab(const IInspectable& /*sender*/,
-                                       const ActionEventArgs& args)
+                                       const TerminalApp::ActionEventArgs& args)
     {
         _CloseFocusedTab();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleClosePane(const IInspectable& /*sender*/,
-                                        const ActionEventArgs& args)
+                                        const TerminalApp::ActionEventArgs& args)
     {
         _CloseFocusedPane();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleCloseWindow(const IInspectable& /*sender*/,
-                                          const ActionEventArgs& args)
+                                          const TerminalApp::ActionEventArgs& args)
     {
         CloseWindow();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleScrollUp(const IInspectable& /*sender*/,
-                                       const ActionEventArgs& args)
+                                       const TerminalApp::ActionEventArgs& args)
     {
         _Scroll(-1);
         args.Handled(true);
     }
 
     void TerminalPage::_HandleScrollDown(const IInspectable& /*sender*/,
-                                         const ActionEventArgs& args)
+                                         const TerminalApp::ActionEventArgs& args)
     {
         _Scroll(1);
         args.Handled(true);
     }
 
     void TerminalPage::_HandleNextTab(const IInspectable& /*sender*/,
-                                      const ActionEventArgs& args)
+                                      const TerminalApp::ActionEventArgs& args)
     {
         _SelectNextTab(true);
         args.Handled(true);
     }
 
     void TerminalPage::_HandlePrevTab(const IInspectable& /*sender*/,
-                                      const ActionEventArgs& args)
+                                      const TerminalApp::ActionEventArgs& args)
     {
         _SelectNextTab(false);
         args.Handled(true);
     }
 
     void TerminalPage::_HandleSendInput(const IInspectable& /*sender*/,
-                                        const ActionEventArgs& args)
+                                        const TerminalApp::ActionEventArgs& args)
     {
         if (args == nullptr)
         {
             args.Handled(false);
         }
-        else if (const auto& realArgs = args.ActionArgs().try_as<SendInputArgs>())
+        else if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SendInputArgs>())
         {
             const auto termControl = _GetActiveControl();
             termControl.SendInput(realArgs.Input());
@@ -106,13 +105,13 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleSplitPane(const IInspectable& /*sender*/,
-                                        const ActionEventArgs& args)
+                                        const TerminalApp::ActionEventArgs& args)
     {
         if (args == nullptr)
         {
             args.Handled(false);
         }
-        else if (const auto& realArgs = args.ActionArgs().try_as<SplitPaneArgs>())
+        else if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SplitPaneArgs>())
         {
             _SplitPane(realArgs.SplitStyle(), realArgs.SplitMode(), realArgs.TerminalArgs());
             args.Handled(true);
@@ -120,7 +119,7 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleTogglePaneZoom(const IInspectable& /*sender*/,
-                                             const ActionEventArgs& args)
+                                             const TerminalApp::ActionEventArgs& args)
     {
         auto activeTab = _GetFocusedTab();
 
@@ -133,32 +132,31 @@ namespace winrt::TerminalApp::implementation
             // be removed before it's re-added in Pane::Restore
             _tabContent.Children().Clear();
 
+            // Togging the zoom on the tab will cause the tab to inform us of
+            // the new root Content for this tab.
             activeTab->ToggleZoom();
-
-            // Update the selected tab, to trigger us to re-add the tab's GetRootElement to the UI tree
-            _UpdatedSelectedTab(_tabView.SelectedIndex());
         }
         args.Handled(true);
     }
 
     void TerminalPage::_HandleScrollUpPage(const IInspectable& /*sender*/,
-                                           const ActionEventArgs& args)
+                                           const TerminalApp::ActionEventArgs& args)
     {
         _ScrollPage(-1);
         args.Handled(true);
     }
 
     void TerminalPage::_HandleScrollDownPage(const IInspectable& /*sender*/,
-                                             const ActionEventArgs& args)
+                                             const TerminalApp::ActionEventArgs& args)
     {
         _ScrollPage(1);
         args.Handled(true);
     }
 
     void TerminalPage::_HandleOpenSettings(const IInspectable& /*sender*/,
-                                           const ActionEventArgs& args)
+                                           const TerminalApp::ActionEventArgs& args)
     {
-        if (const auto& realArgs = args.ActionArgs().try_as<OpenSettingsArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::OpenSettingsArgs>())
         {
             _LaunchSettings(realArgs.Target());
             args.Handled(true);
@@ -166,21 +164,21 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandlePasteText(const IInspectable& /*sender*/,
-                                        const ActionEventArgs& args)
+                                        const TerminalApp::ActionEventArgs& args)
     {
         _PasteText();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleNewTab(const IInspectable& /*sender*/,
-                                     const ActionEventArgs& args)
+                                     const TerminalApp::ActionEventArgs& args)
     {
         if (args == nullptr)
         {
             _OpenNewTab(nullptr);
             args.Handled(true);
         }
-        else if (const auto& realArgs = args.ActionArgs().try_as<NewTabArgs>())
+        else if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::NewTabArgs>())
         {
             _OpenNewTab(realArgs.TerminalArgs());
             args.Handled(true);
@@ -188,9 +186,9 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleSwitchToTab(const IInspectable& /*sender*/,
-                                          const ActionEventArgs& args)
+                                          const TerminalApp::ActionEventArgs& args)
     {
-        if (const auto& realArgs = args.ActionArgs().try_as<SwitchToTabArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SwitchToTabArgs>())
         {
             const auto handled = _SelectTab({ realArgs.TabIndex() });
             args.Handled(handled);
@@ -198,11 +196,11 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleResizePane(const IInspectable& /*sender*/,
-                                         const ActionEventArgs& args)
+                                         const TerminalApp::ActionEventArgs& args)
     {
-        if (const auto& realArgs = args.ActionArgs().try_as<ResizePaneArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::ResizePaneArgs>())
         {
-            if (realArgs.Direction() == Direction::None)
+            if (realArgs.Direction() == TerminalApp::Direction::None)
             {
                 // Do nothing
                 args.Handled(false);
@@ -216,11 +214,11 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleMoveFocus(const IInspectable& /*sender*/,
-                                        const ActionEventArgs& args)
+                                        const TerminalApp::ActionEventArgs& args)
     {
-        if (const auto& realArgs = args.ActionArgs().try_as<MoveFocusArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::MoveFocusArgs>())
         {
-            if (realArgs.Direction() == Direction::None)
+            if (realArgs.Direction() == TerminalApp::Direction::None)
             {
                 // Do nothing
                 args.Handled(false);
@@ -234,9 +232,9 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleCopyText(const IInspectable& /*sender*/,
-                                       const ActionEventArgs& args)
+                                       const TerminalApp::ActionEventArgs& args)
     {
-        if (const auto& realArgs = args.ActionArgs().try_as<CopyTextArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::CopyTextArgs>())
         {
             const auto handled = _CopyText(realArgs.SingleLine(), realArgs.CopyFormatting());
             args.Handled(handled);
@@ -244,9 +242,9 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleAdjustFontSize(const IInspectable& /*sender*/,
-                                             const ActionEventArgs& args)
+                                             const TerminalApp::ActionEventArgs& args)
     {
-        if (const auto& realArgs = args.ActionArgs().try_as<AdjustFontSizeArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::AdjustFontSizeArgs>())
         {
             const auto termControl = _GetActiveControl();
             termControl.AdjustFontSize(realArgs.Delta());
@@ -255,14 +253,14 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleFind(const IInspectable& /*sender*/,
-                                   const ActionEventArgs& args)
+                                   const TerminalApp::ActionEventArgs& args)
     {
         _Find();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleResetFontSize(const IInspectable& /*sender*/,
-                                            const ActionEventArgs& args)
+                                            const TerminalApp::ActionEventArgs& args)
     {
         const auto termControl = _GetActiveControl();
         termControl.ResetFontSize();
@@ -270,7 +268,7 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleToggleRetroEffect(const IInspectable& /*sender*/,
-                                                const ActionEventArgs& args)
+                                                const TerminalApp::ActionEventArgs& args)
     {
         const auto termControl = _GetActiveControl();
         termControl.ToggleRetroEffect();
@@ -278,28 +276,28 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleToggleFocusMode(const IInspectable& /*sender*/,
-                                              const ActionEventArgs& args)
+                                              const TerminalApp::ActionEventArgs& args)
     {
         ToggleFocusMode();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleToggleFullscreen(const IInspectable& /*sender*/,
-                                               const ActionEventArgs& args)
+                                               const TerminalApp::ActionEventArgs& args)
     {
         ToggleFullscreen();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleToggleAlwaysOnTop(const IInspectable& /*sender*/,
-                                                const ActionEventArgs& args)
+                                                const TerminalApp::ActionEventArgs& args)
     {
         ToggleAlwaysOnTop();
         args.Handled(true);
     }
 
     void TerminalPage::_HandleToggleCommandPalette(const IInspectable& /*sender*/,
-                                                   const ActionEventArgs& args)
+                                                   const TerminalApp::ActionEventArgs& args)
     {
         // TODO GH#6677: When we add support for commandline mode, first set the
         // mode that the command palette should be in, before making it visible.
@@ -311,10 +309,10 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleSetColorScheme(const IInspectable& /*sender*/,
-                                             const ActionEventArgs& args)
+                                             const TerminalApp::ActionEventArgs& args)
     {
         args.Handled(false);
-        if (const auto& realArgs = args.ActionArgs().try_as<SetColorSchemeArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SetColorSchemeArgs>())
         {
             if (auto activeTab = _GetFocusedTab())
             {
@@ -333,11 +331,11 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleSetTabColor(const IInspectable& /*sender*/,
-                                          const ActionEventArgs& args)
+                                          const TerminalApp::ActionEventArgs& args)
     {
         std::optional<til::color> tabColor;
 
-        if (const auto& realArgs = args.ActionArgs().try_as<SetTabColorArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::SetTabColorArgs>())
         {
             if (realArgs.TabColor() != nullptr)
             {
@@ -361,7 +359,7 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleOpenTabColorPicker(const IInspectable& /*sender*/,
-                                                 const ActionEventArgs& args)
+                                                 const TerminalApp::ActionEventArgs& args)
     {
         auto activeTab = _GetFocusedTab();
         if (activeTab)
@@ -372,11 +370,11 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleRenameTab(const IInspectable& /*sender*/,
-                                        const ActionEventArgs& args)
+                                        const TerminalApp::ActionEventArgs& args)
     {
         std::optional<winrt::hstring> title;
 
-        if (const auto& realArgs = args.ActionArgs().try_as<RenameTabArgs>())
+        if (const auto& realArgs = args.ActionArgs().try_as<TerminalApp::RenameTabArgs>())
         {
             title = realArgs.Title();
         }
@@ -397,11 +395,11 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleExecuteCommandline(const IInspectable& /*sender*/,
-                                                 const ActionEventArgs& actionArgs)
+                                                 const TerminalApp::ActionEventArgs& actionArgs)
     {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<ExecuteCommandlineArgs>())
+        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::ExecuteCommandlineArgs>())
         {
-            auto actions = winrt::single_threaded_vector<ActionAndArgs>(std::move(
+            auto actions = winrt::single_threaded_vector<winrt::TerminalApp::ActionAndArgs>(std::move(
                 TerminalPage::ConvertExecuteCommandlineToActions(realArgs)));
 
             if (_startupActions.Size() != 0)
@@ -413,9 +411,9 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleCloseOtherTabs(const IInspectable& /*sender*/,
-                                             const ActionEventArgs& actionArgs)
+                                             const TerminalApp::ActionEventArgs& actionArgs)
     {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<CloseOtherTabsArgs>())
+        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseOtherTabsArgs>())
         {
             uint32_t index;
             if (realArgs.Index())
@@ -450,9 +448,9 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleCloseTabsAfter(const IInspectable& /*sender*/,
-                                             const ActionEventArgs& actionArgs)
+                                             const TerminalApp::ActionEventArgs& actionArgs)
     {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<CloseTabsAfterArgs>())
+        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseTabsAfterArgs>())
         {
             uint32_t index;
             if (realArgs.Index())
@@ -487,8 +485,16 @@ namespace winrt::TerminalApp::implementation
     }
 
     void TerminalPage::_HandleOpenTabSearch(const IInspectable& /*sender*/,
-                                            const ActionEventArgs& args)
+                                            const TerminalApp::ActionEventArgs& args)
     {
+        // Tab search is always in-order.
+        auto tabCommands = winrt::single_threaded_vector<TerminalApp::Command>();
+        for (const auto& tab : _tabs)
+        {
+            tabCommands.Append(tab.SwitchToTabCommand());
+        }
+        CommandPalette().SetTabActions(tabCommands);
+
         auto opt = _GetFocusedTabIndex();
         uint32_t startIdx = opt.value_or(0);
 

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -4,10 +4,10 @@
 #include "pch.h"
 #include "AppLogic.h"
 #include "AppCommandlineArgs.h"
+#include "ActionArgs.h"
 #include <LibraryResources.h>
 
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace TerminalApp;
 
 // Either a ; at the start of a line, or a ; preceded by any non-\ char.
@@ -159,42 +159,33 @@ void AppCommandlineArgs::_buildParser()
 {
     // -v,--version: Displays version info
     auto versionCallback = [this](int64_t /*count*/) {
-        // Set our message to display the application name and the current version.
-        _exitMessage = fmt::format("{0}\n{1}",
-                                   til::u16u8(CascadiaSettings::ApplicationDisplayName()),
-                                   til::u16u8(CascadiaSettings::ApplicationVersion()));
-        // Theoretically, we don't need to exit now, since this isn't really
-        // an error case. However, in practice, it feels weird to have `wt
-        // -v` open a new tab, and makes enough sense that `wt -v ;
-        // split-pane` (or whatever) just displays the version and exits.
-        _shouldExitEarly = true;
+        if (const auto appLogic{ winrt::TerminalApp::implementation::AppLogic::Current() })
+        {
+            // Set our message to display the application name and the current version.
+            _exitMessage = fmt::format("{0}\n{1}",
+                                       til::u16u8(appLogic->ApplicationDisplayName()),
+                                       til::u16u8(appLogic->ApplicationVersion()));
+            // Theoretically, we don't need to exit now, since this isn't really
+            // an error case. However, in practice, it feels weird to have `wt
+            // -v` open a new tab, and makes enough sense that `wt -v ;
+            // split-pane` (or whatever) just displays the version and exits.
+            _shouldExitEarly = true;
+        }
     };
     _app.add_flag_function("-v,--version", versionCallback, RS_A(L"CmdVersionDesc"));
 
-    // Launch mode related flags
+    // Maximized and Fullscreen flags
     //   -M,--maximized: Maximizes the window on launch
     //   -F,--fullscreen: Fullscreens the window on launch
-    //   -f,--focus: Sets the terminal into the Focus mode
-    // While fullscreen excludes both maximized and focus mode, the user can combine between the maximized and focused (-fM)
     auto maximizedCallback = [this](int64_t /*count*/) {
-        _launchMode = (_launchMode.has_value() && _launchMode.value() == LaunchMode::FocusMode) ?
-                          LaunchMode::MaximizedFocusMode :
-                          LaunchMode::MaximizedMode;
+        _launchMode = winrt::TerminalApp::LaunchMode::MaximizedMode;
     };
     auto fullscreenCallback = [this](int64_t /*count*/) {
-        _launchMode = LaunchMode::FullscreenMode;
+        _launchMode = winrt::TerminalApp::LaunchMode::FullscreenMode;
     };
-    auto focusCallback = [this](int64_t /*count*/) {
-        _launchMode = (_launchMode.has_value() && _launchMode.value() == LaunchMode::MaximizedMode) ?
-                          LaunchMode::MaximizedFocusMode :
-                          LaunchMode::FocusMode;
-    };
-
     auto maximized = _app.add_flag_function("-M,--maximized", maximizedCallback, RS_A(L"CmdMaximizedDesc"));
     auto fullscreen = _app.add_flag_function("-F,--fullscreen", fullscreenCallback, RS_A(L"CmdFullscreenDesc"));
-    auto focus = _app.add_flag_function("-f,--focus", focusCallback, RS_A(L"CmdFocusDesc"));
     maximized->excludes(fullscreen);
-    focus->excludes(fullscreen);
 
     // Subcommands
     _buildNewTabParser();
@@ -223,13 +214,14 @@ void AppCommandlineArgs::_buildNewTabParser()
         // command was parsed.
         subcommand.subcommand->callback([&, this]() {
             // Build the NewTab action from the values we've parsed on the commandline.
-            ActionAndArgs newTabAction{};
-            newTabAction.Action(ShortcutAction::NewTab);
+            auto newTabAction = winrt::make_self<implementation::ActionAndArgs>();
+            newTabAction->Action(ShortcutAction::NewTab);
+            auto args = winrt::make_self<implementation::NewTabArgs>();
             // _getNewTerminalArgs MUST be called before parsing any other options,
             // as it might clear those options while finding the commandline
-            NewTabArgs args{ _getNewTerminalArgs(subcommand) };
-            newTabAction.Args(args);
-            _startupActions.push_back(newTabAction);
+            args->TerminalArgs(_getNewTerminalArgs(subcommand));
+            newTabAction->Args(*args);
+            _startupActions.push_back(*newTabAction);
         });
     };
 
@@ -265,29 +257,29 @@ void AppCommandlineArgs::_buildSplitPaneParser()
         // command was parsed.
         subcommand.subcommand->callback([&, this]() {
             // Build the SplitPane action from the values we've parsed on the commandline.
-            ActionAndArgs splitPaneActionAndArgs{};
-            splitPaneActionAndArgs.Action(ShortcutAction::SplitPane);
-
+            auto splitPaneActionAndArgs = winrt::make_self<implementation::ActionAndArgs>();
+            splitPaneActionAndArgs->Action(ShortcutAction::SplitPane);
+            auto args = winrt::make_self<implementation::SplitPaneArgs>();
             // _getNewTerminalArgs MUST be called before parsing any other options,
             // as it might clear those options while finding the commandline
-            auto terminalArgs{ _getNewTerminalArgs(subcommand) };
-            auto style{ SplitState::Automatic };
+            args->TerminalArgs(_getNewTerminalArgs(subcommand));
+            args->SplitStyle(SplitState::Automatic);
             // Make sure to use the `Option`s here to check if they were set -
             // _getNewTerminalArgs might reset them while parsing a commandline
             if ((*subcommand._horizontalOption || *subcommand._verticalOption))
             {
                 if (_splitHorizontal)
                 {
-                    style = SplitState::Horizontal;
+                    args->SplitStyle(SplitState::Horizontal);
                 }
                 else if (_splitVertical)
                 {
-                    style = SplitState::Vertical;
+                    args->SplitStyle(SplitState::Vertical);
                 }
             }
-            SplitPaneArgs args{ style, terminalArgs };
-            splitPaneActionAndArgs.Args(args);
-            _startupActions.push_back(splitPaneActionAndArgs);
+
+            splitPaneActionAndArgs->Args(*args);
+            _startupActions.push_back(*splitPaneActionAndArgs);
         });
     };
 
@@ -327,19 +319,20 @@ void AppCommandlineArgs::_buildFocusTabParser()
         // command was parsed.
         subcommand->callback([&, this]() {
             // Build the action from the values we've parsed on the commandline.
-            ActionAndArgs focusTabAction{};
+            auto focusTabAction = winrt::make_self<implementation::ActionAndArgs>();
 
             if (_focusTabIndex >= 0)
             {
-                focusTabAction.Action(ShortcutAction::SwitchToTab);
-                SwitchToTabArgs args{ static_cast<unsigned int>(_focusTabIndex) };
-                focusTabAction.Args(args);
-                _startupActions.push_back(focusTabAction);
+                focusTabAction->Action(ShortcutAction::SwitchToTab);
+                auto args = winrt::make_self<implementation::SwitchToTabArgs>();
+                args->TabIndex(_focusTabIndex);
+                focusTabAction->Args(*args);
+                _startupActions.push_back(*focusTabAction);
             }
             else if (_focusNextTab || _focusPrevTab)
             {
-                focusTabAction.Action(_focusNextTab ? ShortcutAction::NextTab : ShortcutAction::PrevTab);
-                _startupActions.push_back(std::move(focusTabAction));
+                focusTabAction->Action(_focusNextTab ? ShortcutAction::NextTab : ShortcutAction::PrevTab);
+                _startupActions.push_back(*focusTabAction);
             }
         });
     };
@@ -386,7 +379,7 @@ void AppCommandlineArgs::_addNewTerminalArgs(AppCommandlineArgs::NewTerminalSubc
 // - A fully initialized NewTerminalArgs corresponding to values we've currently parsed.
 NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewTerminalSubcommand& subcommand)
 {
-    NewTerminalArgs args{};
+    auto args = winrt::make_self<implementation::NewTerminalArgs>();
 
     if (!_commandline.empty())
     {
@@ -410,25 +403,25 @@ NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewT
             }
         }
 
-        args.Commandline(winrt::to_hstring(cmdlineBuffer.str()));
+        args->Commandline(winrt::to_hstring(cmdlineBuffer.str()));
     }
 
     if (*subcommand.profileNameOption)
     {
-        args.Profile(winrt::to_hstring(_profileName));
+        args->Profile(winrt::to_hstring(_profileName));
     }
 
     if (*subcommand.startingDirectoryOption)
     {
-        args.StartingDirectory(winrt::to_hstring(_startingDirectory));
+        args->StartingDirectory(winrt::to_hstring(_startingDirectory));
     }
 
     if (*subcommand.titleOption)
     {
-        args.TabTitle(winrt::to_hstring(_startingTitle));
+        args->TabTitle(winrt::to_hstring(_startingTitle));
     }
 
-    return args;
+    return *args;
 }
 
 // Method Description:
@@ -606,7 +599,7 @@ void AppCommandlineArgs::_addCommandsForArg(std::vector<Commandline>& commands,
 // - <none>
 // Return Value:
 // - the deque of actions we've buffered as a result of parsing commands.
-std::vector<ActionAndArgs>& AppCommandlineArgs::GetStartupActions()
+std::vector<winrt::TerminalApp::ActionAndArgs>& AppCommandlineArgs::GetStartupActions()
 {
     return _startupActions;
 }
@@ -659,15 +652,18 @@ void AppCommandlineArgs::ValidateStartupCommands()
         _startupActions.front().Action() != ShortcutAction::NewTab)
     {
         // Build the NewTab action from the values we've parsed on the commandline.
-        NewTerminalArgs newTerminalArgs{};
-        NewTabArgs args{ newTerminalArgs };
-        ActionAndArgs newTabAction{ ShortcutAction::NewTab, args };
+        auto newTabAction = winrt::make_self<implementation::ActionAndArgs>();
+        newTabAction->Action(ShortcutAction::NewTab);
+        auto args = winrt::make_self<implementation::NewTabArgs>();
+        auto newTerminalArgs = winrt::make_self<implementation::NewTerminalArgs>();
+        args->TerminalArgs(*newTerminalArgs);
+        newTabAction->Args(*args);
         // push the arg onto the front
-        _startupActions.insert(_startupActions.begin(), 1, newTabAction);
+        _startupActions.insert(_startupActions.begin(), 1, *newTabAction);
     }
 }
 
-std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> AppCommandlineArgs::GetLaunchMode() const noexcept
+std::optional<winrt::TerminalApp::LaunchMode> AppCommandlineArgs::GetLaunchMode() const noexcept
 {
     return _launchMode;
 }

src/cascadia/TerminalApp/AppCommandlineArgs.h

@@ -2,6 +2,8 @@
 // Licensed under the MIT license.
 #pragma once
 
+#include "ActionAndArgs.h"
+
 #include "Commandline.h"
 
 #ifdef UNIT_TESTING
@@ -34,11 +36,11 @@ public:
     static std::vector<Commandline> BuildCommands(winrt::array_view<const winrt::hstring>& args);
 
     void ValidateStartupCommands();
-    std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs>& GetStartupActions();
+    std::vector<winrt::TerminalApp::ActionAndArgs>& GetStartupActions();
     const std::string& GetExitMessage();
     bool ShouldExitEarly() const noexcept;
 
-    std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> GetLaunchMode() const noexcept;
+    std::optional<winrt::TerminalApp::LaunchMode> GetLaunchMode() const noexcept;
 
 private:
     static const std::wregex _commandDelimiterRegex;
@@ -87,14 +89,14 @@ private:
     bool _focusNextTab{ false };
     bool _focusPrevTab{ false };
 
-    std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> _launchMode{ std::nullopt };
+    std::optional<winrt::TerminalApp::LaunchMode> _launchMode{ std::nullopt };
     // Are you adding more args here? Make sure to reset them in _resetStateToDefault
 
-    std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> _startupActions;
+    std::vector<winrt::TerminalApp::ActionAndArgs> _startupActions;
     std::string _exitMessage;
     bool _shouldExitEarly{ false };
 
-    winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs _getNewTerminalArgs(NewTerminalSubcommand& subcommand);
+    winrt::TerminalApp::NewTerminalArgs _getNewTerminalArgs(NewTerminalSubcommand& subcommand);
     void _addNewTerminalArgs(NewTerminalSubcommand& subcommand);
     void _buildParser();
     void _buildNewTabParser();

src/cascadia/TerminalApp/AppKeyBindings.cpp

@@ -27,7 +27,7 @@ namespace winrt::TerminalApp::implementation
         _dispatch = dispatch;
     }
 
-    void AppKeyBindings::SetKeyMapping(const winrt::Microsoft::Terminal::Settings::Model::KeyMapping& keymap)
+    void AppKeyBindings::SetKeyMapping(const winrt::TerminalApp::KeyMapping& keymap)
     {
         _keymap = keymap;
     }

src/cascadia/TerminalApp/AppKeyBindings.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "AppKeyBindings.g.h"
+#include "ActionArgs.h"
 #include "ShortcutActionDispatch.h"
 #include "..\inc\cppwinrt_utils.h"
 
@@ -11,6 +12,8 @@
 namespace TerminalAppLocalTests
 {
     class SettingsTests;
+    class KeyBindingsTests;
+    class TestUtils;
 }
 
 namespace winrt::TerminalApp::implementation
@@ -22,14 +25,16 @@ namespace winrt::TerminalApp::implementation
         bool TryKeyChord(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& kc);
 
         void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
-        void SetKeyMapping(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap);
+        void SetKeyMapping(const winrt::TerminalApp::KeyMapping& keymap);
 
     private:
-        winrt::Microsoft::Terminal::Settings::Model::KeyMapping _keymap{ nullptr };
+        winrt::TerminalApp::KeyMapping _keymap{ nullptr };
 
         winrt::TerminalApp::ShortcutActionDispatch _dispatch{ nullptr };
 
         friend class TerminalAppLocalTests::SettingsTests;
+        friend class TerminalAppLocalTests::KeyBindingsTests;
+        friend class TerminalAppLocalTests::TestUtils;
     };
 }
 

src/cascadia/TerminalApp/AppKeyBindings.idl

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 import "ShortcutActionDispatch.idl";
+import "KeyMapping.idl";
 
 namespace TerminalApp
 {
@@ -9,6 +10,6 @@ namespace TerminalApp
         AppKeyBindings();
 
         void SetDispatch(ShortcutActionDispatch dispatch);
-        void SetKeyMapping(Microsoft.Terminal.Settings.Model.KeyMapping keymap);
+        void SetKeyMapping(KeyMapping keymap);
     }
 }

src/cascadia/TerminalApp/AppLogic.cpp

@@ -16,7 +16,6 @@ using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace ::TerminalApp;
 
 namespace winrt
@@ -30,7 +29,7 @@ static const winrt::hstring StartupTaskName = L"StartTerminalOnLoginTask";
 // !!! IMPORTANT !!!
 // Make sure that these keys are in the same order as the
 // SettingsLoadWarnings/Errors enum is!
-static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadWarnings::WARNINGS_SIZE)> settingsLoadWarningsLabels {
+static const std::array<std::wstring_view, static_cast<uint32_t>(winrt::TerminalApp::SettingsLoadWarnings::WARNINGS_SIZE)> settingsLoadWarningsLabels {
     USES_RESOURCE(L"MissingDefaultProfileText"),
     USES_RESOURCE(L"DuplicateProfileText"),
     USES_RESOURCE(L"UnknownColorSchemeText"),
@@ -40,9 +39,10 @@ static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadWar
     USES_RESOURCE(L"TooManyKeysForChord"),
     USES_RESOURCE(L"MissingRequiredParameter"),
     USES_RESOURCE(L"LegacyGlobalsProperty"),
-    USES_RESOURCE(L"FailedToParseCommandJson")
+    USES_RESOURCE(L"FailedToParseCommandJson"),
+    USES_RESOURCE(L"FailedToWriteToSettings")
 };
-static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
+static const std::array<std::wstring_view, static_cast<uint32_t>(winrt::TerminalApp::SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
     USES_RESOURCE(L"NoProfilesText"),
     USES_RESOURCE(L"AllProfilesHiddenText")
 };
@@ -77,7 +77,7 @@ static winrt::hstring _GetMessageText(uint32_t index, std::array<std::wstring_vi
 // - warning: the SettingsLoadWarnings value to get the localized text for.
 // Return Value:
 // - localized text for the given warning
-static winrt::hstring _GetWarningText(SettingsLoadWarnings warning)
+static winrt::hstring _GetWarningText(winrt::TerminalApp::SettingsLoadWarnings warning)
 {
     return _GetMessageText(static_cast<uint32_t>(warning), settingsLoadWarningsLabels);
 }
@@ -90,7 +90,7 @@ static winrt::hstring _GetWarningText(SettingsLoadWarnings warning)
 // - error: the SettingsLoadErrors value to get the localized text for.
 // Return Value:
 // - localized text for the given error
-static winrt::hstring _GetErrorText(SettingsLoadErrors error)
+static winrt::hstring _GetErrorText(winrt::TerminalApp::SettingsLoadErrors error)
 {
     return _GetMessageText(static_cast<uint32_t>(error), settingsLoadErrorsLabels);
 }
@@ -170,7 +170,7 @@ namespace winrt::TerminalApp::implementation
     // - Returns the settings currently in use by the entire Terminal application.
     // Throws:
     // - HR E_INVALIDARG if the app isn't up and running.
-    const CascadiaSettings AppLogic::CurrentAppSettings()
+    const TerminalApp::CascadiaSettings AppLogic::CurrentAppSettings()
     {
         auto appLogic{ ::winrt::TerminalApp::implementation::AppLogic::Current() };
         THROW_HR_IF_NULL(E_INVALIDARG, appLogic);
@@ -265,10 +265,6 @@ namespace winrt::TerminalApp::implementation
             {
                 _root->ToggleFullscreen();
             }
-            else if (launchMode == LaunchMode::FocusMode || launchMode == LaunchMode::MaximizedFocusMode)
-            {
-                _root->ToggleFocusMode();
-            }
         });
         _root->Create();
 
@@ -469,6 +465,11 @@ namespace winrt::TerminalApp::implementation
     void AppLogic::_OnLoaded(const IInspectable& /*sender*/,
                              const RoutedEventArgs& /*eventArgs*/)
     {
+        const auto keyboardServiceIsDisabled = !_IsKeyboardServiceEnabled();
+        if (keyboardServiceIsDisabled)
+        {
+            _root->ShowKeyboardServiceWarning();
+        }
         if (FAILED(_settingsLoadedResult))
         {
             const winrt::hstring titleKey = USES_RESOURCE(L"InitialJsonParseErrorTitle");
@@ -481,6 +482,51 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    // Method Description:
+    // - Helper for determining if the "Touch Keyboard and Handwriting Panel
+    //   Service" is enabled. If it isn't, we want to be able to display a
+    //   warning to the user, because they won't be able to type in the
+    //   Terminal.
+    // Return Value:
+    // - true if the service is enabled, or if we fail to query the service. We
+    //   return true in that case, to be less noisy (though, that is unexpected)
+    bool AppLogic::_IsKeyboardServiceEnabled()
+    {
+        if (IsUwp())
+        {
+            return true;
+        }
+
+        // If at any point we fail to open the service manager, the service,
+        // etc, then just quick return true to disable the dialog. We'd rather
+        // not be noisy with this dialog if we failed for some reason.
+
+        // Open the service manager. This will return 0 if it failed.
+        wil::unique_schandle hManager{ OpenSCManager(nullptr, nullptr, 0) };
+
+        if (LOG_LAST_ERROR_IF(!hManager.is_valid()))
+        {
+            return true;
+        }
+
+        // Get a handle to the keyboard service
+        wil::unique_schandle hService{ OpenService(hManager.get(), TabletInputServiceKey.data(), SERVICE_QUERY_STATUS) };
+        if (LOG_LAST_ERROR_IF(!hService.is_valid()))
+        {
+            return true;
+        }
+
+        // Get the current state of the service
+        SERVICE_STATUS status{ 0 };
+        if (!LOG_IF_WIN32_BOOL_FALSE(QueryServiceStatus(hService.get(), &status)))
+        {
+            return true;
+        }
+
+        const auto state = status.dwCurrentState;
+        return (state == SERVICE_RUNNING || state == SERVICE_START_PENDING);
+    }
+
     // Method Description:
     // - Get the size in pixels of the client area we'll need to launch this
     //   terminal app. This method will use the default profile's settings to do
@@ -614,6 +660,17 @@ namespace winrt::TerminalApp::implementation
         return _settings.GlobalSettings().ShowTabsInTitlebar();
     }
 
+    bool AppLogic::GetInitialAlwaysOnTop()
+    {
+        if (!_loadedInitialSettings)
+        {
+            // Load settings if we haven't already
+            LoadSettings();
+        }
+
+        return _settings.GlobalSettings().AlwaysOnTop();
+    }
+
     // Method Description:
     // - See Pane::CalcSnappedDimension
     float AppLogic::CalcSnappedDimension(const bool widthOrHeight, const float dimension) const
@@ -723,7 +780,7 @@ namespace winrt::TerminalApp::implementation
     void AppLogic::_RegisterSettingsChange()
     {
         // Get the containing folder.
-        const std::filesystem::path settingsPath{ std::wstring_view{ CascadiaSettings::SettingsPath() } };
+        const auto settingsPath{ CascadiaSettings::GetSettingsPath() };
         const auto folder = settingsPath.parent_path();
 
         _reader.create(folder.c_str(),
@@ -875,7 +932,7 @@ namespace winrt::TerminalApp::implementation
 
     // Method Description:
     // - Returns a pointer to the global shared settings.
-    [[nodiscard]] CascadiaSettings AppLogic::GetSettings() const noexcept
+    [[nodiscard]] TerminalApp::CascadiaSettings AppLogic::GetSettings() const noexcept
     {
         return _settings;
     }
@@ -1046,6 +1103,65 @@ namespace winrt::TerminalApp::implementation
         return _appArgs.ShouldExitEarly();
     }
 
+    winrt::hstring AppLogic::ApplicationDisplayName() const
+    {
+        try
+        {
+            const auto package{ winrt::Windows::ApplicationModel::Package::Current() };
+            return package.DisplayName();
+        }
+        CATCH_LOG();
+
+        return RS_(L"ApplicationDisplayNameUnpackaged");
+    }
+
+    winrt::hstring AppLogic::ApplicationVersion() const
+    {
+        try
+        {
+            const auto package{ winrt::Windows::ApplicationModel::Package::Current() };
+            const auto version{ package.Id().Version() };
+            winrt::hstring formatted{ wil::str_printf<std::wstring>(L"%u.%u.%u.%u", version.Major, version.Minor, version.Build, version.Revision) };
+            return formatted;
+        }
+        CATCH_LOG();
+
+        // Try to get the version the old-fashioned way
+        try
+        {
+            struct LocalizationInfo
+            {
+                WORD language, codepage;
+            };
+            // Use the current module instance handle for TerminalApp.dll, nullptr for WindowsTerminal.exe
+            auto filename{ wil::GetModuleFileNameW<std::wstring>(wil::GetModuleInstanceHandle()) };
+            auto size{ GetFileVersionInfoSizeExW(0, filename.c_str(), nullptr) };
+            THROW_LAST_ERROR_IF(size == 0);
+            auto versionBuffer{ std::make_unique<std::byte[]>(size) };
+            THROW_IF_WIN32_BOOL_FALSE(GetFileVersionInfoExW(0, filename.c_str(), 0, size, versionBuffer.get()));
+
+            // Get the list of Version localizations
+            LocalizationInfo* pVarLocalization{ nullptr };
+            UINT varLen{ 0 };
+            THROW_IF_WIN32_BOOL_FALSE(VerQueryValueW(versionBuffer.get(), L"\\VarFileInfo\\Translation", reinterpret_cast<void**>(&pVarLocalization), &varLen));
+            THROW_HR_IF(E_UNEXPECTED, varLen < sizeof(*pVarLocalization)); // there must be at least one translation
+
+            // Get the product version from the localized version compartment
+            // We're using String/ProductVersion here because our build pipeline puts more rich information in it (like the branch name)
+            // than in the unlocalized numeric version fields.
+            WCHAR* pProductVersion{ nullptr };
+            UINT versionLen{ 0 };
+            const auto localizedVersionName{ wil::str_printf<std::wstring>(L"\\StringFileInfo\\%04x%04x\\ProductVersion",
+                                                                           pVarLocalization->language ? pVarLocalization->language : 0x0409, // well-known en-US LCID
+                                                                           pVarLocalization->codepage) };
+            THROW_IF_WIN32_BOOL_FALSE(VerQueryValueW(versionBuffer.get(), localizedVersionName.c_str(), reinterpret_cast<void**>(&pProductVersion), &versionLen));
+            return { pProductVersion };
+        }
+        CATCH_LOG();
+
+        return RS_(L"ApplicationVersionUnknown");
+    }
+
     bool AppLogic::FocusMode() const
     {
         return _root ? _root->FocusMode() : false;

src/cascadia/TerminalApp/AppLogic.h

@@ -6,6 +6,7 @@
 #include "AppLogic.g.h"
 
 #include "Tab.h"
+#include "CascadiaSettings.h"
 #include "TerminalPage.h"
 #include "Jumplist.h"
 #include "../../cascadia/inc/cppwinrt_utils.h"
@@ -16,7 +17,7 @@ namespace winrt::TerminalApp::implementation
     {
     public:
         static AppLogic* Current() noexcept;
-        static const Microsoft::Terminal::Settings::Model::CascadiaSettings CurrentAppSettings();
+        static const TerminalApp::CascadiaSettings CurrentAppSettings();
 
         AppLogic();
         ~AppLogic() = default;
@@ -26,12 +27,14 @@ namespace winrt::TerminalApp::implementation
         void RunAsUwp();
         bool IsElevated() const noexcept;
         void LoadSettings();
-        [[nodiscard]] Microsoft::Terminal::Settings::Model::CascadiaSettings GetSettings() const noexcept;
+        [[nodiscard]] TerminalApp::CascadiaSettings GetSettings() const noexcept;
 
         int32_t SetStartupCommandline(array_view<const winrt::hstring> actions);
         winrt::hstring ParseCommandlineMessage();
         bool ShouldExitEarly();
 
+        winrt::hstring ApplicationDisplayName() const;
+        winrt::hstring ApplicationVersion() const;
         bool FocusMode() const;
         bool Fullscreen() const;
         bool AlwaysOnTop() const;
@@ -39,8 +42,9 @@ namespace winrt::TerminalApp::implementation
         Windows::Foundation::Size GetLaunchDimensions(uint32_t dpi);
         TerminalApp::InitialPosition GetInitialPosition(int64_t defaultInitialX, int64_t defaultInitialY);
         winrt::Windows::UI::Xaml::ElementTheme GetRequestedTheme();
-        Microsoft::Terminal::Settings::Model::LaunchMode GetLaunchMode();
+        LaunchMode GetLaunchMode();
         bool GetShowTabsInTitlebar();
+        bool GetInitialAlwaysOnTop();
         float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
 
         Windows::UI::Xaml::UIElement GetRoot() noexcept;
@@ -67,7 +71,7 @@ namespace winrt::TerminalApp::implementation
         // updated in _ApplyTheme. The root currently is _root.
         winrt::com_ptr<TerminalPage> _root{ nullptr };
 
-        Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
+        TerminalApp::CascadiaSettings _settings{ nullptr };
 
         HRESULT _settingsLoadedResult;
         winrt::hstring _settingsLoadExceptionText{};
@@ -85,6 +89,8 @@ namespace winrt::TerminalApp::implementation
 
         void _ShowLoadErrorsDialog(const winrt::hstring& titleKey, const winrt::hstring& contentKey, HRESULT settingsLoadedResult);
         void _ShowLoadWarningsDialog();
+        bool _IsKeyboardServiceEnabled();
+        void _ShowKeyboardServiceDisabledDialog();
 
         fire_and_forget _LoadErrorsDialogRoutine();
         fire_and_forget _ShowLoadWarningsDialogRoutine();

src/cascadia/TerminalApp/AppLogic.idl

@@ -13,6 +13,13 @@ namespace TerminalApp
         Int64 Y;
     };
 
+    enum LaunchMode
+    {
+        DefaultMode,
+        MaximizedMode,
+        FullscreenMode,
+    };
+
     [default_interface] runtimeclass AppLogic : IDirectKeyListener, IDialogPresenter
     {
         AppLogic();
@@ -37,6 +44,9 @@ namespace TerminalApp
 
         String Title { get; };
 
+        String ApplicationDisplayName { get; };
+        String ApplicationVersion { get; };
+
         Boolean FocusMode { get; };
         Boolean Fullscreen { get; };
         Boolean AlwaysOnTop { get; };
@@ -45,8 +55,9 @@ namespace TerminalApp
 
         InitialPosition GetInitialPosition(Int64 defaultInitialX, Int64 defaultInitialY);
         Windows.UI.Xaml.ElementTheme GetRequestedTheme();
-        Microsoft.Terminal.Settings.Model.LaunchMode GetLaunchMode();
+        LaunchMode GetLaunchMode();
         Boolean GetShowTabsInTitlebar();
+        Boolean GetInitialAlwaysOnTop();
         Single CalcSnappedDimension(Boolean widthOrHeight, Single dimension);
         void TitlebarClicked();
         void WindowCloseButtonClicked();

src/cascadia/TerminalApp/AzureCloudShellGenerator.cpp

@@ -3,6 +3,8 @@
 
 #include "pch.h"
 
+#include <winrt/Microsoft.Terminal.TerminalConnection.h>
+
 #include "AzureCloudShellGenerator.h"
 #include "LegacyProfileGeneratorNamespaces.h"
 
@@ -11,9 +13,8 @@
 #include "Utils.h"
 #include "DefaultProfileUtils.h"
 
-using namespace ::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalConnection;
+using namespace ::TerminalApp;
+using namespace winrt::TerminalApp;
 
 std::wstring_view AzureCloudShellGenerator::GetNamespace()
 {
@@ -31,13 +32,13 @@ std::vector<Profile> AzureCloudShellGenerator::GenerateProfiles()
 {
     std::vector<Profile> profiles;
 
-    if (AzureConnection::IsAzureConnectionAvailable())
+    if (winrt::Microsoft::Terminal::TerminalConnection::AzureConnection::IsAzureConnectionAvailable())
     {
         auto azureCloudShellProfile{ CreateDefaultProfile(L"Azure Cloud Shell") };
         azureCloudShellProfile.Commandline(L"Azure");
         azureCloudShellProfile.StartingDirectory(DEFAULT_STARTING_DIRECTORY);
         azureCloudShellProfile.ColorSchemeName(L"Vintage");
-        azureCloudShellProfile.ConnectionType(AzureConnection::ConnectionType());
+        azureCloudShellProfile.ConnectionType(AzureConnectionType);
         profiles.emplace_back(azureCloudShellProfile);
     }
 

src/cascadia/TerminalApp/AzureCloudShellGenerator.h

@@ -18,15 +18,17 @@ Author(s):
 #pragma once
 #include "IDynamicProfileGenerator.h"
 
-namespace Microsoft::Terminal::Settings::Model
+static constexpr winrt::guid AzureConnectionType = { 0xd9fcfdfa, 0xa479, 0x412c, { 0x83, 0xb7, 0xc5, 0x64, 0xe, 0x61, 0xcd, 0x62 } };
+
+namespace TerminalApp
 {
-    class AzureCloudShellGenerator : public IDynamicProfileGenerator
+    class AzureCloudShellGenerator : public TerminalApp::IDynamicProfileGenerator
     {
     public:
         AzureCloudShellGenerator() = default;
         ~AzureCloudShellGenerator() = default;
         std::wstring_view GetNamespace() override;
 
-        std::vector<winrt::Microsoft::Terminal::Settings::Model::Profile> GenerateProfiles() override;
+        std::vector<winrt::TerminalApp::Profile> GenerateProfiles() override;
     };
 };

src/cascadia/TerminalApp/CascadiaSettings.cpp

@@ -9,6 +9,7 @@
 #include "CascadiaSettings.h"
 #include "../../types/inc/utils.hpp"
 #include "../../inc/DefaultSettings.h"
+#include "AppLogic.h"
 #include "Utils.h"
 #include "LibraryResources.h"
 
@@ -18,9 +19,9 @@
 
 #include "CascadiaSettings.g.cpp"
 
-using namespace ::Microsoft::Terminal::Settings::Model;
+using namespace ::TerminalApp;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
-using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace winrt::TerminalApp::implementation;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace Microsoft::Console;
 
@@ -45,7 +46,7 @@ CascadiaSettings::CascadiaSettings() :
 // - addDynamicProfiles: if true, we'll add the built-in DPGs.
 CascadiaSettings::CascadiaSettings(const bool addDynamicProfiles) :
     _globals{ winrt::make_self<implementation::GlobalAppSettings>() },
-    _profiles{ winrt::single_threaded_observable_vector<Model::Profile>() },
+    _profiles{ winrt::single_threaded_observable_vector<TerminalApp::Profile>() },
     _warnings{ winrt::single_threaded_vector<SettingsLoadWarnings>() },
     _deserializationErrorMessage{ L"" }
 {
@@ -57,15 +58,6 @@ CascadiaSettings::CascadiaSettings(const bool addDynamicProfiles) :
     }
 }
 
-CascadiaSettings::CascadiaSettings(winrt::hstring json) :
-    CascadiaSettings(false)
-{
-    const auto jsonString{ til::u16u8(json) };
-    _ParseJsonString(jsonString, false);
-    LayerJson(_userSettings);
-    _ValidateSettings();
-}
-
 // Method Description:
 // - Finds a profile that matches the given GUID. If there is no profile in this
 //      settings object that matches, returns nullptr.
@@ -74,7 +66,7 @@ CascadiaSettings::CascadiaSettings(winrt::hstring json) :
 // Return Value:
 // - a non-ownership pointer to the profile matching the given guid, or nullptr
 //      if there is no match.
-winrt::Microsoft::Terminal::Settings::Model::Profile CascadiaSettings::FindProfile(winrt::guid profileGuid) const noexcept
+winrt::TerminalApp::Profile CascadiaSettings::FindProfile(winrt::guid profileGuid) const noexcept
 {
     const winrt::guid guid{ profileGuid };
     for (auto profile : _profiles)
@@ -97,7 +89,7 @@ winrt::Microsoft::Terminal::Settings::Model::Profile CascadiaSettings::FindProfi
 // - <none>
 // Return Value:
 // - an iterable collection of all of our Profiles.
-IObservableVector<winrt::Microsoft::Terminal::Settings::Model::Profile> CascadiaSettings::Profiles() const noexcept
+IObservableVector<winrt::TerminalApp::Profile> CascadiaSettings::Profiles() const noexcept
 {
     return _profiles;
 }
@@ -108,7 +100,7 @@ IObservableVector<winrt::Microsoft::Terminal::Settings::Model::Profile> Cascadia
 // - <none>
 // Return Value:
 // - the globally configured keybindings
-winrt::Microsoft::Terminal::Settings::Model::KeyMapping CascadiaSettings::KeyMap() const noexcept
+winrt::TerminalApp::KeyMapping CascadiaSettings::KeyMap() const noexcept
 {
     return _globals->KeyMap();
 }
@@ -119,7 +111,7 @@ winrt::Microsoft::Terminal::Settings::Model::KeyMapping CascadiaSettings::KeyMap
 // - <none>
 // Return Value:
 // - a reference to our global settings
-winrt::Microsoft::Terminal::Settings::Model::GlobalAppSettings CascadiaSettings::GlobalSettings() const
+winrt::TerminalApp::GlobalAppSettings CascadiaSettings::GlobalSettings() const
 {
     return *_globals;
 }
@@ -129,12 +121,22 @@ winrt::Microsoft::Terminal::Settings::Model::GlobalAppSettings CascadiaSettings:
 //   knew were bad when we called `_ValidateSettings` last.
 // Return Value:
 // - a reference to our list of warnings.
-IVectorView<winrt::Microsoft::Terminal::Settings::Model::SettingsLoadWarnings> CascadiaSettings::Warnings()
+IVectorView<winrt::TerminalApp::SettingsLoadWarnings> CascadiaSettings::Warnings()
 {
     return _warnings.GetView();
 }
 
-winrt::Windows::Foundation::IReference<winrt::Microsoft::Terminal::Settings::Model::SettingsLoadErrors> CascadiaSettings::GetLoadingError()
+void CascadiaSettings::ClearWarnings()
+{
+    _warnings.Clear();
+}
+
+void CascadiaSettings::AppendWarning(SettingsLoadWarnings warning)
+{
+    _warnings.Append(warning);
+}
+
+winrt::Windows::Foundation::IReference<winrt::TerminalApp::SettingsLoadErrors> CascadiaSettings::GetLoadingError()
 {
     return _loadError;
 }
@@ -156,8 +158,6 @@ winrt::hstring CascadiaSettings::GetSerializationErrorMessage()
 // - <none>
 void CascadiaSettings::_ValidateSettings()
 {
-    _warnings.Clear();
-
     // Make sure to check that profiles exists at all first and foremost:
     _ValidateProfilesExist();
 
@@ -218,7 +218,7 @@ void CascadiaSettings::_ValidateProfilesExist()
         // We can't add the warning to the list of warnings here, because this
         // object is not going to be returned at any point.
 
-        throw SettingsException(Microsoft::Terminal::Settings::Model::SettingsLoadErrors::NoProfiles);
+        throw SettingsException(TerminalApp::SettingsLoadErrors::NoProfiles);
     }
 }
 
@@ -272,7 +272,7 @@ void CascadiaSettings::_ValidateDefaultProfileExists()
 
     if (nullDefaultProfile || defaultProfileNotInProfiles)
     {
-        _warnings.Append(Microsoft::Terminal::Settings::Model::SettingsLoadWarnings::MissingDefaultProfile);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::MissingDefaultProfile);
         // Use the first profile as the new default
 
         // _temporarily_ set the default profile to the first profile. Because
@@ -315,7 +315,7 @@ void CascadiaSettings::_ValidateNoDuplicateProfiles()
 
     if (foundDupe)
     {
-        _warnings.Append(Microsoft::Terminal::Settings::Model::SettingsLoadWarnings::DuplicateProfile);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::DuplicateProfile);
     }
 }
 
@@ -404,7 +404,7 @@ void CascadiaSettings::_RemoveHiddenProfiles()
     {
         // Throw an exception. This is an invalid state, and we want the app to
         // be able to gracefully use the default settings.
-        throw SettingsException(SettingsLoadErrors::AllProfilesHidden);
+        throw SettingsException(TerminalApp::SettingsLoadErrors::AllProfilesHidden);
     }
 }
 
@@ -471,35 +471,29 @@ void CascadiaSettings::_ValidateMediaResources()
             }
         }
 
-        if (!profile.Icon().empty())
+        if (!profile.IconPath().empty())
         {
-            const auto iconPath{ wil::ExpandEnvironmentStringsW<std::wstring>(profile.Icon().c_str()) };
             try
             {
-                winrt::Windows::Foundation::Uri imagePath{ iconPath };
+                winrt::Windows::Foundation::Uri imagePath{ profile.ExpandedIconPath() };
             }
             catch (...)
             {
-                // Anything longer than 2 wchar_t's _isn't_ an emoji or symbol,
-                // so treat it as an invalid path.
-                if (iconPath.size() > 2)
-                {
-                    // reset icon path
-                    profile.Icon(L"");
-                    invalidIcon = true;
-                }
+                // reset icon path
+                profile.IconPath(L"");
+                invalidIcon = true;
             }
         }
     }
 
     if (invalidBackground)
     {
-        _warnings.Append(SettingsLoadWarnings::InvalidBackgroundImage);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::InvalidBackgroundImage);
     }
 
     if (invalidIcon)
     {
-        _warnings.Append(SettingsLoadWarnings::InvalidIcon);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::InvalidIcon);
     }
 }
 
@@ -519,7 +513,7 @@ void CascadiaSettings::_ValidateMediaResources()
 //   and attempt to look the profile up by name instead.
 // Return Value:
 // - the GUID of the profile corresponding to this combination of index and NewTerminalArgs
-winrt::guid CascadiaSettings::GetProfileForArgs(const Model::NewTerminalArgs& newTerminalArgs) const
+winrt::guid CascadiaSettings::GetProfileForArgs(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const
 {
     std::optional<winrt::guid> profileByIndex, profileByName;
     if (newTerminalArgs)
@@ -623,7 +617,7 @@ void CascadiaSettings::_ValidateKeybindings()
 
     if (!keybindingWarnings.empty())
     {
-        _warnings.Append(SettingsLoadWarnings::AtLeastOneKeybindingWarning);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::AtLeastOneKeybindingWarning);
         for (auto warning : keybindingWarnings)
         {
             _warnings.Append(warning);
@@ -646,7 +640,7 @@ void CascadiaSettings::_ValidateNoGlobalsKey()
 {
     if (auto oldGlobalsProperty{ _userSettings["globals"] })
     {
-        _warnings.Append(SettingsLoadWarnings::LegacyGlobalsProperty);
+        _warnings.Append(TerminalApp::SettingsLoadWarnings::LegacyGlobalsProperty);
     }
 }
 
@@ -675,13 +669,15 @@ std::string CascadiaSettings::_ApplyFirstRunChangesToSettingsTemplate(std::strin
     til::replace_needle_in_haystack_inplace(finalSettings,
                                             "%DEFAULT_PROFILE%",
                                             til::u16u8(defaultProfileGuid));
-
-    til::replace_needle_in_haystack_inplace(finalSettings,
-                                            "%VERSION%",
-                                            til::u16u8(ApplicationVersion()));
-    til::replace_needle_in_haystack_inplace(finalSettings,
-                                            "%PRODUCT%",
-                                            til::u16u8(ApplicationDisplayName()));
+    if (const auto appLogic{ winrt::TerminalApp::implementation::AppLogic::Current() })
+    {
+        til::replace_needle_in_haystack_inplace(finalSettings,
+                                                "%VERSION%",
+                                                til::u16u8(appLogic->ApplicationVersion()));
+        til::replace_needle_in_haystack_inplace(finalSettings,
+                                                "%PRODUCT%",
+                                                til::u16u8(appLogic->ApplicationDisplayName()));
+    }
 
     til::replace_needle_in_haystack_inplace(finalSettings,
                                             "%COMMAND_PROMPT_LOCALIZED_NAME%",
@@ -698,7 +694,7 @@ std::string CascadiaSettings::_ApplyFirstRunChangesToSettingsTemplate(std::strin
 // - profileGuid: the GUID of the profile to find the scheme for.
 // Return Value:
 // - a non-owning pointer to the scheme.
-winrt::Microsoft::Terminal::Settings::Model::ColorScheme CascadiaSettings::GetColorSchemeForProfile(const winrt::guid profileGuid) const
+winrt::TerminalApp::ColorScheme CascadiaSettings::GetColorSchemeForProfile(const winrt::guid profileGuid) const
 {
     auto profile = FindProfile(profileGuid);
     if (!profile)
@@ -708,62 +704,3 @@ winrt::Microsoft::Terminal::Settings::Model::ColorScheme CascadiaSettings::GetCo
     const auto schemeName = profile.ColorSchemeName();
     return _globals->ColorSchemes().TryLookup(schemeName);
 }
-
-winrt::hstring CascadiaSettings::ApplicationDisplayName()
-{
-    try
-    {
-        const auto package{ winrt::Windows::ApplicationModel::Package::Current() };
-        return package.DisplayName();
-    }
-    CATCH_LOG();
-
-    return RS_(L"ApplicationDisplayNameUnpackaged");
-}
-
-winrt::hstring CascadiaSettings::ApplicationVersion()
-{
-    try
-    {
-        const auto package{ winrt::Windows::ApplicationModel::Package::Current() };
-        const auto version{ package.Id().Version() };
-        winrt::hstring formatted{ wil::str_printf<std::wstring>(L"%u.%u.%u.%u", version.Major, version.Minor, version.Build, version.Revision) };
-        return formatted;
-    }
-    CATCH_LOG();
-
-    // Try to get the version the old-fashioned way
-    try
-    {
-        struct LocalizationInfo
-        {
-            WORD language, codepage;
-        };
-        // Use the current module instance handle for TerminalApp.dll, nullptr for WindowsTerminal.exe
-        auto filename{ wil::GetModuleFileNameW<std::wstring>(wil::GetModuleInstanceHandle()) };
-        auto size{ GetFileVersionInfoSizeExW(0, filename.c_str(), nullptr) };
-        THROW_LAST_ERROR_IF(size == 0);
-        auto versionBuffer{ std::make_unique<std::byte[]>(size) };
-        THROW_IF_WIN32_BOOL_FALSE(GetFileVersionInfoExW(0, filename.c_str(), 0, size, versionBuffer.get()));
-
-        // Get the list of Version localizations
-        LocalizationInfo* pVarLocalization{ nullptr };
-        UINT varLen{ 0 };
-        THROW_IF_WIN32_BOOL_FALSE(VerQueryValueW(versionBuffer.get(), L"\\VarFileInfo\\Translation", reinterpret_cast<void**>(&pVarLocalization), &varLen));
-        THROW_HR_IF(E_UNEXPECTED, varLen < sizeof(*pVarLocalization)); // there must be at least one translation
-
-        // Get the product version from the localized version compartment
-        // We're using String/ProductVersion here because our build pipeline puts more rich information in it (like the branch name)
-        // than in the unlocalized numeric version fields.
-        WCHAR* pProductVersion{ nullptr };
-        UINT versionLen{ 0 };
-        const auto localizedVersionName{ wil::str_printf<std::wstring>(L"\\StringFileInfo\\%04x%04x\\ProductVersion",
-                                                                       pVarLocalization->language ? pVarLocalization->language : 0x0409, // well-known en-US LCID
-                                                                       pVarLocalization->codepage) };
-        THROW_IF_WIN32_BOOL_FALSE(VerQueryValueW(versionBuffer.get(), localizedVersionName.c_str(), reinterpret_cast<void**>(&pProductVersion), &versionLen));
-        return { pProductVersion };
-    }
-    CATCH_LOG();
-
-    return RS_(L"ApplicationVersionUnknown");
-}

src/cascadia/TerminalApp/CascadiaSettings.h

@@ -19,6 +19,7 @@ Author(s):
 
 #include "CascadiaSettings.g.h"
 
+#include <winrt/Microsoft.Terminal.TerminalConnection.h>
 #include "GlobalAppSettings.h"
 #include "TerminalWarnings.h"
 #include "IDynamicProfileGenerator.h"
@@ -27,12 +28,13 @@ Author(s):
 #include "ColorScheme.h"
 
 // fwdecl unittest classes
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
-    class DeserializationTests;
+    class SettingsTests;
     class ProfileTests;
     class ColorSchemeTests;
     class KeyBindingsTests;
+    class TabTests;
 };
 namespace TerminalAppUnitTests
 {
@@ -40,63 +42,61 @@ namespace TerminalAppUnitTests
     class JsonTests;
 };
 
-namespace Microsoft::Terminal::Settings::Model
+namespace TerminalApp
 {
     class SettingsTypedDeserializationException;
 };
 
-class Microsoft::Terminal::Settings::Model::SettingsTypedDeserializationException final : public std::runtime_error
+class TerminalApp::SettingsTypedDeserializationException final : public std::runtime_error
 {
 public:
     SettingsTypedDeserializationException(const std::string_view description) :
         runtime_error(description.data()) {}
 };
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
     struct CascadiaSettings : CascadiaSettingsT<CascadiaSettings>
     {
     public:
         CascadiaSettings();
         explicit CascadiaSettings(const bool addDynamicProfiles);
-        CascadiaSettings(hstring json);
 
-        static Model::CascadiaSettings LoadDefaults();
-        static Model::CascadiaSettings LoadAll();
-        static Model::CascadiaSettings LoadUniversal();
+        static TerminalApp::CascadiaSettings LoadDefaults();
+        static TerminalApp::CascadiaSettings LoadAll();
+        static TerminalApp::CascadiaSettings LoadUniversal();
 
-        Model::GlobalAppSettings GlobalSettings() const;
+        TerminalApp::GlobalAppSettings GlobalSettings() const;
 
-        Windows::Foundation::Collections::IObservableVector<Model::Profile> Profiles() const noexcept;
+        Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::Profile> Profiles() const noexcept;
 
-        Model::KeyMapping KeyMap() const noexcept;
+        TerminalApp::KeyMapping KeyMap() const noexcept;
 
-        static com_ptr<CascadiaSettings> FromJson(const Json::Value& json);
+        static std::unique_ptr<CascadiaSettings> FromJson(const Json::Value& json);
         void LayerJson(const Json::Value& json);
 
-        static hstring SettingsPath();
-        static hstring DefaultSettingsPath();
+        static std::filesystem::path GetSettingsPath();
+        static std::filesystem::path GetDefaultSettingsPath();
 
-        static winrt::hstring ApplicationDisplayName();
-        static winrt::hstring ApplicationVersion();
-
-        Model::Profile FindProfile(guid profileGuid) const noexcept;
-        Model::ColorScheme GetColorSchemeForProfile(const guid profileGuid) const;
+        TerminalApp::Profile FindProfile(guid profileGuid) const noexcept;
+        TerminalApp::ColorScheme GetColorSchemeForProfile(const guid profileGuid) const;
 
         Windows::Foundation::Collections::IVectorView<SettingsLoadWarnings> Warnings();
+        void ClearWarnings();
+        void AppendWarning(SettingsLoadWarnings warning);
         Windows::Foundation::IReference<SettingsLoadErrors> GetLoadingError();
         hstring GetSerializationErrorMessage();
 
-        winrt::guid GetProfileForArgs(const Model::NewTerminalArgs& newTerminalArgs) const;
+        winrt::guid GetProfileForArgs(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const;
 
     private:
         com_ptr<GlobalAppSettings> _globals;
-        Windows::Foundation::Collections::IObservableVector<Model::Profile> _profiles;
-        Windows::Foundation::Collections::IVector<Model::SettingsLoadWarnings> _warnings;
+        Windows::Foundation::Collections::IObservableVector<TerminalApp::Profile> _profiles;
+        Windows::Foundation::Collections::IVector<TerminalApp::SettingsLoadWarnings> _warnings;
         Windows::Foundation::IReference<SettingsLoadErrors> _loadError;
         hstring _deserializationErrorMessage;
 
-        std::vector<std::unique_ptr<::Microsoft::Terminal::Settings::Model::IDynamicProfileGenerator>> _profileGenerators;
+        std::vector<std::unique_ptr<::TerminalApp::IDynamicProfileGenerator>> _profileGenerators;
 
         std::string _userSettingsString;
         Json::Value _userSettings;
@@ -104,9 +104,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         Json::Value _userDefaultProfileSettings{ Json::Value::null };
 
         void _LayerOrCreateProfile(const Json::Value& profileJson);
-        winrt::com_ptr<implementation::Profile> _FindMatchingProfile(const Json::Value& profileJson);
+        winrt::com_ptr<winrt::TerminalApp::implementation::Profile> _FindMatchingProfile(const Json::Value& profileJson);
         void _LayerOrCreateColorScheme(const Json::Value& schemeJson);
-        winrt::com_ptr<implementation::ColorScheme> _FindMatchingColorScheme(const Json::Value& schemeJson);
+        winrt::com_ptr<winrt::TerminalApp::implementation::ColorScheme> _FindMatchingColorScheme(const Json::Value& schemeJson);
         void _ParseJsonString(std::string_view fileData, const bool isDefaultSettings);
         static const Json::Value& _GetProfilesJsonObject(const Json::Value& json);
         static const Json::Value& _GetDisabledProfileSourcesJsonObject(const Json::Value& json);
@@ -139,16 +139,17 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         void _ValidateKeybindings();
         void _ValidateNoGlobalsKey();
 
-        friend class SettingsModelLocalTests::DeserializationTests;
-        friend class SettingsModelLocalTests::ProfileTests;
-        friend class SettingsModelLocalTests::ColorSchemeTests;
-        friend class SettingsModelLocalTests::KeyBindingsTests;
+        friend class TerminalAppLocalTests::SettingsTests;
+        friend class TerminalAppLocalTests::ProfileTests;
+        friend class TerminalAppLocalTests::ColorSchemeTests;
+        friend class TerminalAppLocalTests::KeyBindingsTests;
+        friend class TerminalAppLocalTests::TabTests;
         friend class TerminalAppUnitTests::DynamicProfileTests;
         friend class TerminalAppUnitTests::JsonTests;
     };
 }
 
-namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
+namespace winrt::TerminalApp::factory_implementation
 {
     BASIC_FACTORY(CascadiaSettings);
 }

src/cascadia/TerminalApp/CascadiaSettings.idl

@@ -5,21 +5,13 @@ import "GlobalAppSettings.idl";
 import "Profile.idl";
 import "TerminalWarnings.idl";
 
-namespace Microsoft.Terminal.Settings.Model
+namespace TerminalApp
 {
     [default_interface] runtimeclass CascadiaSettings {
-        CascadiaSettings(String json);
-
         static CascadiaSettings LoadDefaults();
         static CascadiaSettings LoadAll();
         static CascadiaSettings LoadUniversal();
 
-        static String SettingsPath { get; };
-        static String DefaultSettingsPath { get; };
-
-        static String ApplicationDisplayName { get; };
-        static String ApplicationVersion { get; };
-
         GlobalAppSettings GlobalSettings { get; };
 
         Windows.Foundation.Collections.IObservableVector<Profile> Profiles { get; };

src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp

@@ -5,7 +5,7 @@
 #include <argb.h>
 #include "CascadiaSettings.h"
 #include "../../types/inc/utils.hpp"
-#include "Utils.h"
+#include "utils.h"
 #include "JsonUtils.h"
 #include <appmodel.h>
 #include <shlobj.h>
@@ -18,7 +18,7 @@
 // Both defaults.h and userDefaults.h are generated at build time into the
 // "Generated Files" directory.
 
-using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace winrt::TerminalApp::implementation;
 using namespace ::Microsoft::Console;
 
 static constexpr std::wstring_view SettingsFilename{ L"settings.json" };
@@ -100,12 +100,13 @@ static void _CatchRethrowSerializationExceptionWithLocationInfo(std::string_view
 //   profiles inserted into their list of profiles.
 // Return Value:
 // - a unique_ptr containing a new CascadiaSettings object.
-winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::LoadAll()
+winrt::TerminalApp::CascadiaSettings CascadiaSettings::LoadAll()
 {
     try
     {
         auto settings = LoadDefaults();
         auto resultPtr = winrt::get_self<CascadiaSettings>(settings);
+        resultPtr->ClearWarnings();
 
         // GH 3588, we need this below to know if the user chose something that wasn't our default.
         // Collect it up here in case it gets modified by any of the other layers between now and when
@@ -185,7 +186,14 @@ winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::
             // We should re-parse, but not re-layer
             resultPtr->_ParseJsonString(resultPtr->_userSettingsString, false);
 
-            _WriteSettings(resultPtr->_userSettingsString);
+            try
+            {
+                _WriteSettings(resultPtr->_userSettingsString);
+            }
+            catch (...)
+            {
+                resultPtr->AppendWarning(SettingsLoadWarnings::FailedToWriteToSettings);
+            }
         }
 
         // If this throws, the app will catch it and use the default settings
@@ -195,7 +203,7 @@ winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::
         // Do it after everything else so it won't happen unless validation passed.
         // Also, avoid processing unless someone's listening for measures. The keybindings work, at least,
         // is a lot of computation we can skip if no one cares.
-        if (TraceLoggingProviderEnabled(g_hSettingsModelProvider, 0, MICROSOFT_KEYWORD_MEASURES))
+        if (TraceLoggingProviderEnabled(g_hTerminalAppProvider, 0, MICROSOFT_KEYWORD_MEASURES))
         {
             const auto guid = resultPtr->GlobalSettings().DefaultProfile();
 
@@ -204,7 +212,7 @@ winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::
             if (hardcodedDefaultGuid != guid)
             {
                 TraceLoggingWrite(
-                    g_hSettingsModelProvider, // handle to TerminalApp tracelogging provider
+                    g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
                     "CustomDefaultProfile",
                     TraceLoggingDescription("Event emitted when user has chosen a different default profile than hardcoded one on load/reload"),
                     TraceLoggingGuid(guid, "DefaultProfile", "ID of user-chosen default profile"),
@@ -233,7 +241,7 @@ winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::
                 const auto keybindingsString = Json::writeString(wbuilder, value);
 
                 TraceLoggingWrite(
-                    g_hSettingsModelProvider, // handle to TerminalApp tracelogging provider
+                    g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
                     "CustomKeybindings",
                     TraceLoggingDescription("Event emitted when custom keybindings are identified on load/reload"),
                     TraceLoggingUtf8String(keybindingsString.c_str(), "Keybindings", "Keybindings as JSON"),
@@ -265,7 +273,7 @@ winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::
 // - <none>
 // Return Value:
 // - a unique_ptr to a CascadiaSettings with the connection types and settings for Universal terminal
-winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::LoadUniversal()
+winrt::TerminalApp::CascadiaSettings CascadiaSettings::LoadUniversal()
 {
     // We're going to do this ourselves because we want to exclude almost everything
     // from the special Universal-for-developers configuration
@@ -305,7 +313,7 @@ winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::
 // - <none>
 // Return Value:
 // - a unique_ptr to a CascadiaSettings with the settings from defaults.json
-winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings CascadiaSettings::LoadDefaults()
+winrt::TerminalApp::CascadiaSettings CascadiaSettings::LoadDefaults()
 {
     auto resultPtr{ winrt::make_self<CascadiaSettings>() };
 
@@ -472,6 +480,8 @@ bool CascadiaSettings::_AppendDynamicProfilesToUserSettings()
     //   * Serialize that diff
     //   * Insert that diff to the end of the list of profiles.
 
+    const Profile defaultProfile;
+
     Json::StreamWriterBuilder wbuilder;
     // Use 4 spaces to indent instead of \t
     wbuilder.settings_["indentation"] = "    ";
@@ -482,7 +492,7 @@ bool CascadiaSettings::_AppendDynamicProfilesToUserSettings()
         {
             if (profileJson.isObject())
             {
-                const auto profileImpl = winrt::get_self<implementation::Profile>(profile);
+                const auto profileImpl = winrt::get_self<winrt::TerminalApp::implementation::Profile>(profile);
                 if (profileImpl->ShouldBeLayered(profileJson))
                 {
                     return true;
@@ -533,7 +543,7 @@ bool CascadiaSettings::_AppendDynamicProfilesToUserSettings()
 
         // Generate a diff for the profile, that contains the minimal set of
         // changes to re-create this profile.
-        const auto profileImpl = winrt::get_self<implementation::Profile>(profile);
+        const auto profileImpl = winrt::get_self<winrt::TerminalApp::implementation::Profile>(profile);
         const auto diff = profileImpl->GenerateStub();
         auto profileSerialization = Json::writeString(wbuilder, diff);
 
@@ -571,9 +581,9 @@ bool CascadiaSettings::_AppendDynamicProfilesToUserSettings()
 // - json: an object which should be a serialization of a CascadiaSettings object.
 // Return Value:
 // - a new CascadiaSettings instance created from the values in `json`
-winrt::com_ptr<CascadiaSettings> CascadiaSettings::FromJson(const Json::Value& json)
+std::unique_ptr<CascadiaSettings> CascadiaSettings::FromJson(const Json::Value& json)
 {
-    auto resultPtr = winrt::make_self<CascadiaSettings>();
+    auto resultPtr = std::make_unique<CascadiaSettings>();
     resultPtr->LayerJson(json);
     return resultPtr;
 }
@@ -791,7 +801,7 @@ bool CascadiaSettings::_IsPackaged()
 //      fail to write the file
 void CascadiaSettings::_WriteSettings(const std::string_view content)
 {
-    auto pathToSettingsFile{ CascadiaSettings::SettingsPath() };
+    auto pathToSettingsFile{ CascadiaSettings::GetSettingsPath() };
 
     wil::unique_hfile hOut{ CreateFileW(pathToSettingsFile.c_str(),
                                         GENERIC_WRITE,
@@ -818,7 +828,7 @@ void CascadiaSettings::_WriteSettings(const std::string_view content)
 //      from reading the file
 std::optional<std::string> CascadiaSettings::_ReadUserSettings()
 {
-    const auto pathToSettingsFile{ CascadiaSettings::SettingsPath() };
+    const auto pathToSettingsFile{ CascadiaSettings::GetSettingsPath() };
     wil::unique_hfile hFile{ CreateFileW(pathToSettingsFile.c_str(),
                                          GENERIC_READ,
                                          FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -832,7 +842,7 @@ std::optional<std::string> CascadiaSettings::_ReadUserSettings()
         // GH#5186 - We moved from profiles.json to settings.json; we want to
         // migrate any file we find. We're using MoveFile in case their settings.json
         // is a symbolic link.
-        std::filesystem::path pathToLegacySettingsFile{ std::wstring_view{ pathToSettingsFile } };
+        auto pathToLegacySettingsFile{ pathToSettingsFile };
         pathToLegacySettingsFile.replace_filename(LegacySettingsFilename);
 
         wil::unique_hfile hLegacyFile{ CreateFileW(pathToLegacySettingsFile.c_str(),
@@ -916,7 +926,7 @@ std::optional<std::string> CascadiaSettings::_ReadFile(HANDLE hFile)
 // - <none>
 // Return Value:
 // - the full path to the settings file
-winrt::hstring CascadiaSettings::SettingsPath()
+std::filesystem::path CascadiaSettings::GetSettingsPath()
 {
     wil::unique_cotaskmem_string localAppDataFolder;
     // KF_FLAG_FORCE_APP_DATA_REDIRECTION, when engaged, causes SHGet... to return
@@ -934,10 +944,10 @@ winrt::hstring CascadiaSettings::SettingsPath()
     // Create the directory if it doesn't exist
     std::filesystem::create_directories(parentDirectoryForSettingsFile);
 
-    return winrt::hstring{ (parentDirectoryForSettingsFile / SettingsFilename).wstring() };
+    return parentDirectoryForSettingsFile / SettingsFilename;
 }
 
-winrt::hstring CascadiaSettings::DefaultSettingsPath()
+std::filesystem::path CascadiaSettings::GetDefaultSettingsPath()
 {
     // Both of these posts suggest getting the path to the exe, then removing
     // the exe's name to get the package root:
@@ -957,7 +967,7 @@ winrt::hstring CascadiaSettings::DefaultSettingsPath()
 
     const std::filesystem::path exePath{ exePathString };
     const std::filesystem::path rootDir = exePath.parent_path();
-    return winrt::hstring{ (rootDir / DefaultsFilename).wstring() };
+    return rootDir / DefaultsFilename;
 }
 
 // Function Description:

src/cascadia/TerminalApp/ColorPickupFlyout.xaml

@@ -129,7 +129,7 @@
             </Grid.RowDefinitions>
             <ColorPicker x:Name="customColorPicker"
                      IsMoreButtonVisible="True"
-                     IsColorSliderVisible="False"
+                     IsColorSliderVisible="True"
                      IsColorChannelTextInputVisible="True"
                      IsHexInputVisible="True"
                      IsAlphaEnabled="False"

src/cascadia/TerminalApp/ColorScheme.cpp

@@ -11,8 +11,8 @@
 #include "ColorScheme.g.cpp"
 
 using namespace ::Microsoft::Console;
-using namespace Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::Settings::Model::implementation;
+using namespace TerminalApp;
+using namespace winrt::TerminalApp::implementation;
 using namespace winrt::Windows::UI;
 
 static constexpr std::string_view NameKey{ "name" };
@@ -20,7 +20,6 @@ static constexpr std::string_view ForegroundKey{ "foreground" };
 static constexpr std::string_view BackgroundKey{ "background" };
 static constexpr std::string_view SelectionBackgroundKey{ "selectionBackground" };
 static constexpr std::string_view CursorColorKey{ "cursorColor" };
-
 static constexpr std::array<std::string_view, 16> TableColors = {
     "black",
     "red",
@@ -41,19 +40,26 @@ static constexpr std::array<std::string_view, 16> TableColors = {
 };
 
 ColorScheme::ColorScheme() :
-    _Foreground{ DEFAULT_FOREGROUND_WITH_ALPHA },
-    _Background{ DEFAULT_BACKGROUND_WITH_ALPHA },
-    _SelectionBackground{ DEFAULT_FOREGROUND },
-    _CursorColor{ DEFAULT_CURSOR_COLOR }
+    _schemeName{ L"" },
+    _table{},
+    _defaultForeground{ DEFAULT_FOREGROUND_WITH_ALPHA },
+    _defaultBackground{ DEFAULT_BACKGROUND_WITH_ALPHA },
+    _selectionBackground{ DEFAULT_FOREGROUND },
+    _cursorColor{ DEFAULT_CURSOR_COLOR }
 {
 }
 
 ColorScheme::ColorScheme(winrt::hstring name, Color defaultFg, Color defaultBg, Color cursorColor) :
-    _Name{ name },
-    _Foreground{ defaultFg },
-    _Background{ defaultBg },
-    _SelectionBackground{ DEFAULT_FOREGROUND },
-    _CursorColor{ cursorColor }
+    _schemeName{ name },
+    _table{},
+    _defaultForeground{ defaultFg },
+    _defaultBackground{ defaultBg },
+    _selectionBackground{ DEFAULT_FOREGROUND },
+    _cursorColor{ cursorColor }
+{
+}
+
+ColorScheme::~ColorScheme()
 {
 }
 
@@ -83,7 +89,7 @@ bool ColorScheme::ShouldBeLayered(const Json::Value& json) const
     std::wstring nameFromJson{};
     if (JsonUtils::GetValueForKey(json, NameKey, nameFromJson))
     {
-        return nameFromJson == _Name;
+        return nameFromJson == _schemeName;
     }
     return false;
 }
@@ -100,60 +106,50 @@ bool ColorScheme::ShouldBeLayered(const Json::Value& json) const
 // <none>
 void ColorScheme::LayerJson(const Json::Value& json)
 {
-    JsonUtils::GetValueForKey(json, NameKey, _Name);
-    JsonUtils::GetValueForKey(json, ForegroundKey, _Foreground);
-    JsonUtils::GetValueForKey(json, BackgroundKey, _Background);
-    JsonUtils::GetValueForKey(json, SelectionBackgroundKey, _SelectionBackground);
-    JsonUtils::GetValueForKey(json, CursorColorKey, _CursorColor);
+    JsonUtils::GetValueForKey(json, NameKey, _schemeName);
+    JsonUtils::GetValueForKey(json, ForegroundKey, _defaultForeground);
+    JsonUtils::GetValueForKey(json, BackgroundKey, _defaultBackground);
+    JsonUtils::GetValueForKey(json, SelectionBackgroundKey, _selectionBackground);
+    JsonUtils::GetValueForKey(json, CursorColorKey, _cursorColor);
 
-    for (unsigned int i = 0; i < TableColors.size(); ++i)
+    int i = 0;
+    for (const auto& current : TableColors)
     {
-        JsonUtils::GetValueForKey(json, til::at(TableColors, i), _table.at(i));
+        JsonUtils::GetValueForKey(json, current, _table.at(i));
+        i++;
     }
 }
 
-// Method Description:
-// - Create a new serialized JsonObject from an instance of this class
-// Arguments:
-// - <none>
-// Return Value:
-// <none>
-Json::Value ColorScheme::ToJson()
+winrt::hstring ColorScheme::Name() const noexcept
 {
-    Json::Value json{ Json::ValueType::objectValue };
-
-    JsonUtils::SetValueForKey(json, NameKey, _Name);
-    JsonUtils::SetValueForKey(json, ForegroundKey, _Foreground);
-    JsonUtils::SetValueForKey(json, BackgroundKey, _Background);
-    JsonUtils::SetValueForKey(json, SelectionBackgroundKey, _SelectionBackground);
-    JsonUtils::SetValueForKey(json, CursorColorKey, _CursorColor);
-
-    for (unsigned int i = 0; i < TableColors.size(); ++i)
-    {
-        JsonUtils::SetValueForKey(json, til::at(TableColors, i), _table.at(i));
-    }
-
-    return json;
+    return _schemeName;
 }
 
 winrt::com_array<Color> ColorScheme::Table() const noexcept
 {
-    winrt::com_array<Color> result{ base::checked_cast<uint32_t>(_table.size()) };
+    winrt::com_array<Color> result{ COLOR_TABLE_SIZE };
     std::transform(_table.begin(), _table.end(), result.begin(), [](til::color c) -> Color { return c; });
     return result;
 }
 
-// Method Description:
-// - Set a color in the color table
-// Arguments:
-// - index: the index of the desired color within the table
-// - value: the color value we are setting the color table color to
-// Return Value:
-// - none
-void ColorScheme::SetColorTableEntry(uint8_t index, const winrt::Windows::UI::Color& value) noexcept
+Color ColorScheme::Foreground() const noexcept
 {
-    THROW_HR_IF(E_INVALIDARG, index > _table.size() - 1);
-    _table[index] = value;
+    return _defaultForeground;
+}
+
+Color ColorScheme::Background() const noexcept
+{
+    return _defaultBackground;
+}
+
+Color ColorScheme::SelectionBackground() const noexcept
+{
+    return _selectionBackground;
+}
+
+Color ColorScheme::CursorColor() const noexcept
+{
+    return _cursorColor;
 }
 
 // Method Description:

src/cascadia/TerminalApp/ColorScheme.h

@@ -21,41 +21,48 @@ Author(s):
 #include "ColorScheme.g.h"
 
 // fwdecl unittest classes
-namespace SettingsModelLocalTests
+namespace TerminalAppLocalTests
 {
     class SettingsTests;
     class ColorSchemeTests;
 };
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
     struct ColorScheme : ColorSchemeT<ColorScheme>
     {
     public:
         ColorScheme();
         ColorScheme(hstring name, Windows::UI::Color defaultFg, Windows::UI::Color defaultBg, Windows::UI::Color cursorColor);
+        ~ColorScheme();
 
         static com_ptr<ColorScheme> FromJson(const Json::Value& json);
         bool ShouldBeLayered(const Json::Value& json) const;
         void LayerJson(const Json::Value& json);
 
-        Json::Value ToJson();
+        hstring Name() const noexcept;
+        com_array<Windows::UI::Color> Table() const noexcept;
+        Windows::UI::Color Foreground() const noexcept;
+        Windows::UI::Color Background() const noexcept;
+        Windows::UI::Color SelectionBackground() const noexcept;
+        Windows::UI::Color CursorColor() const noexcept;
 
         static std::optional<std::wstring> GetNameFromJson(const Json::Value& json);
 
-        com_array<Windows::UI::Color> Table() const noexcept;
-        void SetColorTableEntry(uint8_t index, const winrt::Windows::UI::Color& value) noexcept;
-
-        GETSET_PROPERTY(winrt::hstring, Name);
-        GETSET_COLORPROPERTY(Foreground); // defined in constructor
-        GETSET_COLORPROPERTY(Background); // defined in constructor
-        GETSET_COLORPROPERTY(SelectionBackground); // defined in constructor
-        GETSET_COLORPROPERTY(CursorColor); // defined in constructor
-
     private:
+        hstring _schemeName;
         std::array<til::color, COLOR_TABLE_SIZE> _table;
+        til::color _defaultForeground;
+        til::color _defaultBackground;
+        til::color _selectionBackground;
+        til::color _cursorColor;
 
-        friend class SettingsModelLocalTests::SettingsTests;
-        friend class SettingsModelLocalTests::ColorSchemeTests;
+        friend class TerminalAppLocalTests::SettingsTests;
+        friend class TerminalAppLocalTests::ColorSchemeTests;
     };
 }
+
+namespace winrt::TerminalApp::factory_implementation
+{
+    BASIC_FACTORY(ColorScheme);
+}

src/cascadia/TerminalApp/ColorScheme.idl

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace TerminalApp
+{
+    [default_interface] runtimeclass ColorScheme {
+        ColorScheme();
+        ColorScheme(String name, Windows.UI.Color defaultFg, Windows.UI.Color defaultBg, Windows.UI.Color cursorColor);
+
+        String Name { get; };
+
+        Windows.UI.Color Foreground { get; };
+        Windows.UI.Color Background { get; };
+        Windows.UI.Color SelectionBackground { get; };
+        Windows.UI.Color CursorColor { get; };
+
+        Windows.UI.Color[] Table { get; };
+    }
+}

src/cascadia/TerminalApp/Command.cpp

@@ -5,14 +5,15 @@
 #include "Command.h"
 #include "Command.g.cpp"
 
+#include "Utils.h"
 #include "ActionAndArgs.h"
 #include "JsonUtils.h"
 #include <LibraryResources.h>
 #include "TerminalSettingsSerializationHelpers.h"
 
-using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Windows::Foundation::Collections;
-using namespace ::Microsoft::Terminal::Settings::Model;
+using namespace winrt::TerminalApp;
+using namespace winrt::Windows::Foundation;
+using namespace ::TerminalApp;
 
 namespace winrt
 {
@@ -31,14 +32,14 @@ static constexpr std::string_view ProfileNameToken{ "${profile.name}" };
 static constexpr std::string_view ProfileIconToken{ "${profile.icon}" };
 static constexpr std::string_view SchemeNameToken{ "${scheme.name}" };
 
-namespace winrt::Microsoft::Terminal::Settings::Model::implementation
+namespace winrt::TerminalApp::implementation
 {
     Command::Command()
     {
         _setAction(nullptr);
     }
 
-    IMapView<winrt::hstring, Model::Command> Command::NestedCommands()
+    Collections::IMapView<winrt::hstring, TerminalApp::Command> Command::NestedCommands()
     {
         return _subcommands ? _subcommands.GetView() : nullptr;
     }
@@ -106,6 +107,70 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         return actionAndArgs->GenerateName();
     }
 
+    // Method Description:
+    // - Actually initialize our IconSource for our _lastIconPath. Supports a variety of icons:
+    //    * If the icon is a path to an image, we'll use that.
+    //    * If it isn't, then we'll try and use the text as a FontIcon. If the
+    //      character is in the range of symbols reserved for the Segoe MDL2
+    //      Asserts, well treat it as such. Otherwise, we'll default to a Sego
+    //      UI icon, so things like emoji will work.
+    // - MUST BE CALLED ON THE UI THREAD.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void Command::RefreshIcon()
+    {
+        if (!_lastIconPath.empty())
+        {
+            _setIconSource(GetColoredIcon<winrt::WUX::Controls::IconSource>(_lastIconPath));
+
+            // If we fail to set the icon source using the "icon" as a path,
+            // let's try it as a symbol/emoji.
+            //
+            // Anything longer that 2 wchar_t's _isn't_ an emoji or symbol, so
+            // don't do this if it's just an invalid path.
+            if (IconSource() == nullptr && _lastIconPath.size() <= 2)
+            {
+                try
+                {
+                    WUX::Controls::FontIconSource icon;
+                    const wchar_t ch = _lastIconPath[0];
+
+                    // The range of MDL2 Icons isn't explicitly defined, but
+                    // we're using this based off the table on:
+                    // https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font
+                    const bool isMDL2Icon = ch >= L'\uE700' && ch <= L'\uF8FF';
+                    if (isMDL2Icon)
+                    {
+                        icon.FontFamily(WUX::Media::FontFamily{ L"Segoe MDL2 Assets" });
+                    }
+                    else
+                    {
+                        // Note: you _do_ need to manually set the font here.
+                        icon.FontFamily(WUX::Media::FontFamily{ L"Segoe UI" });
+                    }
+                    icon.FontSize(12);
+                    icon.Glyph(_lastIconPath);
+                    _setIconSource(icon);
+                }
+                CATCH_LOG();
+            }
+        }
+        if (IconSource() == nullptr)
+        {
+            // Set the default IconSource to a BitmapIconSource with a null source
+            // (instead of just nullptr) because there's a really weird crash when swapping
+            // data bound IconSourceElements in a ListViewTemplate (i.e. CommandPalette).
+            // Swapping between nullptr IconSources and non-null IconSources causes a crash
+            // to occur, but swapping between IconSources with a null source and non-null IconSources
+            // work perfectly fine :shrug:.
+            winrt::Windows::UI::Xaml::Controls::BitmapIconSource icon;
+            icon.UriSource(nullptr);
+            _setIconSource(icon);
+        }
+    }
+
     // Method Description:
     // - Deserialize a Command from the `json` object. The json object should
     //   contain a "name" and "action", and optionally an "icon".
@@ -135,7 +200,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
         if (const auto nestedCommandsJson{ json[JsonKey(CommandsKey)] })
         {
             // Initialize our list of subcommands.
-            result->_subcommands = winrt::single_threaded_map<winrt::hstring, Model::Command>();
+            result->_subcommands = winrt::single_threaded_map<winrt::hstring, winrt::TerminalApp::Command>();
             auto nestedWarnings = Command::LayerJson(result->_subcommands, nestedCommandsJson);
             // It's possible that the nested commands have some warnings
             warnings.insert(warnings.end(), nestedWarnings.begin(), nestedWarnings.end());
@@ -149,7 +214,9 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             return nullptr;
         }
 
-        JsonUtils::GetValueForKey(json, IconKey, result->_Icon);
+        // Only get the icon path right now. The icon needs to be resolved into
+        // an IconSource on the UI thread, which will be done by RefreshIcon.
+        JsonUtils::GetValueForKey(json, IconKey, result->_lastIconPath);
 
         // If we're a nested command, we can ignore the current action.
         if (!nested)
@@ -213,7 +280,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // - json: A Json::Value containing an array of serialized commands
     // Return Value:
     // - A vector containing any warnings detected while parsing
-    std::vector<SettingsLoadWarnings> Command::LayerJson(IMap<winrt::hstring, Model::Command>& commands,
+    std::vector<SettingsLoadWarnings> Command::LayerJson(Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command>& commands,
                                                          const Json::Value& json)
     {
         std::vector<SettingsLoadWarnings> warnings;
@@ -285,13 +352,13 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     //   appended to this vector.
     // Return Value:
     // - <none>
-    void Command::ExpandCommands(IMap<winrt::hstring, Model::Command> commands,
-                                 IVectorView<Model::Profile> profiles,
-                                 IVectorView<Model::ColorScheme> schemes,
-                                 IVector<SettingsLoadWarnings> warnings)
+    void Command::ExpandCommands(Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command>& commands,
+                                 Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles,
+                                 gsl::span<winrt::TerminalApp::ColorScheme> schemes,
+                                 std::vector<SettingsLoadWarnings>& warnings)
     {
         std::vector<winrt::hstring> commandsToRemove;
-        std::vector<Model::Command> commandsToAdd;
+        std::vector<winrt::TerminalApp::Command> commandsToAdd;
 
         // First, collect up all the commands that need replacing.
         for (const auto& nameAndCmd : commands)
@@ -341,12 +408,12 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
     // Return Value:
     // - and empty vector if the command wasn't expandable, otherwise a list of
     //   the newly-created commands.
-    std::vector<Model::Command> Command::_expandCommand(Command* const expandable,
-                                                        IVectorView<Model::Profile> profiles,
-                                                        IVectorView<Model::ColorScheme> schemes,
-                                                        IVector<SettingsLoadWarnings>& warnings)
+    std::vector<winrt::TerminalApp::Command> Command::_expandCommand(Command* const expandable,
+                                                                     Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles,
+                                                                     gsl::span<winrt::TerminalApp::ColorScheme> schemes,
+                                                                     std::vector<SettingsLoadWarnings>& warnings)
     {
-        std::vector<Model::Command> newCommands;
+        std::vector<winrt::TerminalApp::Command> newCommands;
 
         if (expandable->HasNestedCommands())
         {
@@ -371,18 +438,16 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
             const auto actualDataEnd = newJsonString.data() + newJsonString.size();
             if (!reader->parse(actualDataStart, actualDataEnd, &newJsonValue, &errs))
             {
-                warnings.Append(SettingsLoadWarnings::FailedToParseCommandJson);
+                warnings.push_back(SettingsLoadWarnings::FailedToParseCommandJson);
                 // If we encounter a re-parsing error, just stop processing the rest of the commands.
                 return false;
             }
 
             // Pass the new json back though FromJson, to get the new expanded value.
-            std::vector<SettingsLoadWarnings> newWarnings;
-            if (auto newCmd{ Command::FromJson(newJsonValue, newWarnings) })
+            if (auto newCmd{ Command::FromJson(newJsonValue, warnings) })
             {
                 newCommands.push_back(*newCmd);
             }
-            std::for_each(newWarnings.begin(), newWarnings.end(), [warnings](auto& warn) { warnings.Append(warn); });
             return true;
         };
 
@@ -402,7 +467,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
 
                 // - Escape the profile name for JSON appropriately
                 auto escapedProfileName = _escapeForJson(til::u16u8(p.Name()));
-                auto escapedProfileIcon = _escapeForJson(til::u16u8(p.Icon()));
+                auto escapedProfileIcon = _escapeForJson(til::u16u8(p.ExpandedIconPath()));
                 auto newJsonString = til::replace_needle_in_haystack(oldJsonString,
                                                                      ProfileNameToken,
                                                                      escapedProfileName);

src/cascadia/TerminalApp/Command.h

@@ -0,0 +1,83 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- Command.h
+
+Abstract:
+- A command represents a single entry in the Command Palette. This is an object
+  that has a user facing "name" to display to the user, and an associated action
+  which can be dispatched.
+
+- For more information, see GH#2046, #5400, #5674, and #6635
+
+Author(s):
+- Mike Griese - June 2020
+
+--*/
+#pragma once
+
+#include "Command.g.h"
+#include "TerminalWarnings.h"
+#include "Profile.h"
+#include "..\inc\cppwinrt_utils.h"
+#include "SettingsTypes.h"
+
+// fwdecl unittest classes
+namespace TerminalAppLocalTests
+{
+    class SettingsTests;
+    class CommandTests;
+};
+
+namespace winrt::TerminalApp::implementation
+{
+    struct Command : CommandT<Command>
+    {
+        Command();
+
+        static winrt::com_ptr<Command> FromJson(const Json::Value& json,
+                                                std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
+
+        static void ExpandCommands(Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command>& commands,
+                                   Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles,
+                                   gsl::span<winrt::TerminalApp::ColorScheme> schemes,
+                                   std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
+
+        static std::vector<TerminalApp::SettingsLoadWarnings> LayerJson(Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command>& commands,
+                                                                        const Json::Value& json);
+        bool HasNestedCommands();
+        Windows::Foundation::Collections::IMapView<winrt::hstring, TerminalApp::Command> NestedCommands();
+
+        void RefreshIcon();
+
+        winrt::Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker propertyChangedRevoker;
+
+        WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
+        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, Name, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(winrt::TerminalApp::ActionAndArgs, Action, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, KeyChordText, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(winrt::Windows::UI::Xaml::Controls::IconSource, IconSource, _PropertyChangedHandlers, nullptr);
+
+        GETSET_PROPERTY(ExpandCommandType, IterateOn, ExpandCommandType::None);
+
+    private:
+        Json::Value _originalJson;
+        Windows::Foundation::Collections::IMap<winrt::hstring, winrt::TerminalApp::Command> _subcommands{ nullptr };
+
+        winrt::hstring _lastIconPath{};
+
+        static std::vector<winrt::TerminalApp::Command> _expandCommand(Command* const expandable,
+                                                                       Windows::Foundation::Collections::IVectorView<winrt::TerminalApp::Profile> profiles,
+                                                                       gsl::span<winrt::TerminalApp::ColorScheme> schemes,
+                                                                       std::vector<TerminalApp::SettingsLoadWarnings>& warnings);
+        friend class TerminalAppLocalTests::SettingsTests;
+        friend class TerminalAppLocalTests::CommandTests;
+    };
+}
+
+namespace winrt::TerminalApp::factory_implementation
+{
+    BASIC_FACTORY(Command);
+}

src/cascadia/TerminalApp/Command.idl

@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "ShortcutActionDispatch.idl";
+
+namespace TerminalApp
+{
+    [default_interface] runtimeclass Command : Windows.UI.Xaml.Data.INotifyPropertyChanged
+    {
+        Command();
+
+        String Name;
+        ActionAndArgs Action;
+        String KeyChordText;
+
+        Windows.UI.Xaml.Controls.IconSource IconSource;
+        void RefreshIcon();
+
+        Boolean HasNestedCommands { get; };
+        Windows.Foundation.Collections.IMapView<String, Command> NestedCommands { get; };
+    }
+}

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -3,6 +3,9 @@
 
 #include "pch.h"
 #include "CommandPalette.h"
+#include "ActionAndArgs.h"
+#include "ActionArgs.h"
+#include "Command.h"
 
 #include <LibraryResources.h>
 
@@ -15,7 +18,6 @@ using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::System;
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Microsoft::Terminal::Settings::Model;
 
 namespace winrt::TerminalApp::implementation
 {
@@ -24,11 +26,11 @@ namespace winrt::TerminalApp::implementation
     {
         InitializeComponent();
 
-        _filteredActions = winrt::single_threaded_observable_vector<Command>();
-        _nestedActionStack = winrt::single_threaded_vector<Command>();
-        _currentNestedCommands = winrt::single_threaded_vector<Command>();
-        _allCommands = winrt::single_threaded_vector<Command>();
-        _allTabActions = winrt::single_threaded_vector<Command>();
+        _filteredActions = winrt::single_threaded_observable_vector<winrt::TerminalApp::Command>();
+        _nestedActionStack = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
+        _currentNestedCommands = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
+        _allCommands = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
+        _allTabActions = winrt::single_threaded_vector<winrt::TerminalApp::Command>();
 
         _switchToMode(CommandPaletteMode::ActionMode);
 
@@ -117,6 +119,90 @@ namespace winrt::TerminalApp::implementation
         _filteredActionsView().ScrollIntoView(_filteredActionsView().SelectedItem());
     }
 
+    // Method Description:
+    // - Scroll the command palette to the specified index
+    // Arguments:
+    // - index within a list view of commands
+    // Return Value:
+    // - <none>
+    void CommandPalette::_scrollToIndex(uint32_t index)
+    {
+        auto numItems = _filteredActionsView().Items().Size();
+
+        if (numItems == 0)
+        {
+            // if the list is empty no need to scroll
+            return;
+        }
+
+        auto clampedIndex = std::clamp<int32_t>(index, 0, numItems - 1);
+        _filteredActionsView().SelectedIndex(clampedIndex);
+        _filteredActionsView().ScrollIntoView(_filteredActionsView().SelectedItem());
+    }
+
+    // Method Description:
+    // - Computes the number of visible commands
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - the approximate number of items visible in the list (in other words the size of the page)
+    uint32_t CommandPalette::_getNumVisibleItems()
+    {
+        const auto container = _filteredActionsView().ContainerFromIndex(0);
+        const auto item = container.try_as<winrt::Windows::UI::Xaml::Controls::ListViewItem>();
+        const auto itemHeight = ::base::saturated_cast<int>(item.ActualHeight());
+        const auto listHeight = ::base::saturated_cast<int>(_filteredActionsView().ActualHeight());
+        return listHeight / itemHeight;
+    }
+
+    // Method Description:
+    // - Scrolls the focus one page up the list of commands.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void CommandPalette::ScrollPageUp()
+    {
+        auto selected = _filteredActionsView().SelectedIndex();
+        auto numVisibleItems = _getNumVisibleItems();
+        _scrollToIndex(selected - numVisibleItems);
+    }
+
+    // Method Description:
+    // - Scrolls the focus one page down the list of commands.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void CommandPalette::ScrollPageDown()
+    {
+        auto selected = _filteredActionsView().SelectedIndex();
+        auto numVisibleItems = _getNumVisibleItems();
+        _scrollToIndex(selected + numVisibleItems);
+    }
+
+    // Method Description:
+    // - Moves the focus to the top item in the list of commands.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void CommandPalette::ScrollToTop()
+    {
+        _scrollToIndex(0);
+    }
+
+    // Method Description:
+    // - Moves the focus to the bottom item in the list of commands.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void CommandPalette::ScrollToBottom()
+    {
+        _scrollToIndex(_filteredActionsView().Items().Size() - 1);
+    }
+
     // Method Description:
     // - Called when the command selection changes. We'll use this in the tab
     //   switcher to "preview" tabs as the user navigates the list of tabs. To
@@ -132,7 +218,7 @@ namespace winrt::TerminalApp::implementation
         if (_currentMode == CommandPaletteMode::TabSwitchMode)
         {
             const auto& selectedCommand = _filteredActionsView().SelectedItem();
-            if (const auto& command = selectedCommand.try_as<Command>())
+            if (const auto& command = selectedCommand.try_as<TerminalApp::Command>())
             {
                 const auto& actionAndArgs = command.Action();
                 _dispatch.DoAction(actionAndArgs);
@@ -193,6 +279,30 @@ namespace winrt::TerminalApp::implementation
             SelectNextItem(true);
             e.Handled(true);
         }
+        else if (key == VirtualKey::PageUp)
+        {
+            // Action Mode: Move focus to the first visible item in the list.
+            ScrollPageUp();
+            e.Handled(true);
+        }
+        else if (key == VirtualKey::PageDown)
+        {
+            // Action Mode: Move focus to the last visible item in the list.
+            ScrollPageDown();
+            e.Handled(true);
+        }
+        else if (key == VirtualKey::Home)
+        {
+            // Action Mode: Move focus to the first item in the list.
+            ScrollToTop();
+            e.Handled(true);
+        }
+        else if (key == VirtualKey::End)
+        {
+            // Action Mode: Move focus to the last item in the list.
+            ScrollToBottom();
+            e.Handled(true);
+        }
         else if (key == VirtualKey::Enter)
         {
             // Action, TabSwitch or TabSearchMode Mode: Dispatch the action of the selected command.
@@ -200,7 +310,7 @@ namespace winrt::TerminalApp::implementation
             {
                 if (const auto selectedItem = _filteredActionsView().SelectedItem())
                 {
-                    _dispatchCommand(selectedItem.try_as<Command>());
+                    _dispatchCommand(selectedItem.try_as<TerminalApp::Command>());
                 }
             }
             // Commandline Mode: Use the input to synthesize an ExecuteCommandline action
@@ -213,27 +323,41 @@ namespace winrt::TerminalApp::implementation
         }
         else if (key == VirtualKey::Escape)
         {
-            // Dismiss the palette if the text is empty, otherwise clear the
-            // search string.
-            if (_searchBox().Text().empty())
+            // Action, TabSearch, TabSwitch Mode: Dismiss the palette if the
+            // text is empty, otherwise clear the search string.
+            if (_currentMode != CommandPaletteMode::CommandlineMode)
             {
-                _dismissPalette();
+                if (_searchBox().Text().empty())
+                {
+                    _dismissPalette();
+                }
+                else
+                {
+                    _searchBox().Text(L"");
+                }
             }
-            else
+            else if (_currentMode == CommandPaletteMode::CommandlineMode)
             {
-                _searchBox().Text(L"");
-            }
+                const auto currentInput = _getPostPrefixInput();
+                if (currentInput.empty())
+                {
+                    // The user's only input "> " so far. We should just dismiss
+                    // the palette. This is like dismissing the Action mode with
+                    // empty input.
+                    _dismissPalette();
+                }
+                else
+                {
+                    // Clear out the current input. We'll leave a ">" in the
+                    // input (to stay in commandline mode), and a leading space
+                    // (if they currently had one).
+                    const bool hasLeadingSpace = (_searchBox().Text().size()) - (currentInput.size()) > 1;
+                    _searchBox().Text(hasLeadingSpace ? L"> " : L">");
 
-            e.Handled(true);
-        }
-        else if (key == VirtualKey::Back)
-        {
-            // If the last filter text was empty, and we're backspacing from
-            // that state, then the user "backspaced" the virtual '>' we're
-            // using as the action mode indicator. Switch into commandline mode.
-            if (_searchBox().Text().empty() && _lastFilterTextWasEmpty && _currentMode == CommandPaletteMode::ActionMode)
-            {
-                _switchToMode(CommandPaletteMode::CommandlineMode);
+                    // This will conveniently move the cursor to the end of the
+                    // text input for us.
+                    _searchBox().Select(_searchBox().Text().size(), 0);
+                }
             }
 
             e.Handled(true);
@@ -309,7 +433,7 @@ namespace winrt::TerminalApp::implementation
         {
             if (const auto selectedItem = _filteredActionsView().SelectedItem())
             {
-                if (const auto data = selectedItem.try_as<Command>())
+                if (const auto data = selectedItem.try_as<TerminalApp::Command>())
                 {
                     _dispatchCommand(data);
                 }
@@ -356,7 +480,7 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_listItemClicked(Windows::Foundation::IInspectable const& /*sender*/,
                                           Windows::UI::Xaml::Controls::ItemClickEventArgs const& e)
     {
-        _dispatchCommand(e.ClickedItem().try_as<Command>());
+        _dispatchCommand(e.ClickedItem().try_as<TerminalApp::Command>());
     }
 
     // Method Description:
@@ -391,7 +515,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     // Return Value:
     // - A list of Commands to filter.
-    Collections::IVector<Command> CommandPalette::_commandsToFilter()
+    Collections::IVector<TerminalApp::Command> CommandPalette::_commandsToFilter()
     {
         switch (_currentMode)
         {
@@ -406,7 +530,7 @@ namespace winrt::TerminalApp::implementation
         case CommandPaletteMode::TabSwitchMode:
             return _allTabActions;
         case CommandPaletteMode::CommandlineMode:
-            return winrt::single_threaded_vector<Command>();
+            return winrt::single_threaded_vector<TerminalApp::Command>();
         default:
             return _allCommands;
         }
@@ -421,7 +545,7 @@ namespace winrt::TerminalApp::implementation
     // - command: the Command to dispatch. This might be null.
     // Return Value:
     // - <none>
-    void CommandPalette::_dispatchCommand(const Command& command)
+    void CommandPalette::_dispatchCommand(const TerminalApp::Command& command)
     {
         if (command)
         {
@@ -466,13 +590,18 @@ namespace winrt::TerminalApp::implementation
             }
         }
     }
+
     // Method Description:
-    // - Get all the input text in _searchBox that follows any leading spaces.
+    // - Get all the input text in _searchBox that follows the prefix character
+    //   and any whitespace following that prefix character. This can be used in
+    //   commandline mode to get all the useful input that the user input after
+    //   the leading ">" prefix.
+    // - Note that this will behave unexpectedly in Action Mode.
     // Arguments:
     // - <none>
     // Return Value:
-    // - the string of input following any number of leading spaces
-    std::wstring CommandPalette::_getTrimmedInput()
+    // - the string of input following the prefix character.
+    std::wstring CommandPalette::_getPostPrefixInput()
     {
         const std::wstring input{ _searchBox().Text() };
         if (input.empty())
@@ -480,15 +609,17 @@ namespace winrt::TerminalApp::implementation
             return input;
         }
 
+        const auto rawCmdline{ input.substr(1) };
+
         // Trim leading whitespace
-        const auto firstNonSpace = input.find_first_not_of(L" ");
+        const auto firstNonSpace = rawCmdline.find_first_not_of(L" ");
         if (firstNonSpace == std::wstring::npos)
         {
             // All the following characters are whitespace.
             return L"";
         }
 
-        return input.substr(firstNonSpace);
+        return rawCmdline.substr(firstNonSpace);
     }
 
     // Method Description:
@@ -499,15 +630,19 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void CommandPalette::_dispatchCommandline()
     {
-        auto cmdline{ _getTrimmedInput() };
-        if (cmdline.empty())
+        const auto input = _getPostPrefixInput();
+        if (input.empty())
         {
             return;
         }
+        winrt::hstring cmdline{ input };
 
         // Build the ExecuteCommandline action from the values we've parsed on the commandline.
-        ExecuteCommandlineArgs args{ cmdline };
-        ActionAndArgs executeActionAndArgs{ ShortcutAction::ExecuteCommandline, args };
+        auto executeActionAndArgs = winrt::make_self<implementation::ActionAndArgs>();
+        executeActionAndArgs->Action(ShortcutAction::ExecuteCommandline);
+        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
+        args->Commandline(cmdline);
+        executeActionAndArgs->Args(*args);
 
         TraceLoggingWrite(
             g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
@@ -516,7 +651,7 @@ namespace winrt::TerminalApp::implementation
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
 
-        if (_dispatch.DoAction(executeActionAndArgs))
+        if (_dispatch.DoAction(*executeActionAndArgs))
         {
             _close();
         }
@@ -552,54 +687,37 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_filterTextChanged(IInspectable const& /*sender*/,
                                             Windows::UI::Xaml::RoutedEventArgs const& /*args*/)
     {
-        if (_currentMode == CommandPaletteMode::CommandlineMode)
+        if (_currentMode == CommandPaletteMode::CommandlineMode || _currentMode == CommandPaletteMode::ActionMode)
         {
             _evaluatePrefix();
         }
 
-        // We're setting _lastFilterTextWasEmpty here, because if the user tries
-        // to backspace the last character in the input, the Backspace KeyDown
-        // event will fire _before_ _filterTextChanged does. Updating the value
-        // here will ensure that we can check this case appropriately.
-        _lastFilterTextWasEmpty = _searchBox().Text().empty();
-
         _updateFilteredActions();
         _filteredActionsView().SelectedIndex(0);
 
-        if (_currentMode == CommandPaletteMode::TabSearchMode || _currentMode == CommandPaletteMode::ActionMode)
-        {
-            _noMatchesText().Visibility(_filteredActions.Size() > 0 ? Visibility::Collapsed : Visibility::Visible);
-        }
-        else
-        {
-            _noMatchesText().Visibility(Visibility::Collapsed);
-        }
+        _noMatchesText().Visibility(_filteredActions.Size() > 0 ? Visibility::Collapsed : Visibility::Visible);
     }
 
     void CommandPalette::_evaluatePrefix()
     {
-        // This will take you from commandline mode, into action mode. The
-        // backspace handler in _keyDownHandler will handle taking us from
-        // action mode to commandline mode.
-        auto newMode = CommandPaletteMode::CommandlineMode;
+        auto newMode = CommandPaletteMode::ActionMode;
 
-        auto inputText = _getTrimmedInput();
+        auto inputText = _searchBox().Text();
         if (inputText.size() > 0)
         {
             if (inputText[0] == L'>')
             {
-                newMode = CommandPaletteMode::ActionMode;
+                newMode = CommandPaletteMode::CommandlineMode;
             }
         }
 
         if (newMode != _currentMode)
         {
-            //_switchToMode will remove the '>' character from the input.
             _switchToMode(newMode);
         }
     }
 
-    Collections::IObservableVector<Command> CommandPalette::FilteredActions()
+    Collections::IObservableVector<TerminalApp::Command> CommandPalette::FilteredActions()
     {
         return _filteredActions;
     }
@@ -609,12 +727,18 @@ namespace winrt::TerminalApp::implementation
         _bindings = bindings;
     }
 
-    void CommandPalette::SetCommands(Collections::IVector<Command> const& actions)
+    void CommandPalette::SetCommands(Collections::IVector<TerminalApp::Command> const& actions)
     {
         _allCommands = actions;
         _updateFilteredActions();
     }
 
+    void CommandPalette::SetTabActions(Collections::IVector<TerminalApp::Command> const& tabs)
+    {
+        _allTabActions = tabs;
+        _updateFilteredActions();
+    }
+
     void CommandPalette::EnableCommandPaletteMode()
     {
         _switchToMode(CommandPaletteMode::ActionMode);
@@ -639,8 +763,6 @@ namespace winrt::TerminalApp::implementation
             }
         }
 
-        _searchBox().Text(L"");
-        _searchBox().Select(_searchBox().Text().size(), 0);
         // Leaving this block of code outside the above if-statement
         // guarantees that the correct text is shown for the mode
         // whenever _switchToMode is called.
@@ -649,30 +771,26 @@ namespace winrt::TerminalApp::implementation
         case CommandPaletteMode::TabSearchMode:
         case CommandPaletteMode::TabSwitchMode:
         {
-            SearchBoxPlaceholderText(RS_(L"TabSwitcher_SearchBoxText"));
+            SearchBoxText(RS_(L"TabSwitcher_SearchBoxText"));
             NoMatchesText(RS_(L"TabSwitcher_NoMatchesText"));
             ControlName(RS_(L"TabSwitcherControlName"));
-            PrefixCharacter(L"");
             break;
         }
         case CommandPaletteMode::CommandlineMode:
-            SearchBoxPlaceholderText(RS_(L"CmdPalCommandlinePrompt"));
-            NoMatchesText(L"");
+            NoMatchesText(RS_(L"CmdPalCommandlinePrompt"));
             ControlName(RS_(L"CommandPaletteControlName"));
-            PrefixCharacter(L"");
             break;
         case CommandPaletteMode::ActionMode:
         default:
-            SearchBoxPlaceholderText(RS_(L"CommandPalette_SearchBox/PlaceholderText"));
+            SearchBoxText(RS_(L"CommandPalette_SearchBox/PlaceholderText"));
             NoMatchesText(RS_(L"CommandPalette_NoMatchesText/Text"));
             ControlName(RS_(L"CommandPaletteControlName"));
-            PrefixCharacter(L">");
             break;
         }
     }
 
     // This is a helper to aid in sorting commands by their `Name`s, alphabetically.
-    static bool _compareCommandNames(const Command& lhs, const Command& rhs)
+    static bool _compareCommandNames(const TerminalApp::Command& lhs, const TerminalApp::Command& rhs)
     {
         std::wstring_view leftName{ lhs.Name() };
         std::wstring_view rightName{ rhs.Name() };
@@ -682,7 +800,7 @@ namespace winrt::TerminalApp::implementation
     // This is a helper struct to aid in sorting Commands by a given weighting.
     struct WeightedCommand
     {
-        Command command;
+        TerminalApp::Command command;
         int weight;
         int inOrderCounter;
 
@@ -714,11 +832,11 @@ namespace winrt::TerminalApp::implementation
     // - A collection that will receive the filtered actions
     // Return Value:
     // - <none>
-    std::vector<Command> CommandPalette::_collectFilteredActions()
+    std::vector<winrt::TerminalApp::Command> CommandPalette::_collectFilteredActions()
     {
-        std::vector<Command> actions;
+        std::vector<winrt::TerminalApp::Command> actions;
 
-        winrt::hstring searchText{ _getTrimmedInput() };
+        auto searchText = _searchBox().Text();
         const bool addAll = searchText.empty();
 
         auto commandsToFilter = _commandsToFilter();
@@ -741,7 +859,7 @@ namespace winrt::TerminalApp::implementation
             }
 
             // Add all the commands, but make sure they're sorted alphabetically.
-            std::vector<Command> sortedCommands;
+            std::vector<TerminalApp::Command> sortedCommands;
             sortedCommands.reserve(commandsToFilter.Size());
 
             for (auto action : commandsToFilter)
@@ -976,45 +1094,6 @@ namespace winrt::TerminalApp::implementation
         _currentNestedCommands.Clear();
     }
 
-    // Method Description:
-    // - Listens for changes to TerminalPage's _tabs vector. Updates our vector of
-    //   tab switching commands accordingly.
-    // Arguments:
-    // - s: The vector being listened to.
-    // - e: The vector changed args that tells us whether a change, insert, or removal was performed
-    //      on the listened-to vector.
-    // Return Value:
-    // - <none>
-    void CommandPalette::OnTabsChanged(const IInspectable& s, const IVectorChangedEventArgs& e)
-    {
-        if (auto tabList = s.try_as<IObservableVector<TerminalApp::Tab>>())
-        {
-            auto idx = e.Index();
-            auto changedEvent = e.CollectionChange();
-
-            switch (changedEvent)
-            {
-            case CollectionChange::ItemChanged:
-            {
-                break;
-            }
-            case CollectionChange::ItemInserted:
-            {
-                auto tab = tabList.GetAt(idx);
-                _allTabActions.InsertAt(idx, tab.SwitchToTabCommand());
-                break;
-            }
-            case CollectionChange::ItemRemoved:
-            {
-                _allTabActions.RemoveAt(idx);
-                break;
-            }
-            }
-
-            _updateFilteredActions();
-        }
-    }
-
     void CommandPalette::EnableTabSwitcherMode(const bool searchMode, const uint32_t startIdx)
     {
         _switcherStartIdx = startIdx;