Migrate spelling-0.0.21 changes from main

Migrate spelling-0.0.19 changes from main
change interface to not use Clusters. Just build a string and a clustermap vector.
2026-04-21 05:31:37 +00:00 · 2020-07-13 16:59:33 -07:00 · 2020-07-13 16:59:33 -07:00 · 2020-07-14 15:40:59 -07:00 · 2020-07-14 15:40:55 -07:00
279 changed files with 3066 additions and 4486 deletions
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -8,7 +8,7 @@
        <!--<add key="Static Package Dependencies" value="dep\packages" />-->
        
        <!-- Use our own NuGet Feed -->
-        <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/ms/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
+        <add key="Windows Terminal NuGet Feed" value="https://terminalnuget.blob.core.windows.net/feed/index.json" />
        
        <!-- Internal NuGet feeds that may not be accessible outside Microsoft corporate network -->
        <!--<add key="TAEF - internal" value="https://microsoft.pkgs.visualstudio.com/DefaultCollection/_packaging/Taef/nuget/v3/index.json" />
--- a/OpenConsole.sln
+++ b/OpenConsole.sln
@@ -160,11 +160,15 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalConnection", "src\cascadia\TerminalConnection\TerminalConnection.vcxproj", "{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalCore", "src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj", "{CA5CAD1A-ABCD-429C-B551-8562EC954746}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalControl", "src\cascadia\TerminalControl\TerminalControl.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B} = {CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 		{1CF55140-EF6A-4736-A403-957E4F7430BB} = {1CF55140-EF6A-4736-A403-957E4F7430BB}
 		{48D21369-3D7B-4431-9967-24E81292CF63} = {48D21369-3D7B-4431-9967-24E81292CF63}
 	EndProjectSection
@@ -174,6 +178,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\casc
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
 		{CA5CAD1A-ABCD-429C-B551-8562EC954746} = {CA5CAD1A-ABCD-429C-B551-8562EC954746}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 	EndProjectSection
 EndProject
@@ -182,8 +187,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
 		{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
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalSettings", "src\cascadia\TerminalSettings\TerminalSettings.vcxproj", "{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminalShellExt", "src\cascadia\ShellExtension\WindowsTerminalShellExt.vcxproj", "{F2ED628A-DB22-446F-A081-4CC845B51A2B}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalCore", "src\cascadia\UnitTests_TerminalCore\UnitTests.vcxproj", "{2C2BEEF4-9333-4D05-B12A-1905CBF112F9}"
@@ -230,6 +238,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\lib\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LocalTests_TerminalApp", "src\cascadia\LocalTests_TerminalApp\TerminalApp.LocalTests.vcxproj", "{CA5CAD1A-B11C-4DDB-A4FE-C3AFAE9B5506}"
@@ -1380,6 +1389,35 @@ Global
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}.Release|x86.Build.0 = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|Any CPU.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|ARM64.ActiveCfg = Release|ARM64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x64Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x64.Build.0 = AuditMode|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.AuditMode|x86.ActiveCfg = Release|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|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x64Test.Build.0 = Debug|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.ActiveCfg = Debug|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Debug|DotNet_x86Test.Build.0 = 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|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x64Test.Build.0 = Release|x64
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.ActiveCfg = Release|Win32
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907}.Release|DotNet_x86Test.Build.0 = 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
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|Any CPU.ActiveCfg = Release|Win32
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|ARM64.ActiveCfg = Release|ARM64
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B}.AuditMode|DotNet_x64Test.ActiveCfg = AuditMode|Win32
@@ -2035,6 +2073,7 @@ Global
 		{CA5CAD1A-44BD-4AC7-AC72-6CA5B3AB89ED} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {59840756-302F-44DF-AA47-441A9D673202}
+		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {59840756-302F-44DF-AA47-441A9D673202}
 		{F2ED628A-DB22-446F-A081-4CC845B51A2B} = {59840756-302F-44DF-AA47-441A9D673202}
 		{2C2BEEF4-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{EF3E32A7-5FF6-42B4-B6E2-96CD7D033F00} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
--- a/custom.props
+++ b/custom.props
@@ -5,7 +5,7 @@
    <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
    <XesBaseYearForStoreVersion>2020</XesBaseYearForStoreVersion>
    <VersionMajor>1</VersionMajor>
-    <VersionMinor>3</VersionMinor>
+    <VersionMinor>2</VersionMinor>
    <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
  </PropertyGroup>
 </Project>
--- a/doc/Niksa.md
+++ b/doc/Niksa.md
@@ -9,8 +9,6 @@ This document serves as a storage point for those posts.
 - [Output Processing between "Far East" and "Western"](#fesb)
 - [Why do we not backport things?](#backport)
 - [Why can't we have mixed elevated and non-elevated tabs in the Terminal?](#elevation)
- [What's the difference between a shell and a terminal?](#shell-vs-terminal)
-

 ## <a name="cmd"></a>Why do we avoid changing CMD.exe?
 `setlocal` doesn't behave the same way as an environment variable. It's a thing that would have to be put in at the top of the batch script that is `somefile.cmd` as one of its first commands to adjust the way that one specific batch file is processed by the `cmd.exe` engine. That's probably not suitable for your needs, but that's the way we have to go.
@@ -181,20 +179,3 @@ Other platforms have accepted that risk in preference for user convenience. They

 Original Source: https://github.com/microsoft/terminal/issues/632#issuecomment-519375707

-## <a name="shell-vs-terminal"></a>What's the difference between a shell and a terminal?
-
-_guest speaker @zadjii-msft_
-
-I think there might be a bit of a misunderstanding here - there are two different kinds of applications we're talking about here:
-* shell applications, like `cmd.exe`, `powershell`, `zsh`, etc. These are text-only applications that emit streams of characters. They don't care at all about how they're eventually rendered to the user. These are also sometimes referred to as "commandline client" applications.
-* terminal applications, like the Windows Terminal, gnome-terminal, xterm, iterm2, hyper. These are graphical applications that can be used to render the output of commandline clients. 
-
-On Windows, if you just run `cmd.exe` directly, the OS will create an instance of `conhost.exe` as the _terminal_ for `cmd.exe`. The same thing happens for `powershell.exe`, the system will creates a new conhost window for any client that's not already connected to a terminal of some sort. This has lead to an enormous amount of confusion for people thinking that a conhost window is actually a "`cmd` window". `cmd` can't have a window, it's just a commandline application. Its window is always some other terminal.
-
-Any terminal can run any commandline client application. So you can use the Windows Terminal to run whatever shell you want. I use mine for both `cmd` and `powershell`, and also WSL:
-
-![image](https://user-images.githubusercontent.com/18356694/89556758-79d27e80-d7d7-11ea-84e2-10710e09ef4a.png)
-
-It's not the Terminal's responsibility to remember the commands executed by a commandline client. That's the responsibility of the _shell_. How would the terminal remember commands executed by something like `emacs` or `vim`? Those are both applications where the user is typing input and hitting enter, like they would at a cmd prompt, but without something that resembles a command history.
-
-Original Source: https://github.com/microsoft/terminal/issues/6500#issuecomment-670035468
--- a/doc/cascadia/profiles.schema.json
+++ b/doc/cascadia/profiles.schema.json
@@ -63,9 +63,6 @@
        "openTabColorPicker",
        "renameTab",
        "commandPalette",
-        "wt",
-        "closeOtherTabs",
-        "closeTabsAfter",
        "unbound"
      ],
      "type": "string"
@@ -283,57 +280,6 @@
        }
      ]
    },
-    "WtAction": {
-      "description": "Arguments corresponding to a wt Action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "wt" },
-            "commandline": {
-              "type": "string",
-              "default": "",
-              "description": "a `wt` commandline to run in the current window"
-            }
-          }
-        }
-      ],
-      "required": [ "commandline" ]
-    },
-    "CloseOtherTabsAction": {
-      "description": "Arguments for a closeOtherTabs action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "closeOtherTabs" },
-            "index": {
-              "type": "integer",
-              "default": "",
-              "description": "close the tabs following the tab at this index"
-            }
-          }
-        }
-      ],
-      "required": [ "index" ]
-    },
-    "CloseTabsAfterAction": {
-      "description": "Arguments for a closeTabsAfter action",
-      "allOf": [
-        { "$ref": "#/definitions/ShortcutAction" },
-        {
-          "properties": {
-            "action": { "type": "string", "pattern": "closeTabsAfter" },
-            "index": {
-              "type": "integer",
-              "default": "",
-              "description": "close the tabs other than the one at this index"
-            }
-          }
-        }
-      ],
-      "required": [ "index" ]
-    },
    "Keybinding": {
      "additionalProperties": false,
      "properties": {
@@ -350,9 +296,6 @@
              { "$ref": "#/definitions/SplitPaneAction" },
              { "$ref": "#/definitions/OpenSettingsAction" },
              { "$ref": "#/definitions/SetTabColorAction" },
-              { "$ref": "#/definitions/WtAction" },
-              { "$ref": "#/definitions/CloseOtherTabsAction" },
-              { "$ref": "#/definitions/CloseTabsAfterAction" },
              { "type": "null" }
            ]
        },
--- a/doc/specs/#1337
+++ b/doc/specs/#1337
@@ -1,146 +0,0 @@
---
-author: Mike Griese @zadjii-msft
-created on: 2020-07-31
-last updated: 2020-08-03
-issue id: #1337
---
-# Per-Profile Tab Colors
-
-## Abstract
-
-This spec describes a way to specify tab colors in a profile in a way that will
-be forward compatible with theming the Terminal. This spec will be largely
-dedicated to the design of a single setting, but within the context of theming.
-
-## Inspiration
-
-Following the addition of the Tab Color Picker in [#3789], we've had numerous
-requests for the ability to set the color of a tab directly within a profile.
-While largely we're tracking theming in [#3327], including the specification of
-a tab color, the theming spec ([#5772] )is very large and will take a while to
-revise and approve. This spec is intended to pull a single point out from that
-spec to make it more easily reviewable, and implement it in a way that will
-continue working when we add support for themes in the future.
-
-## Solution Design
-
-To enable per-profile tab colors, we'll add a single setting: `tabColor`. For
-now<sup>[[1](#user-content-footnote-1)]</sup>, this setting will accept any
-`#rrggbb` color string.
-
-Since each profile creates a `Pane` with a `TermControl`, we'll need to store
-this color not in the `Tab`, but somewhere below `Pane`, so that when you switch
-between Panes in a tab with different `tabColor`s, the color will update
-automatically. When a new `TermControl` is created, we'll store this color in the
-`TermControl`'s `Terminal` core. This is to support the future possibility of
-setting the tab color via VT sequences.
-
-A Tab's color will be the result of layering a variety of sources, from the bottom up:
-
-Color | | Set by
-- | -- | --
-Runtime Color | _optional_ |Color Picker / `setTabColor` action
-Control Tab Color | _optional_ | Profile's `tabColor`, or a color set by VT
-Theme Tab Background | _optional_ | `tab.backgroundColor` in the theme
-Tab Default Color | **default** | TabView in XAML
-
-Some examples:
-* **Scenario 1**: The user has set `"tabColor": "#ff0000"` in their profile.
-  When they create tabs with that profile, instead of appearing in the default
-  color for the TabView, they'll be `#ff0000`.
-* **Scenario 2**: The user has set `"tabColor": "#ff0000"` in their profile.
-  When they try to set the color for that tab (with the color picker) to
-  `#0000ff`, the tab's color is updated to reflect this new blue color. When
-  they clear the runtime color (with the color picker), the tab will return to
-  `#ff0000`.
-* **Scenario 3**: The user has two profiles with colors set, one to `"tabColor":
-  "#ff0000"`, and the other with `"tabColor": "#00ff00"`. If they open these
-  profiles in two panes side-by side, the tab's color will update to reflect the
-  color from the currently-focused control.
-* **Scenario 4**: The user has two profiles with colors set, one to `"tabColor":
-  "#ff0000"`, and the other with `"tabColor": "#00ff00"`. If they open these
-  profiles in two panes side-by side, and try to set the color for that tab
-  (with the color picker) to `#0000ff`, the tab's color is updated to reflect
-  this new blue color. Regardless of which pane is focused, the tab will be
-  blue.
-* **Scenario 5**: The user has set `"tabColor": "#ff0000"` in their profile
-  ("Profile A"), and `"tab.backgroundColor": "#00ff00"`in their theme. When they
-  create tabs with "Profile A", the tabs will appear red. Other tabs (for
-  profiles without `tabColor` set) will appear green, using the color from the
-  theme.
-
-
-## UI/UX Design
-
-In general, this is going to look exactly like the colored tabs look now.
-
-![preview](profile-tabColor-000.gif)
-
-## Capabilities
-
-<table>
-<tr>
-<td><strong>Accessibility</strong></td>
-<td>
-N/A
-</td>
-</tr>
-<tr>
-<td><strong>Security</strong></td>
-<td>
-N/A
-</td>
-</tr>
-<tr>
-<td><strong>Reliability</strong></td>
-<td>
-No expected change
-</td>
-</tr>
-<tr>
-<td><strong>Compatibility</strong></td>
-<td>
-This entire spec outlines how this feature is designed with a emphasis on future
-compatibility. As such, there are no expected regressions in the future when we
-do add support for themes.
-</td>
-</tr>
-<tr>
-<td><strong>Performance, Power, and Efficiency</strong></td>
-<td>
-No expected change
-</td>
-</tr>
-</table>
-
-## Potential Issues
-
-None expected.
-
-## Footnotes
-
-<a id="footnote-1"><a>[1]: When full theming support is added, themes will
-provide support for setting colors as one of a variety of values:
-
-  * An `#rrggbb` string
-  * The system accent color
-  * The current background color of the Terminal
-  * A value from a given resource key from XAML
-
-When support for these other types of "smart" colors is added, then the profile
-`tabColor` setting will also gracefully accept these values.
-
-## Future considerations
-
-* It's not out of the realm of possibility that someone might want to color each
-  _pane_'s color at runtime. In that case, the runtime color would be stored in
-  the `Pane`, not the `Tab`.
-
-
-
-<!-- Footnotes -->
-
-[#1337]: https://github.com/microsoft/terminal/issues/1337
-[#3789]: https://github.com/microsoft/terminal/issues/3789
-[#3327]: https://github.com/microsoft/terminal/issues/3327
-[#5772]: https://github.com/microsoft/terminal/pull/5772
--- a/Colors/profile-tabColor-000.gif
+++ b/Colors/profile-tabColor-000.gif
--- a/res/Cascadia.ttf
+++ b/res/Cascadia.ttf
--- a/res/CascadiaMono.ttf
+++ b/res/CascadiaMono.ttf
--- a/res/README.md
+++ b/res/README.md
@@ -17,5 +17,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi

 ### Fonts Included

-* Cascadia Code, Cascadia Mono (2007.15)
-   * from microsoft/cascadia-code@2a54363b2c867f7ae811b9a034c0024cef67de96
+* Cascadia Code, Cascadia Mono (2007.01)
+   * from microsoft/cascadia-code@311cc603f30635da704b6a7d13050e245e61667b
--- a/src/buffer/out/AttrRow.cpp
+++ b/src/buffer/out/AttrRow.cpp
@@ -108,7 +108,12 @@ TextAttribute ATTR_ROW::GetAttrByColumn(const size_t column,
 {
    THROW_HR_IF(E_INVALIDARG, column >= _cchRowWidth);
    const auto runPos = FindAttrIndex(column, pApplies);
-    return _list.at(runPos).GetAttributes();
+    return GetAttrByIndex(runPos);
+}
+
+TextAttribute ATTR_ROW::GetAttrByIndex(const size_t index) const
+{
+    return _list.at(index).GetAttributes();
 }

 // Routine Description:
@@ -223,7 +228,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
 // Return Value:
 // - STATUS_NO_MEMORY if there wasn't enough memory to insert the runs
 //   otherwise STATUS_SUCCESS if we were successful.
-[[nodiscard]] HRESULT ATTR_ROW::InsertAttrRuns(const gsl::span<const TextAttributeRun> newAttrs,
+[[nodiscard]] HRESULT ATTR_ROW::InsertAttrRuns(const std::basic_string_view<TextAttributeRun> newAttrs,
                                               const size_t iStart,
                                               const size_t iEnd,
                                               const size_t cBufferWidth)
@@ -250,7 +255,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
    if (newAttrs.size() == 1)
    {
        // Get the new color attribute we're trying to apply
-        const TextAttribute NewAttr = til::at(newAttrs, 0).GetAttributes();
+        const TextAttribute NewAttr = newAttrs.at(0).GetAttributes();

        // If the existing run was only 1 element...
        // ...and the new color is the same as the old, we don't have to do anything and can exit quick.
@@ -372,7 +377,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
    if (iStart == 0 && iEnd == iLastBufferCol)
    {
        // Just dump what we're given over what we have and call it a day.
-        _list.assign(newAttrs.begin(), newAttrs.end());
+        _list.assign(newAttrs.cbegin(), newAttrs.cend());

        return S_OK;
    }
--- a/src/buffer/out/AttrRow.hpp
+++ b/src/buffer/out/AttrRow.hpp
@@ -36,6 +36,8 @@ public:
    TextAttribute GetAttrByColumn(const size_t column,
                                  size_t* const pApplies) const;

+    TextAttribute GetAttrByIndex(const size_t index) const;
+
    size_t GetNumberOfRuns() const noexcept;

    size_t FindAttrIndex(const size_t index,
@@ -46,7 +48,7 @@ public:

    void Resize(const size_t newWidth);

-    [[nodiscard]] HRESULT InsertAttrRuns(const gsl::span<const TextAttributeRun> newAttrs,
+    [[nodiscard]] HRESULT InsertAttrRuns(const std::basic_string_view<TextAttributeRun> newAttrs,
                                         const size_t iStart,
                                         const size_t iEnd,
                                         const size_t cBufferWidth);
--- a/src/buffer/out/OutputCellIterator.cpp
+++ b/src/buffer/out/OutputCellIterator.cpp
@@ -112,9 +112,9 @@ OutputCellIterator::OutputCellIterator(const std::wstring_view utf16Text, const
 // - This is an iterator over legacy colors only. The text is not modified.
 // Arguments:
 // - legacyAttrs - One legacy color item per cell
-OutputCellIterator::OutputCellIterator(const gsl::span<const WORD> legacyAttrs) noexcept :
+OutputCellIterator::OutputCellIterator(const std::basic_string_view<WORD> legacyAttrs) noexcept :
    _mode(Mode::LegacyAttr),
-    _currentView(s_GenerateViewLegacyAttr(til::at(legacyAttrs, 0))),
+    _currentView(s_GenerateViewLegacyAttr(legacyAttrs.at(0))),
    _run(legacyAttrs),
    _attr(InvalidTextAttribute),
    _distance(0),
@@ -127,9 +127,9 @@ OutputCellIterator::OutputCellIterator(const gsl::span<const WORD> legacyAttrs)
 // - This is an iterator over legacy cell data. We will use the unicode text and the legacy color attribute.
 // Arguments:
 // - charInfos - Multiple cell with unicode text and legacy color data.
-OutputCellIterator::OutputCellIterator(const gsl::span<const CHAR_INFO> charInfos) noexcept :
+OutputCellIterator::OutputCellIterator(const std::basic_string_view<CHAR_INFO> charInfos) noexcept :
    _mode(Mode::CharInfo),
-    _currentView(s_GenerateView(til::at(charInfos, 0))),
+    _currentView(s_GenerateView(charInfos.at(0))),
    _run(charInfos),
    _attr(InvalidTextAttribute),
    _distance(0),
@@ -142,9 +142,9 @@ OutputCellIterator::OutputCellIterator(const gsl::span<const CHAR_INFO> charInfo
 // - This is an iterator over existing OutputCells with full text and color data.
 // Arguments:
 // - cells - Multiple cells in a run
-OutputCellIterator::OutputCellIterator(const gsl::span<const OutputCell> cells) :
+OutputCellIterator::OutputCellIterator(const std::basic_string_view<OutputCell> cells) :
    _mode(Mode::Cell),
-    _currentView(s_GenerateView(til::at(cells, 0))),
+    _currentView(s_GenerateView(cells.at(0))),
    _run(cells),
    _attr(InvalidTextAttribute),
    _distance(0),
@@ -180,15 +180,15 @@ OutputCellIterator::operator bool() const noexcept
        }
        case Mode::Cell:
        {
-            return _pos < std::get<gsl::span<const OutputCell>>(_run).size();
+            return _pos < std::get<std::basic_string_view<OutputCell>>(_run).length();
        }
        case Mode::CharInfo:
        {
-            return _pos < std::get<gsl::span<const CHAR_INFO>>(_run).size();
+            return _pos < std::get<std::basic_string_view<CHAR_INFO>>(_run).length();
        }
        case Mode::LegacyAttr:
        {
-            return _pos < std::get<gsl::span<const WORD>>(_run).size();
+            return _pos < std::get<std::basic_string_view<WORD>>(_run).length();
        }
        default:
            FAIL_FAST_HR(E_NOTIMPL);
@@ -265,7 +265,7 @@ OutputCellIterator& OutputCellIterator::operator++()
        _pos++;
        if (operator bool())
        {
-            _currentView = s_GenerateView(til::at(std::get<gsl::span<const OutputCell>>(_run), _pos));
+            _currentView = s_GenerateView(std::get<std::basic_string_view<OutputCell>>(_run).at(_pos));
        }
        break;
    }
@@ -275,7 +275,7 @@ OutputCellIterator& OutputCellIterator::operator++()
        _pos++;
        if (operator bool())
        {
-            _currentView = s_GenerateView(til::at(std::get<gsl::span<const CHAR_INFO>>(_run), _pos));
+            _currentView = s_GenerateView(std::get<std::basic_string_view<CHAR_INFO>>(_run).at(_pos));
        }
        break;
    }
@@ -285,7 +285,7 @@ OutputCellIterator& OutputCellIterator::operator++()
        _pos++;
        if (operator bool())
        {
-            _currentView = s_GenerateViewLegacyAttr(til::at(std::get<gsl::span<const WORD>>(_run), _pos));
+            _currentView = s_GenerateViewLegacyAttr(std::get<std::basic_string_view<WORD>>(_run).at(_pos));
        }
        break;
    }
--- a/src/buffer/out/OutputCellIterator.hpp
+++ b/src/buffer/out/OutputCellIterator.hpp
@@ -39,9 +39,9 @@ public:
    OutputCellIterator(const CHAR_INFO& charInfo, const size_t fillLimit = 0) noexcept;
    OutputCellIterator(const std::wstring_view utf16Text);
    OutputCellIterator(const std::wstring_view utf16Text, const TextAttribute attribute);
-    OutputCellIterator(const gsl::span<const WORD> legacyAttributes) noexcept;
-    OutputCellIterator(const gsl::span<const CHAR_INFO> charInfos) noexcept;
-    OutputCellIterator(const gsl::span<const OutputCell> cells);
+    OutputCellIterator(const std::basic_string_view<WORD> legacyAttributes) noexcept;
+    OutputCellIterator(const std::basic_string_view<CHAR_INFO> charInfos) noexcept;
+    OutputCellIterator(const std::basic_string_view<OutputCell> cells);
    ~OutputCellIterator() = default;

    OutputCellIterator& operator=(const OutputCellIterator& it) = default;
@@ -86,13 +86,13 @@ private:
    };
    Mode _mode;

-    gsl::span<const WORD> _legacyAttrs;
+    std::basic_string_view<WORD> _legacyAttrs;

    std::variant<
        std::wstring_view,
-        gsl::span<const WORD>,
-        gsl::span<const CHAR_INFO>,
-        gsl::span<const OutputCell>,
+        std::basic_string_view<WORD>,
+        std::basic_string_view<CHAR_INFO>,
+        std::basic_string_view<OutputCell>,
        std::monostate>
        _run;

--- a/src/buffer/out/OutputCellRect.cpp
+++ b/src/buffer/out/OutputCellRect.cpp
@@ -50,7 +50,7 @@ gsl::span<OutputCell> OutputCellRect::GetRow(const size_t row)
 // - Read-only iterator of OutputCells
 OutputCellIterator OutputCellRect::GetRowIter(const size_t row) const
 {
-    const gsl::span<const OutputCell> view(_FindRowOffset(row), _cols);
+    const std::basic_string_view<OutputCell> view(_FindRowOffset(row), _cols);

    return OutputCellIterator(view);
 }
--- a/src/buffer/out/Row.cpp
+++ b/src/buffer/out/Row.cpp
@@ -160,98 +160,66 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
    // If we're given a right-side column limit, use it. Otherwise, the write limit is the final column index available in the char row.
    const auto finalColumnInRow = limitRight.value_or(_charRow.size() - 1);

-    if (it)
+    while (it && currentIndex <= finalColumnInRow)
    {
-        // Accumulate usages of the same color so we can spend less time in InsertAttrRuns rewriting it.
-        auto currentColor = it->TextAttr();
-        size_t colorUses = 0;
-        size_t colorStarts = index;
-
-        while (it && currentIndex <= finalColumnInRow)
+        // Fill the color if the behavior isn't set to keeping the current color.
+        if (it->TextAttrBehavior() != TextAttributeBehavior::Current)
        {
-            // Fill the color if the behavior isn't set to keeping the current color.
-            if (it->TextAttrBehavior() != TextAttributeBehavior::Current)
+            const TextAttributeRun attrRun{ 1, it->TextAttr() };
+            LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &attrRun, 1 },
+                                                  currentIndex,
+                                                  currentIndex,
+                                                  _charRow.size()));
+        }
+
+        // Fill the text if the behavior isn't set to saying there's only a color stored in this iterator.
+        if (it->TextAttrBehavior() != TextAttributeBehavior::StoredOnly)
+        {
+            const bool fillingLastColumn = currentIndex == finalColumnInRow;
+
+            // TODO: MSFT: 19452170 - We need to ensure when writing any trailing byte that the one to the left
+            // is a matching leading byte. Likewise, if we're writing a leading byte, we need to make sure we still have space in this loop
+            // for the trailing byte coming up before writing it.
+
+            // If we're trying to fill the first cell with a trailing byte, pad it out instead by clearing it.
+            // Don't increment iterator. We'll advance the index and try again with this value on the next round through the loop.
+            if (currentIndex == 0 && it->DbcsAttr().IsTrailing())
            {
-                // If the color of this cell is the same as the run we're currently on,
-                // just increment the counter.
-                if (currentColor == it->TextAttr())
-                {
-                    ++colorUses;
-                }
-                else
-                {
-                    // Otherwise, commit this color into the run and save off the new one.
-                    const TextAttributeRun run{ colorUses, currentColor };
-                    // Now commit the new color runs into the attr row.
-                    LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &run, 1 },
-                                                          colorStarts,
-                                                          currentIndex - 1,
-                                                          _charRow.size()));
-                    currentColor = it->TextAttr();
-                    colorUses = 1;
-                    colorStarts = currentIndex;
-                }
+                _charRow.ClearCell(currentIndex);
            }
-
-            // Fill the text if the behavior isn't set to saying there's only a color stored in this iterator.
-            if (it->TextAttrBehavior() != TextAttributeBehavior::StoredOnly)
+            // If we're trying to fill the last cell with a leading byte, pad it out instead by clearing it.
+            // Don't increment iterator. We'll exit because we couldn't write a lead at the end of a line.
+            else if (fillingLastColumn && it->DbcsAttr().IsLeading())
            {
-                const bool fillingLastColumn = currentIndex == finalColumnInRow;
-
-                // TODO: MSFT: 19452170 - We need to ensure when writing any trailing byte that the one to the left
-                // is a matching leading byte. Likewise, if we're writing a leading byte, we need to make sure we still have space in this loop
-                // for the trailing byte coming up before writing it.
-
-                // If we're trying to fill the first cell with a trailing byte, pad it out instead by clearing it.
-                // Don't increment iterator. We'll advance the index and try again with this value on the next round through the loop.
-                if (currentIndex == 0 && it->DbcsAttr().IsTrailing())
-                {
-                    _charRow.ClearCell(currentIndex);
-                }
-                // If we're trying to fill the last cell with a leading byte, pad it out instead by clearing it.
-                // Don't increment iterator. We'll exit because we couldn't write a lead at the end of a line.
-                else if (fillingLastColumn && it->DbcsAttr().IsLeading())
-                {
-                    _charRow.ClearCell(currentIndex);
-                    _charRow.SetDoubleBytePadded(true);
-                }
-                // Otherwise, copy the data given and increment the iterator.
-                else
-                {
-                    _charRow.DbcsAttrAt(currentIndex) = it->DbcsAttr();
-                    _charRow.GlyphAt(currentIndex) = it->Chars();
-                    ++it;
-                }
-
-                // If we're asked to (un)set the wrap status and we just filled the last column with some text...
-                // NOTE:
-                //  - wrap = std::nullopt    --> don't change the wrap value
-                //  - wrap = true            --> we're filling cells as a steam, consider this a wrap
-                //  - wrap = false           --> we're filling cells as a block, unwrap
-                if (wrap.has_value() && fillingLastColumn)
-                {
-                    // set wrap status on the row to parameter's value.
-                    _charRow.SetWrapForced(wrap.value());
-                }
+                _charRow.ClearCell(currentIndex);
+                _charRow.SetDoubleBytePadded(true);
            }
+            // Otherwise, copy the data given and increment the iterator.
            else
            {
+                _charRow.DbcsAttrAt(currentIndex) = it->DbcsAttr();
+                _charRow.GlyphAt(currentIndex) = it->Chars();
                ++it;
            }

-            // Move to the next cell for the next time through the loop.
-            ++currentIndex;
+            // If we're asked to (un)set the wrap status and we just filled the last column with some text...
+            // NOTE:
+            //  - wrap = std::nullopt    --> don't change the wrap value
+            //  - wrap = true            --> we're filling cells as a steam, consider this a wrap
+            //  - wrap = false           --> we're filling cells as a block, unwrap
+            if (wrap.has_value() && fillingLastColumn)
+            {
+                // set wrap status on the row to parameter's value.
+                _charRow.SetWrapForced(wrap.value());
+            }
+        }
+        else
+        {
+            ++it;
        }

-        // Now commit the final color into the attr row
-        if (colorUses)
-        {
-            const TextAttributeRun run{ colorUses, currentColor };
-            LOG_IF_FAILED(_attrRow.InsertAttrRuns({ &run, 1 },
-                                                  colorStarts,
-                                                  currentIndex - 1,
-                                                  _charRow.size()));
-        }
+        // Move to the next cell for the next time through the loop.
+        ++currentIndex;
    }

    return it;
--- a/src/buffer/out/TextAttribute.cpp
+++ b/src/buffer/out/TextAttribute.cpp
@@ -90,7 +90,7 @@ bool TextAttribute::IsLegacy() const noexcept
 // - reverseScreenMode: true if the screen mode is reversed.
 // Return Value:
 // - the foreground and background colors that should be displayed.
-std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
+std::pair<COLORREF, COLORREF> TextAttribute::CalculateRgbColors(const std::basic_string_view<COLORREF> colorTable,
                                                                const COLORREF defaultFgColor,
                                                                const COLORREF defaultBgColor,
                                                                const bool reverseScreenMode) const noexcept
@@ -246,7 +246,8 @@ bool TextAttribute::IsCrossedOut() const noexcept

 bool TextAttribute::IsUnderlined() const noexcept
 {
-    return WI_IsFlagSet(_extendedAttrs, ExtendedAttributes::Underlined);
+    // TODO:GH#2915 Treat underline separately from LVB_UNDERSCORE
+    return WI_IsFlagSet(_wAttrLegacy, COMMON_LVB_UNDERSCORE);
 }

 bool TextAttribute::IsOverlined() const noexcept
@@ -269,7 +270,7 @@ void TextAttribute::SetFaint(bool isFaint) noexcept
    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Faint, isFaint);
 }

-void TextAttribute::SetItalic(bool isItalic) noexcept
+void TextAttribute::SetItalics(bool isItalic) noexcept
 {
    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Italics, isItalic);
 }
@@ -289,12 +290,13 @@ void TextAttribute::SetCrossedOut(bool isCrossedOut) noexcept
    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::CrossedOut, isCrossedOut);
 }

-void TextAttribute::SetUnderlined(bool isUnderlined) noexcept
+void TextAttribute::SetUnderline(bool isUnderlined) noexcept
 {
-    WI_UpdateFlag(_extendedAttrs, ExtendedAttributes::Underlined, isUnderlined);
+    // TODO:GH#2915 Treat underline separately from LVB_UNDERSCORE
+    WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_UNDERSCORE, isUnderlined);
 }

-void TextAttribute::SetOverlined(bool isOverlined) noexcept
+void TextAttribute::SetOverline(bool isOverlined) noexcept
 {
    WI_UpdateFlag(_wAttrLegacy, COMMON_LVB_GRID_HORIZONTAL, isOverlined);
 }
--- a/src/buffer/out/TextAttribute.hpp
+++ b/src/buffer/out/TextAttribute.hpp
@@ -63,7 +63,7 @@ public:
    static TextAttribute StripErroneousVT16VersionsOfLegacyDefaults(const TextAttribute& attribute) noexcept;
    WORD GetLegacyAttributes() const noexcept;

-    std::pair<COLORREF, COLORREF> CalculateRgbColors(const gsl::span<const COLORREF> colorTable,
+    std::pair<COLORREF, COLORREF> CalculateRgbColors(const std::basic_string_view<COLORREF> colorTable,
                                                     const COLORREF defaultFgColor,
                                                     const COLORREF defaultBgColor,
                                                     const bool reverseScreenMode = false) const noexcept;
@@ -100,12 +100,12 @@ public:

    void SetBold(bool isBold) noexcept;
    void SetFaint(bool isFaint) noexcept;
-    void SetItalic(bool isItalic) noexcept;
+    void SetItalics(bool isItalic) noexcept;
    void SetBlinking(bool isBlinking) noexcept;
    void SetInvisible(bool isInvisible) noexcept;
    void SetCrossedOut(bool isCrossedOut) noexcept;
-    void SetUnderlined(bool isUnderlined) noexcept;
-    void SetOverlined(bool isOverlined) noexcept;
+    void SetUnderline(bool isUnderlined) noexcept;
+    void SetOverline(bool isOverlined) noexcept;
    void SetReverseVideo(bool isReversed) noexcept;

    ExtendedAttributes GetExtendedAttributes() const noexcept;
@@ -218,12 +218,11 @@ namespace WEX
            static WEX::Common::NoThrowString ToString(const TextAttribute& attr)
            {
                return WEX::Common::NoThrowString().Format(
-                    L"{FG:%s,BG:%s,bold:%d,wLegacy:(0x%04x),ext:(0x%02x)}",
+                    L"{FG:%s,BG:%s,bold:%d,wLegacy:(0x%04x)}",
                    VerifyOutputTraits<TextColor>::ToString(attr._foreground).GetBuffer(),
                    VerifyOutputTraits<TextColor>::ToString(attr._background).GetBuffer(),
                    attr.IsBold(),
-                    attr._wAttrLegacy,
-                    static_cast<DWORD>(attr._extendedAttrs));
+                    attr._wAttrLegacy);
            }
        };
    }
--- a/src/buffer/out/TextColor.cpp
+++ b/src/buffer/out/TextColor.cpp
@@ -138,7 +138,7 @@ void TextColor::SetDefault() noexcept
 // - brighten: if true, we'll brighten a dark color table index.
 // Return Value:
 // - a COLORREF containing the real value of this TextColor.
-COLORREF TextColor::GetColor(gsl::span<const COLORREF> colorTable,
+COLORREF TextColor::GetColor(std::basic_string_view<COLORREF> colorTable,
                             const COLORREF defaultColor,
                             bool brighten) const noexcept
 {
@@ -158,9 +158,9 @@ COLORREF TextColor::GetColor(gsl::span<const COLORREF> colorTable,
            // If we find a match, return instead the bright version of this color
            for (size_t i = 0; i < 8; i++)
            {
-                if (til::at(colorTable, i) == defaultColor)
+                if (colorTable.at(i) == defaultColor)
                {
-                    return til::at(colorTable, i + 8);
+                    return colorTable.at(i + 8);
                }
            }
        }
@@ -173,11 +173,11 @@ COLORREF TextColor::GetColor(gsl::span<const COLORREF> colorTable,
    }
    else if (IsIndex16() && brighten)
    {
-        return til::at(colorTable, _index | 8);
+        return colorTable.at(_index | 8);
    }
    else
    {
-        return til::at(colorTable, _index);
+        return colorTable.at(_index);
    }
 }

--- a/src/buffer/out/TextColor.h
+++ b/src/buffer/out/TextColor.h
@@ -88,7 +88,7 @@ public:
    void SetIndex(const BYTE index, const bool isIndex256) noexcept;
    void SetDefault() noexcept;

-    COLORREF GetColor(gsl::span<const COLORREF> colorTable,
+    COLORREF GetColor(std::basic_string_view<COLORREF> colorTable,
                      const COLORREF defaultColor,
                      const bool brighten = false) const noexcept;

--- a/src/buffer/out/textBuffer.cpp
+++ b/src/buffer/out/textBuffer.cpp
@@ -787,7 +787,7 @@ const Cursor& TextBuffer::GetCursor() const noexcept
    return _currentAttributes;
 }

-void TextBuffer::SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept
+void TextBuffer::SetCurrentAttributes(const TextAttribute currentAttributes) noexcept
 {
    _currentAttributes = currentAttributes;
 }
--- a/src/buffer/out/textBuffer.hpp
+++ b/src/buffer/out/textBuffer.hpp
@@ -118,7 +118,7 @@ public:

    [[nodiscard]] TextAttribute GetCurrentAttributes() const noexcept;

-    void SetCurrentAttributes(const TextAttribute& currentAttributes) noexcept;
+    void SetCurrentAttributes(const TextAttribute currentAttributes) noexcept;

    void Reset();

--- a/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp
+++ b/src/buffer/out/ut_textbuffer/TextAttributeTests.cpp
@@ -27,7 +27,7 @@ class TextAttributeTests
    COLORREF _colorTable[COLOR_TABLE_SIZE];
    COLORREF _defaultFg = RGB(1, 2, 3);
    COLORREF _defaultBg = RGB(4, 5, 6);
-    gsl::span<const COLORREF> _GetTableView();
+    std::basic_string_view<COLORREF> _GetTableView();
 };

 bool TextAttributeTests::ClassSetup()
@@ -51,9 +51,9 @@ bool TextAttributeTests::ClassSetup()
    return true;
 }

-gsl::span<const COLORREF> TextAttributeTests::_GetTableView()
+std::basic_string_view<COLORREF> TextAttributeTests::_GetTableView()
 {
-    return gsl::span<const COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
+    return std::basic_string_view<COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
 }

 void TextAttributeTests::TestRoundtripLegacy()
--- a/src/buffer/out/ut_textbuffer/TextColorTests.cpp
+++ b/src/buffer/out/ut_textbuffer/TextColorTests.cpp
@@ -27,7 +27,7 @@ class TextColorTests
    COLORREF _colorTable[COLOR_TABLE_SIZE];
    COLORREF _defaultFg = RGB(1, 2, 3);
    COLORREF _defaultBg = RGB(4, 5, 6);
-    gsl::span<const COLORREF> _GetTableView();
+    std::basic_string_view<COLORREF> _GetTableView();
 };

 bool TextColorTests::ClassSetup()
@@ -51,9 +51,9 @@ bool TextColorTests::ClassSetup()
    return true;
 }

-gsl::span<const COLORREF> TextColorTests::_GetTableView()
+std::basic_string_view<COLORREF> TextColorTests::_GetTableView()
 {
-    return gsl::span<const COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
+    return std::basic_string_view<COLORREF>(&_colorTable[0], COLOR_TABLE_SIZE);
 }

 void TextColorTests::TestDefaultColor()
--- a/src/cascadia/LocalTests_TerminalApp/CommandTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/CommandTests.cpp
@@ -10,7 +10,7 @@
 using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -147,8 +147,10 @@ namespace TerminalAppLocalTests
            { "name": "command0", "command": { "action": "splitPane", "split": null } },
            { "name": "command1", "command": { "action": "splitPane", "split": "vertical" } },
            { "name": "command2", "command": { "action": "splitPane", "split": "horizontal" } },
+            { "name": "command3", "command": { "action": "splitPane", "split": "none" } },
            { "name": "command4", "command": { "action": "splitPane" } },
-            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } }
+            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } },
+            { "name": "command6", "command": { "action": "splitPane", "split": "foo" } }
        ])" };

        const auto commands0Json = VerifyParseSucceeded(commands0String);
@@ -157,7 +159,7 @@ namespace TerminalAppLocalTests
        VERIFY_ARE_EQUAL(0u, commands.size());
        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
        VERIFY_ARE_EQUAL(0u, warnings.size());
-        VERIFY_ARE_EQUAL(5u, commands.size());
+        VERIFY_ARE_EQUAL(7u, commands.size());

        {
            auto command = commands.at(L"command0");
@@ -189,6 +191,16 @@ namespace TerminalAppLocalTests
            // Verify the args have the expected value
            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
        }
+        {
+            auto command = commands.at(L"command3");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+        }
        {
            auto command = commands.at(L"command4");
            VERIFY_IS_NOT_NULL(command);
@@ -209,6 +221,16 @@ namespace TerminalAppLocalTests
            // Verify the args have the expected value
            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
        }
+        {
+            auto command = commands.at(L"command6");
+            VERIFY_IS_NOT_NULL(command);
+            VERIFY_IS_NOT_NULL(command.Action());
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, command.Action().Action());
+            const auto& realArgs = command.Action().Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+        }
    }
    void CommandTests::TestResourceKeyName()
    {
--- a/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp
@@ -4,9 +4,7 @@
 #include "pch.h"
 #include <WexTestClass.h>

-#include "../TerminalApp/TerminalPage.h"
 #include "../TerminalApp/AppCommandlineArgs.h"
-#include "../TerminalApp/ActionArgs.h"

 using namespace WEX::Logging;
 using namespace WEX::Common;
@@ -54,10 +52,6 @@ namespace TerminalAppLocalTests

        TEST_METHOD(CheckTypos);

-        TEST_METHOD(TestSimpleExecuteCommandlineAction);
-        TEST_METHOD(TestMultipleCommandExecuteCommandlineAction);
-        TEST_METHOD(TestInvalidExecuteCommandlineAction);
-
    private:
        void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
                                      const size_t expectedSubcommands,
@@ -1073,66 +1067,4 @@ namespace TerminalAppLocalTests
            VERIFY_ARE_EQUAL(L"C:\\", myArgs.TerminalArgs().StartingDirectory());
        }
    }
-
-    void CommandlineTest::TestSimpleExecuteCommandlineAction()
-    {
-        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());
-        VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-        auto myArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-        VERIFY_IS_NOT_NULL(myArgs);
-        VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
-        VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
-    }
-
-    void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
-    {
-        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);
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
-        }
-        {
-            auto actionAndArgs = actions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().ProfileIndex() == nullptr);
-            VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
-        }
-    }
-
-    void CommandlineTest::TestInvalidExecuteCommandlineAction()
-    {
-        auto args = winrt::make_self<implementation::ExecuteCommandlineArgs>();
-        // -H and -V cannot be combined.
-        args->Commandline(L"split-pane -H -V");
-        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(*args);
-        VERIFY_ARE_EQUAL(0u, actions.size());
-    }
 }
--- a/src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/KeyBindingsTests.cpp
@@ -11,7 +11,7 @@
 using namespace Microsoft::Console;
 using namespace TerminalApp;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
@@ -323,8 +323,10 @@ namespace TerminalAppLocalTests
            { "keys": ["ctrl+c"], "command": { "action": "splitPane", "split": null } },
            { "keys": ["ctrl+d"], "command": { "action": "splitPane", "split": "vertical" } },
            { "keys": ["ctrl+e"], "command": { "action": "splitPane", "split": "horizontal" } },
+            { "keys": ["ctrl+f"], "command": { "action": "splitPane", "split": "none" } },
            { "keys": ["ctrl+g"], "command": { "action": "splitPane" } },
-            { "keys": ["ctrl+h"], "command": { "action": "splitPane", "split": "auto" } }
+            { "keys": ["ctrl+h"], "command": { "action": "splitPane", "split": "auto" } },
+            { "keys": ["ctrl+i"], "command": { "action": "splitPane", "split": "foo" } }
        ])" };

        const auto bindings0Json = VerifyParseSucceeded(bindings0String);
@@ -333,7 +335,7 @@ namespace TerminalAppLocalTests
        VERIFY_IS_NOT_NULL(appKeyBindings);
        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(5u, appKeyBindings->_keyShortcuts.size());
+        VERIFY_ARE_EQUAL(7u, appKeyBindings->_keyShortcuts.size());

        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
@@ -362,6 +364,15 @@ namespace TerminalAppLocalTests
            // Verify the args have the expected value
            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Horizontal, realArgs.SplitStyle());
        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, 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(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
@@ -380,6 +391,15 @@ namespace TerminalAppLocalTests
            // Verify the args have the expected value
            VERIFY_ARE_EQUAL(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('I') };
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, 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(winrt::TerminalApp::SplitState::Automatic, realArgs.SplitStyle());
+        }
    }

    void KeyBindingsTests::TestSetTabColorArgs()
@@ -387,6 +407,7 @@ namespace TerminalAppLocalTests
        const std::string bindings0String{ R"([
            { "keys": ["ctrl+c"], "command": { "action": "setTabColor", "color": null } },
            { "keys": ["ctrl+d"], "command": { "action": "setTabColor", "color": "#123456" } },
+            { "keys": ["ctrl+e"], "command": { "action": "setTabColor", "color": "thisStringObviouslyWontWork" } },
            { "keys": ["ctrl+f"], "command": "setTabColor" },
        ])" };

@@ -396,7 +417,7 @@ namespace TerminalAppLocalTests
        VERIFY_IS_NOT_NULL(appKeyBindings);
        VERIFY_ARE_EQUAL(0u, appKeyBindings->_keyShortcuts.size());
        appKeyBindings->LayerJson(bindings0Json);
-        VERIFY_ARE_EQUAL(3u, appKeyBindings->_keyShortcuts.size());
+        VERIFY_ARE_EQUAL(4u, appKeyBindings->_keyShortcuts.size());

        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
@@ -418,6 +439,15 @@ namespace TerminalAppLocalTests
            // Remember that COLORREFs are actually BBGGRR order, while the string is in #RRGGBB order
            VERIFY_ARE_EQUAL(static_cast<uint32_t>(til::color(0x563412)), realArgs.TabColor().Value());
        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
+            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::SetTabColor, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<SetTabColorArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_IS_NULL(realArgs.TabColor());
+        }
        {
            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
            auto actionAndArgs = TestUtils::GetActionAndArgs(*appKeyBindings, kc);
--- a/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
@@ -16,7 +16,7 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;

 namespace TerminalAppLocalTests
 {
@@ -76,8 +76,6 @@ namespace TerminalAppLocalTests

        TEST_METHOD(ValidateKeybindingsWarnings);

-        TEST_METHOD(ValidateExecuteCommandlineWarning);
-
        TEST_METHOD(ValidateLegacyGlobalsWarning);

        TEST_METHOD(TestTrailingCommas);
@@ -93,7 +91,7 @@ namespace TerminalAppLocalTests

    void SettingsTests::TryCreateWinRTType()
    {
-        TerminalSettings settings;
+        winrt::Microsoft::Terminal::Settings::TerminalSettings settings;
        VERIFY_IS_NOT_NULL(settings);
        auto oldFontSize = settings.FontSize();
        settings.FontSize(oldFontSize + 5);
@@ -1433,6 +1431,10 @@ namespace TerminalAppLocalTests
                {
                    "name": "profile3",
                    "closeOnExit": null
+                },
+                {
+                    "name": "profile4",
+                    "closeOnExit": { "clearly": "not a string" }
                }
            ]
        })" };
@@ -1447,6 +1449,7 @@ namespace TerminalAppLocalTests

        // Unknown modes parse as "Graceful"
        VERIFY_ARE_EQUAL(CloseOnExitMode::Graceful, settings._profiles[3].GetCloseOnExitMode());
+        VERIFY_ARE_EQUAL(CloseOnExitMode::Graceful, settings._profiles[4].GetCloseOnExitMode());
    }
    void SettingsTests::TestCloseOnExitCompatibilityShim()
    {
@@ -2256,57 +2259,6 @@ namespace TerminalAppLocalTests
        VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(3));
    }

-    void SettingsTests::ValidateExecuteCommandlineWarning()
-    {
-        Log::Comment(L"This test is affected by GH#6949, so we're just skipping it for now.");
-        Log::Result(WEX::Logging::TestResults::Skipped);
-        return;
-
-        // const std::string badSettings{ R"(
-        // {
-        //     "defaultProfile": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-        //     "profiles": [
-        //         {
-        //             "name" : "profile0",
-        //             "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}"
-        //         },
-        //         {
-        //             "name" : "profile1",
-        //             "guid": "{6239a42c-3333-49a3-80bd-e8fdd045185c}"
-        //         }
-        //     ],
-        //     "keybindings": [
-        //         { "name":null, "command": { "action": "wt" }, "keys": [ "ctrl+a" ] },
-        //         { "name":null, "command": { "action": "wt", "commandline":"" }, "keys": [ "ctrl+b" ] },
-        //         { "name":null, "command": { "action": "wt", "commandline":null }, "keys": [ "ctrl+c" ] }
-        //     ]
-        // })" };
-
-        // const auto settingsObject = VerifyParseSucceeded(badSettings);
-
-        // auto settings = CascadiaSettings::FromJson(settingsObject);
-
-        // VERIFY_ARE_EQUAL(0u, settings->_globals._keybindings->_keyShortcuts.size());
-
-        // for (const auto& warning : settings->_globals._keybindingsWarnings)
-        // {
-        //     Log::Comment(NoThrowString().Format(
-        //         L"warning:%d", warning));
-        // }
-        // VERIFY_ARE_EQUAL(3u, settings->_globals._keybindingsWarnings.size());
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_globals._keybindingsWarnings.at(0));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_globals._keybindingsWarnings.at(1));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_globals._keybindingsWarnings.at(2));
-
-        // settings->_ValidateKeybindings();
-
-        // VERIFY_ARE_EQUAL(4u, settings->_warnings.size());
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::AtLeastOneKeybindingWarning, settings->_warnings.at(0));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(1));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(2));
-        // VERIFY_ARE_EQUAL(::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter, settings->_warnings.at(3));
-    }
-
    void SettingsTests::ValidateLegacyGlobalsWarning()
    {
        const std::string badSettings{ R"(
--- a/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
+++ b/src/cascadia/LocalTests_TerminalApp/TabTests.cpp
@@ -84,7 +84,7 @@ namespace TerminalAppLocalTests
    {
        // Verify we can create a WinRT type we authored
        // Just creating it is enough to know that everything is working.
-        TerminalSettings settings;
+        winrt::Microsoft::Terminal::Settings::TerminalSettings settings;
        VERIFY_IS_NOT_NULL(settings);
        auto oldFontSize = settings.FontSize();
        settings.FontSize(oldFontSize + 5);
@@ -140,7 +140,7 @@ namespace TerminalAppLocalTests
            // 4. one of our types that uses MUX/Xaml in this dll (Tab).
            // Just creating all of them is enough to know that everything is working.
            const auto profileGuid{ Utils::CreateGuid() };
-            TerminalSettings settings{};
+            winrt::Microsoft::Terminal::Settings::TerminalSettings settings{};
            VERIFY_IS_NOT_NULL(settings);
            winrt::Microsoft::Terminal::TerminalConnection::EchoConnection conn{};
            VERIFY_IS_NOT_NULL(conn);
--- a/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj
@@ -79,6 +79,7 @@

    <!-- If you don't reference these projects here, the
    _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettings\TerminalSettings.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj" />
--- a/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
+++ b/src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj
@@ -45,11 +45,11 @@
    "taef.png" is actually in the package. taef.png will get copied to the
    OutputPath when taef is run, but if this isn't set to false, then the CI
    will try and make sure taef.png is in the OutputPath at build time.-->
-
+  
  <PropertyGroup Label="UserMacros">
    <GenerateAppxPackageOnBuild>false</GenerateAppxPackageOnBuild>
  </PropertyGroup>
-
+  
  <ItemDefinitionGroup>
    <ClCompile>
      <DisableSpecificWarnings>4453;%(DisableSpecificWarnings)</DisableSpecificWarnings>
@@ -94,6 +94,7 @@
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj">
      <Project>{CA5CAD1A-C46D-4588-B1C0-40F31AE9100B}</Project>
    </ProjectReference>
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettings\TerminalSettings.vcxproj" />
    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />

    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\TerminalApp.vcxproj">
@@ -113,7 +114,7 @@

  <ItemGroup>
    <Reference Include="Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore">
-      <HintPath>$(OpenConsoleDir)\packages\Taef.Redist.Wlk.10.57.200731005-develop\lib\Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore.winmd</HintPath>
+      <HintPath>$(OpenConsoleDir)\packages\Taef.Redist.Wlk.10.51.200127004\lib\Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore.winmd</HintPath>
      <IsWinMDFile>true</IsWinMDFile>

      <!-- This path is _relative to the .winmd_ -->
--- a/src/cascadia/LocalTests_TerminalApp/TestUtils.h
+++ b/src/cascadia/LocalTests_TerminalApp/TestUtils.h
@@ -24,18 +24,18 @@ public:
    // Return Value:
    // - The ActionAndArgs bound to the given key, or nullptr if nothing is bound to it.
    static const winrt::TerminalApp::ActionAndArgs GetActionAndArgs(const winrt::TerminalApp::implementation::AppKeyBindings& bindings,
-                                                                    const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
+                                                                    const winrt::Microsoft::Terminal::Settings::KeyChord& kc)
    {
        std::wstring buffer{ L"" };
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Ctrl))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Settings::KeyModifiers::Ctrl))
        {
            buffer += L"Ctrl+";
        }
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Shift))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Settings::KeyModifiers::Shift))
        {
            buffer += L"Shift+";
        }
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Alt))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Settings::KeyModifiers::Alt))
        {
            buffer += L"Alt+";
        }
--- a/src/cascadia/PublicTerminalCore/HwndTerminal.cpp
+++ b/src/cascadia/PublicTerminalCore/HwndTerminal.cpp
@@ -21,26 +21,7 @@ static constexpr bool _IsMouseMessage(UINT uMsg)
    return uMsg == WM_LBUTTONDOWN || uMsg == WM_LBUTTONUP || uMsg == WM_LBUTTONDBLCLK ||
           uMsg == WM_MBUTTONDOWN || uMsg == WM_MBUTTONUP || uMsg == WM_MBUTTONDBLCLK ||
           uMsg == WM_RBUTTONDOWN || uMsg == WM_RBUTTONUP || uMsg == WM_RBUTTONDBLCLK ||
-           uMsg == WM_MOUSEMOVE || uMsg == WM_MOUSEWHEEL || uMsg == WM_MOUSEHWHEEL;
-}
-
-// Helper static function to ensure that all ambiguous-width glyphs are reported as narrow.
-// See microsoft/terminal#2066 for more info.
-static bool _IsGlyphWideForceNarrowFallback(const std::wstring_view /* glyph */) noexcept
-{
-    return false; // glyph is not wide.
-}
-
-static bool _EnsureStaticInitialization()
-{
-    // use C++11 magic statics to make sure we only do this once.
-    static bool initialized = []() {
-        // *** THIS IS A SINGLETON ***
-        SetGlyphWidthFallback(_IsGlyphWideForceNarrowFallback);
-
-        return true;
-    }();
-    return initialized;
+           uMsg == WM_MOUSEMOVE || uMsg == WM_MOUSEWHEEL;
 }

 LRESULT CALLBACK HwndTerminal::HwndTerminalWndProc(
@@ -55,29 +36,10 @@ try

    if (terminal)
    {
-        if (_IsMouseMessage(uMsg))
+        if (_IsMouseMessage(uMsg) && terminal->_CanSendVTMouseInput())
        {
-            if (terminal->_CanSendVTMouseInput() && terminal->_SendMouseEvent(uMsg, wParam, lParam))
+            if (terminal->_SendMouseEvent(uMsg, wParam, lParam))
            {
-                // GH#6401: Capturing the mouse ensures that we get drag/release events
-                // even if the user moves outside the window.
-                // _SendMouseEvent returns false if the terminal's not in VT mode, so we'll
-                // fall through to release the capture.
-                switch (uMsg)
-                {
-                case WM_LBUTTONDOWN:
-                case WM_MBUTTONDOWN:
-                case WM_RBUTTONDOWN:
-                    SetCapture(hwnd);
-                    break;
-                case WM_LBUTTONUP:
-                case WM_MBUTTONUP:
-                case WM_RBUTTONUP:
-                    ReleaseCapture();
-                    break;
-                }
-
-                // Suppress all mouse events that made it into the terminal.
                return 0;
            }
        }
@@ -95,10 +57,6 @@ try
            return 0;
        case WM_LBUTTONUP:
            terminal->_singleClickTouchdownPos = std::nullopt;
-            [[fallthrough]];
-        case WM_MBUTTONUP:
-        case WM_RBUTTONUP:
-            ReleaseCapture();
            break;
        case WM_MOUSEMOVE:
            if (WI_IsFlagSet(wParam, MK_LBUTTON))
@@ -114,7 +72,7 @@ try
                {
                    const auto bufferData = terminal->_terminal->RetrieveSelectedTextFromBuffer(false);
                    LOG_IF_FAILED(terminal->_CopyTextToSystemClipboard(bufferData, true));
-                    TerminalClearSelection(terminal);
+                    terminal->_terminal->ClearSelection();
                }
                CATCH_LOG();
            }
@@ -123,11 +81,6 @@ try
                terminal->_PasteTextFromClipboard();
            }
            return 0;
-        case WM_DESTROY:
-            // Release Terminal's hwnd so Teardown doesn't try to destroy it again
-            terminal->_hwnd.release();
-            terminal->Teardown();
-            return 0;
        }
    }
    return DefWindowProc(hwnd, uMsg, wParam, lParam);
@@ -161,16 +114,14 @@ static bool RegisterTermClass(HINSTANCE hInstance) noexcept
 }

 HwndTerminal::HwndTerminal(HWND parentHwnd) :
-    _desiredFont{ L"Consolas", 0, DEFAULT_FONT_WEIGHT, { 0, 14 }, CP_UTF8 },
-    _actualFont{ L"Consolas", 0, DEFAULT_FONT_WEIGHT, { 0, 14 }, CP_UTF8, false },
+    _desiredFont{ L"Consolas", 0, 10, { 0, 14 }, CP_UTF8 },
+    _actualFont{ L"Consolas", 0, 10, { 0, 14 }, CP_UTF8, false },
    _uiaProvider{ nullptr },
    _uiaProviderInitialized{ false },
    _currentDpi{ USER_DEFAULT_SCREEN_DPI },
    _pfnWriteCallback{ nullptr },
    _multiClickTime{ 500 } // this will be overwritten by the windows system double-click time
 {
-    _EnsureStaticInitialization();
-
    HINSTANCE hInstance = wil::GetModuleInstanceHandle();

    if (RegisterTermClass(hInstance))
@@ -197,11 +148,6 @@ HwndTerminal::HwndTerminal(HWND parentHwnd) :
    }
 }

-HwndTerminal::~HwndTerminal()
-{
-    Teardown();
-}
-
 HRESULT HwndTerminal::Initialize()
 {
    _terminal = std::make_unique<::Microsoft::Terminal::Core::Terminal>();
@@ -216,6 +162,9 @@ HRESULT HwndTerminal::Initialize()
    RETURN_IF_FAILED(dxEngine->Enable());
    _renderer->AddRenderEngine(dxEngine.get());

+    const auto pfn = std::bind(&::Microsoft::Console::Render::Renderer::IsGlyphWideByFont, _renderer.get(), std::placeholders::_1);
+    SetGlyphWidthFallback(pfn);
+
    _UpdateFont(USER_DEFAULT_SCREEN_DPI);
    RECT windowRect;
    GetWindowRect(_hwnd.get(), &windowRect);
@@ -232,8 +181,8 @@ HRESULT HwndTerminal::Initialize()
    _terminal->SetBackgroundCallback([](auto) {});

    _terminal->Create(COORD{ 80, 25 }, 1000, *_renderer);
-    _terminal->SetDefaultBackground(RGB(12, 12, 12));
-    _terminal->SetDefaultForeground(RGB(204, 204, 204));
+    _terminal->SetDefaultBackground(RGB(5, 27, 80));
+    _terminal->SetDefaultForeground(RGB(255, 255, 255));
    _terminal->SetWriteInputCallback([=](std::wstring & input) noexcept { _WriteTextToConnection(input); });
    localPointerToThread->EnablePainting();

@@ -242,33 +191,6 @@ HRESULT HwndTerminal::Initialize()
    return S_OK;
 }

-void HwndTerminal::Teardown() noexcept
-try
-{
-    // As a rule, detach resources from the Terminal before shutting them down.
-    // This ensures that teardown is reentrant.
-
-    // Shut down the renderer (and therefore the thread) before we implode
-    if (auto localRenderEngine{ std::exchange(_renderEngine, nullptr) })
-    {
-        if (auto localRenderer{ std::exchange(_renderer, nullptr) })
-        {
-            localRenderer->TriggerTeardown();
-            // renderer is destroyed
-        }
-        // renderEngine is destroyed
-    }
-
-    if (auto localHwnd{ _hwnd.release() })
-    {
-        // If we're being called through WM_DESTROY, we won't get here (hwnd is already released)
-        // If we're not, we may end up in Teardown _again_... but by the time we do, all other
-        // resources have been released and will not be released again.
-        DestroyWindow(localHwnd);
-    }
-}
-CATCH_LOG();
-
 void HwndTerminal::RegisterScrollCallback(std::function<void(int, int, int)> callback)
 {
    _terminal->SetScrollPositionChangedCallback(callback);
@@ -545,21 +467,11 @@ try
 }
 CATCH_RETURN();

-void HwndTerminal::_ClearSelection() noexcept
-try
-{
-    auto lock{ _terminal->LockForWriting() };
-    _terminal->ClearSelection();
-    _renderer->TriggerSelection();
-}
-CATCH_LOG();
-
 void _stdcall TerminalClearSelection(void* terminal)
 {
-    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
-    publicTerminal->_ClearSelection();
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
+    publicTerminal->_terminal->ClearSelection();
 }
-
 bool _stdcall TerminalIsSelectionActive(void* terminal)
 {
    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
@@ -570,10 +482,9 @@ bool _stdcall TerminalIsSelectionActive(void* terminal)
 // Returns the selected text in the terminal.
 const wchar_t* _stdcall TerminalGetSelection(void* terminal)
 {
-    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
+    const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);

    const auto bufferData = publicTerminal->_terminal->RetrieveSelectedTextFromBuffer(false);
-    publicTerminal->_ClearSelection();

    // convert text: vector<string> --> string
    std::wstring selectedText;
@@ -583,6 +494,8 @@ const wchar_t* _stdcall TerminalGetSelection(void* terminal)
    }

    auto returnText = wil::make_cotaskmem_string_nothrow(selectedText.c_str());
+    TerminalClearSelection(terminal);
+
    return returnText.release();
 }

@@ -628,21 +541,16 @@ bool HwndTerminal::_CanSendVTMouseInput() const noexcept
 bool HwndTerminal::_SendMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam) noexcept
 try
 {
-    til::point cursorPosition{
+    const til::point cursorPosition{
        GET_X_LPARAM(lParam),
        GET_Y_LPARAM(lParam),
    };

    const til::size fontSize{ this->_actualFont.GetSize() };
    short wheelDelta{ 0 };
-    if (uMsg == WM_MOUSEWHEEL || uMsg == WM_MOUSEHWHEEL)
+    if (uMsg == WM_MOUSEWHEEL)
    {
        wheelDelta = HIWORD(wParam);
-
-        // If it's a *WHEEL event, it's in screen coordinates, not window (?!)
-        POINT coordsToTransform = cursorPosition;
-        ScreenToClient(_hwnd.get(), &coordsToTransform);
-        cursorPosition = coordsToTransform;
    }

    return _terminal->SendMouseEvent(cursorPosition / fontSize, uMsg, getControlKeyState(), wheelDelta);
@@ -653,24 +561,20 @@ catch (...)
    return false;
 }

-void HwndTerminal::_SendKeyEvent(WORD vkey, WORD scanCode, WORD flags, bool keyDown) noexcept
+void HwndTerminal::_SendKeyEvent(WORD vkey, WORD scanCode, bool keyDown) noexcept
 try
 {
-    auto modifiers = getControlKeyState();
-    if (WI_IsFlagSet(flags, ENHANCED_KEY))
-    {
-        modifiers |= ControlKeyStates::EnhancedKey;
-    }
-    _terminal->SendKeyEvent(vkey, scanCode, modifiers, keyDown);
+    const auto flags = getControlKeyState();
+    _terminal->SendKeyEvent(vkey, scanCode, flags, keyDown);
 }
 CATCH_LOG();

-void HwndTerminal::_SendCharEvent(wchar_t ch, WORD scanCode, WORD flags) noexcept
+void HwndTerminal::_SendCharEvent(wchar_t ch, WORD scanCode) noexcept
 try
 {
    if (_terminal->IsSelectionActive())
    {
-        _ClearSelection();
+        _terminal->ClearSelection();
        if (ch == UNICODE_ESC)
        {
            // ESC should clear any selection before it triggers input.
@@ -685,25 +589,21 @@ try
        return;
    }

-    auto modifiers = getControlKeyState();
-    if (WI_IsFlagSet(flags, ENHANCED_KEY))
-    {
-        modifiers |= ControlKeyStates::EnhancedKey;
-    }
-    _terminal->SendCharEvent(ch, scanCode, modifiers);
+    const auto flags = getControlKeyState();
+    _terminal->SendCharEvent(ch, scanCode, flags);
 }
 CATCH_LOG();

-void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown)
+void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, bool keyDown)
 {
    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
-    publicTerminal->_SendKeyEvent(vkey, scanCode, flags, keyDown);
+    publicTerminal->_SendKeyEvent(vkey, scanCode, keyDown);
 }

-void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode, WORD flags)
+void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode)
 {
    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
-    publicTerminal->_SendCharEvent(ch, scanCode, flags);
+    publicTerminal->_SendCharEvent(ch, scanCode);
 }

 void _stdcall DestroyTerminal(void* terminal)
@@ -732,7 +632,7 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font

    publicTerminal->_terminal->SetCursorStyle(theme.CursorStyle);

-    publicTerminal->_desiredFont = { fontFamily, 0, DEFAULT_FONT_WEIGHT, { 0, fontSize }, CP_UTF8 };
+    publicTerminal->_desiredFont = { fontFamily, 0, 10, { 0, fontSize }, CP_UTF8 };
    publicTerminal->_UpdateFont(newDpi);

    // When the font changes the terminal dimensions need to be recalculated since the available row and column
--- a/src/cascadia/PublicTerminalCore/HwndTerminal.hpp
+++ b/src/cascadia/PublicTerminalCore/HwndTerminal.hpp
@@ -34,8 +34,8 @@ __declspec(dllexport) bool _stdcall TerminalIsSelectionActive(void* terminal);
 __declspec(dllexport) void _stdcall DestroyTerminal(void* terminal);
 __declspec(dllexport) void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, short fontSize, int newDpi);
 __declspec(dllexport) void _stdcall TerminalRegisterWriteCallback(void* terminal, const void __stdcall callback(wchar_t*));
-__declspec(dllexport) void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown);
-__declspec(dllexport) void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD flags, WORD scanCode);
+__declspec(dllexport) void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, bool keyDown);
+__declspec(dllexport) void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode);
 __declspec(dllexport) void _stdcall TerminalBlinkCursor(void* terminal);
 __declspec(dllexport) void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible);
 __declspec(dllexport) void _stdcall TerminalSetFocus(void* terminal);
@@ -51,10 +51,9 @@ public:
    HwndTerminal(HwndTerminal&&) = default;
    HwndTerminal& operator=(const HwndTerminal&) = default;
    HwndTerminal& operator=(HwndTerminal&&) = default;
-    ~HwndTerminal();
+    ~HwndTerminal() = default;

    HRESULT Initialize();
-    void Teardown() noexcept;
    void SendOutput(std::wstring_view data);
    HRESULT Refresh(const SIZE windowSize, _Out_ COORD* dimensions);
    void RegisterScrollCallback(std::function<void(int, int, int)> callback);
@@ -93,8 +92,8 @@ private:
    friend void _stdcall TerminalClearSelection(void* terminal);
    friend const wchar_t* _stdcall TerminalGetSelection(void* terminal);
    friend bool _stdcall TerminalIsSelectionActive(void* terminal);
-    friend void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown);
-    friend void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode, WORD flags);
+    friend void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, bool keyDown);
+    friend void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode);
    friend void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR fontFamily, short fontSize, int newDpi);
    friend void _stdcall TerminalBlinkCursor(void* terminal);
    friend void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible);
@@ -113,13 +112,11 @@ private:
    HRESULT _MoveSelection(LPARAM lParam) noexcept;
    IRawElementProviderSimple* _GetUiaProvider() noexcept;

-    void _ClearSelection() noexcept;
-
    bool _CanSendVTMouseInput() const noexcept;
    bool _SendMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam) noexcept;

-    void _SendKeyEvent(WORD vkey, WORD scanCode, WORD flags, bool keyDown) noexcept;
-    void _SendCharEvent(wchar_t ch, WORD scanCode, WORD flags) noexcept;
+    void _SendKeyEvent(WORD vkey, WORD scanCode, bool keyDown) noexcept;
+    void _SendCharEvent(wchar_t ch, WORD scanCode) noexcept;

    // Inherited via IControlAccessibilityInfo
    COORD GetFontSize() const override;
--- a/src/cascadia/TerminalApp/lib/ActionAndArgs.cpp
+++ b/src/cascadia/TerminalApp/lib/ActionAndArgs.cpp
@@ -2,9 +2,6 @@
 #include "ActionArgs.h"
 #include "ActionAndArgs.h"
 #include "ActionAndArgs.g.cpp"
-
-#include "JsonUtils.h"
-
 #include <LibraryResources.h>

 static constexpr std::string_view CopyTextKey{ "copy" };
@@ -38,10 +35,7 @@ static constexpr std::string_view ToggleAlwaysOnTopKey{ "toggleAlwaysOnTop" };
 static constexpr std::string_view SetTabColorKey{ "setTabColor" };
 static constexpr std::string_view OpenTabColorPickerKey{ "openTabColorPicker" };
 static constexpr std::string_view RenameTabKey{ "renameTab" };
-static constexpr std::string_view ExecuteCommandlineKey{ "wt" };
 static constexpr std::string_view ToggleCommandPaletteKey{ "commandPalette" };
-static constexpr std::string_view CloseOtherTabsKey{ "closeOtherTabs" };
-static constexpr std::string_view CloseTabsAfterKey{ "closeTabsAfter" };

 static constexpr std::string_view ActionKey{ "action" };

@@ -50,8 +44,6 @@ static constexpr std::string_view UnboundKey{ "unbound" };

 namespace winrt::TerminalApp::implementation
 {
-    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.
    // HERE BE DRAGONS:
@@ -92,10 +84,7 @@ namespace winrt::TerminalApp::implementation
        { UnboundKey, ShortcutAction::Invalid },
        { FindKey, ShortcutAction::Find },
        { RenameTabKey, ShortcutAction::RenameTab },
-        { ExecuteCommandlineKey, ShortcutAction::ExecuteCommandline },
        { ToggleCommandPaletteKey, ShortcutAction::ToggleCommandPalette },
-        { CloseOtherTabsKey, ShortcutAction::CloseOtherTabs },
-        { CloseTabsAfterKey, ShortcutAction::CloseTabsAfter },
    };

    using ParseResult = std::tuple<IActionArgs, std::vector<::TerminalApp::SettingsLoadWarnings>>;
@@ -127,12 +116,6 @@ namespace winrt::TerminalApp::implementation

        { ShortcutAction::RenameTab, winrt::TerminalApp::implementation::RenameTabArgs::FromJson },

-        { ShortcutAction::ExecuteCommandline, winrt::TerminalApp::implementation::ExecuteCommandlineArgs::FromJson },
-
-        { ShortcutAction::CloseOtherTabs, winrt::TerminalApp::implementation::CloseOtherTabsArgs::FromJson },
-
-        { ShortcutAction::CloseTabsAfter, winrt::TerminalApp::implementation::CloseTabsAfterArgs::FromJson },
-
        { ShortcutAction::Invalid, nullptr },
    };

@@ -200,9 +183,11 @@ namespace winrt::TerminalApp::implementation
        }
        else if (json.isObject())
        {
-            if (const auto actionString{ JsonUtils::GetValueForKey<std::optional<std::string>>(json, ActionKey) })
+            const auto actionVal = json[JsonKey(ActionKey)];
+            if (actionVal.isString())
            {
-                action = GetActionFromString(*actionString);
+                auto actionString = actionVal.asString();
+                action = GetActionFromString(actionString);
                argsVal = json;
            }
        }
@@ -280,10 +265,7 @@ namespace winrt::TerminalApp::implementation
                { ShortcutAction::SetTabColor, RS_(L"ResetTabColorCommandKey") },
                { ShortcutAction::OpenTabColorPicker, RS_(L"OpenTabColorPickerCommandKey") },
                { ShortcutAction::RenameTab, RS_(L"ResetTabNameCommandKey") },
-                { ShortcutAction::ExecuteCommandline, RS_(L"ExecuteCommandlineCommandKey") },
                { ShortcutAction::ToggleCommandPalette, RS_(L"ToggleCommandPaletteCommandKey") },
-                { ShortcutAction::CloseOtherTabs, L"" }, // Intentionally omitted, must be generated by GenerateName
-                { ShortcutAction::CloseTabsAfter, L"" }, // Intentionally omitted, must be generated by GenerateName
            };
        }();

@@ -299,4 +281,5 @@ namespace winrt::TerminalApp::implementation
        const auto found = GeneratedActionNames.find(_Action);
        return found != GeneratedActionNames.end() ? found->second : L"";
    }
+
 }
--- a/src/cascadia/TerminalApp/lib/ActionAndArgs.h
+++ b/src/cascadia/TerminalApp/lib/ActionAndArgs.h
--- a/src/cascadia/TerminalApp/lib/ActionArgs.cpp
+++ b/src/cascadia/TerminalApp/lib/ActionArgs.cpp
@@ -17,7 +17,6 @@
 #include "OpenSettingsArgs.g.cpp"
 #include "SetTabColorArgs.g.cpp"
 #include "RenameTabArgs.g.cpp"
-#include "ExecuteCommandlineArgs.g.cpp"

 #include <LibraryResources.h>

@@ -259,34 +258,4 @@ namespace winrt::TerminalApp::implementation
        return RS_(L"ResetTabNameCommandKey");
    }

-    winrt::hstring ExecuteCommandlineArgs::GenerateName() const
-    {
-        // "Run commandline "{_Commandline}" in this window"
-        if (!_Commandline.empty())
-        {
-            return winrt::hstring{
-                fmt::format(std::wstring_view(RS_(L"ExecuteCommandlineCommandKey")),
-                            _Commandline.c_str())
-            };
-        }
-        return L"";
-    }
-
-    winrt::hstring CloseOtherTabsArgs::GenerateName() const
-    {
-        // "Close tabs other than index {0}"
-        return winrt::hstring{
-            fmt::format(std::wstring_view(RS_(L"CloseOtherTabsCommandKey")),
-                        _Index)
-        };
-    }
-
-    winrt::hstring CloseTabsAfterArgs::GenerateName() const
-    {
-        // "Close tabs after index {0}"
-        return winrt::hstring{
-            fmt::format(std::wstring_view(RS_(L"CloseTabsAfterCommandKey")),
-                        _Index)
-        };
-    }
 }
--- a/src/cascadia/TerminalApp/lib/ActionArgs.h
+++ b/src/cascadia/TerminalApp/lib/ActionArgs.h
@@ -17,17 +17,12 @@
 #include "OpenSettingsArgs.g.h"
 #include "SetTabColorArgs.g.h"
 #include "RenameTabArgs.g.h"
-#include "ExecuteCommandlineArgs.g.h"
-#include "CloseOtherTabsArgs.g.h"
-#include "CloseTabsAfterArgs.g.h"

 #include "../../cascadia/inc/cppwinrt_utils.h"
 #include "Utils.h"
 #include "JsonUtils.h"
 #include "TerminalWarnings.h"

-#include "TerminalSettingsSerializationHelpers.h"
-
 // Notes on defining ActionArgs and ActionEventArgs:
 // * All properties specific to an action should be defined as an ActionArgs
 //   class that implements IActionArgs
@@ -36,7 +31,6 @@

 namespace winrt::TerminalApp::implementation
 {
-    using namespace ::TerminalApp;
    using FromJsonResult = std::tuple<winrt::TerminalApp::IActionArgs, std::vector<::TerminalApp::SettingsLoadWarnings>>;

    struct ActionEventArgs : public ActionEventArgsT<ActionEventArgs>
@@ -79,11 +73,26 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<NewTerminalArgs>();
-            JsonUtils::GetValueForKey(json, CommandlineKey, args->_Commandline);
-            JsonUtils::GetValueForKey(json, StartingDirectoryKey, args->_StartingDirectory);
-            JsonUtils::GetValueForKey(json, TabTitleKey, args->_TabTitle);
-            JsonUtils::GetValueForKey(json, ProfileIndexKey, args->_ProfileIndex);
-            JsonUtils::GetValueForKey(json, ProfileKey, args->_Profile);
+            if (auto commandline{ json[JsonKey(CommandlineKey)] })
+            {
+                args->_Commandline = winrt::to_hstring(commandline.asString());
+            }
+            if (auto startingDirectory{ json[JsonKey(StartingDirectoryKey)] })
+            {
+                args->_StartingDirectory = winrt::to_hstring(startingDirectory.asString());
+            }
+            if (auto tabTitle{ json[JsonKey(TabTitleKey)] })
+            {
+                args->_TabTitle = winrt::to_hstring(tabTitle.asString());
+            }
+            if (auto index{ json[JsonKey(ProfileIndexKey)] })
+            {
+                args->_ProfileIndex = index.asInt();
+            }
+            if (auto profile{ json[JsonKey(ProfileKey)] })
+            {
+                args->_Profile = winrt::to_hstring(profile.asString());
+            }
            return *args;
        }
    };
@@ -111,7 +120,10 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<CopyTextArgs>();
-            JsonUtils::GetValueForKey(json, SingleLineKey, args->_SingleLine);
+            if (auto singleLine{ json[JsonKey(SingleLineKey)] })
+            {
+                args->_SingleLine = singleLine.asBool();
+            }
            return { *args, {} };
        }
    };
@@ -165,11 +177,49 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<SwitchToTabArgs>();
-            JsonUtils::GetValueForKey(json, TabIndexKey, args->_TabIndex);
+            if (auto tabIndex{ json[JsonKey(TabIndexKey)] })
+            {
+                args->_TabIndex = tabIndex.asUInt();
+            }
            return { *args, {} };
        }
    };

+    // Possible Direction values
+    // TODO:GH#2550/#3475 - move these to a centralized deserializing place
+    static constexpr std::string_view LeftString{ "left" };
+    static constexpr std::string_view RightString{ "right" };
+    static constexpr std::string_view UpString{ "up" };
+    static constexpr std::string_view DownString{ "down" };
+
+    // Function Description:
+    // - Helper function for parsing a Direction from a string
+    // Arguments:
+    // - directionString: the string to attempt to parse
+    // Return Value:
+    // - The encoded Direction value, or Direction::None if it was an invalid string
+    static TerminalApp::Direction ParseDirection(const std::string& directionString)
+    {
+        if (directionString == LeftString)
+        {
+            return TerminalApp::Direction::Left;
+        }
+        else if (directionString == RightString)
+        {
+            return TerminalApp::Direction::Right;
+        }
+        else if (directionString == UpString)
+        {
+            return TerminalApp::Direction::Up;
+        }
+        else if (directionString == DownString)
+        {
+            return TerminalApp::Direction::Down;
+        }
+        // default behavior for invalid data
+        return TerminalApp::Direction::None;
+    };
+
    struct ResizePaneArgs : public ResizePaneArgsT<ResizePaneArgs>
    {
        ResizePaneArgs() = default;
@@ -193,7 +243,10 @@ namespace winrt::TerminalApp::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 (auto directionString{ json[JsonKey(DirectionKey)] })
+            {
+                args->_Direction = ParseDirection(directionString.asString());
+            }
            if (args->_Direction == TerminalApp::Direction::None)
            {
                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
@@ -228,7 +281,10 @@ namespace winrt::TerminalApp::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 (auto directionString{ json[JsonKey(DirectionKey)] })
+            {
+                args->_Direction = ParseDirection(directionString.asString());
+            }
            if (args->_Direction == TerminalApp::Direction::None)
            {
                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
@@ -263,11 +319,48 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<AdjustFontSizeArgs>();
-            JsonUtils::GetValueForKey(json, AdjustFontSizeDelta, args->_Delta);
+            if (auto jsonDelta{ json[JsonKey(AdjustFontSizeDelta)] })
+            {
+                args->_Delta = jsonDelta.asInt();
+            }
            return { *args, {} };
        }
    };

+    // Possible SplitState values
+    // TODO:GH#2550/#3475 - move these to a centralized deserializing place
+    static constexpr std::string_view VerticalKey{ "vertical" };
+    static constexpr std::string_view HorizontalKey{ "horizontal" };
+    static constexpr std::string_view AutomaticKey{ "auto" };
+    static TerminalApp::SplitState ParseSplitState(const std::string& stateString)
+    {
+        if (stateString == VerticalKey)
+        {
+            return TerminalApp::SplitState::Vertical;
+        }
+        else if (stateString == HorizontalKey)
+        {
+            return TerminalApp::SplitState::Horizontal;
+        }
+        else if (stateString == AutomaticKey)
+        {
+            return TerminalApp::SplitState::Automatic;
+        }
+        // default behavior for invalid data
+        return TerminalApp::SplitState::Automatic;
+    };
+
+    // Possible SplitType values
+    static constexpr std::string_view DuplicateKey{ "duplicate" };
+    static TerminalApp::SplitType ParseSplitModeState(const std::string& stateString)
+    {
+        if (stateString == DuplicateKey)
+        {
+            return TerminalApp::SplitType::Duplicate;
+        }
+        return TerminalApp::SplitType::Manual;
+    }
+
    struct SplitPaneArgs : public SplitPaneArgsT<SplitPaneArgs>
    {
        SplitPaneArgs() = default;
@@ -298,12 +391,48 @@ namespace winrt::TerminalApp::implementation
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<SplitPaneArgs>();
            args->_TerminalArgs = NewTerminalArgs::FromJson(json);
-            JsonUtils::GetValueForKey(json, SplitKey, args->_SplitStyle);
-            JsonUtils::GetValueForKey(json, SplitModeKey, args->_SplitMode);
+            if (auto jsonStyle{ json[JsonKey(SplitKey)] })
+            {
+                args->_SplitStyle = ParseSplitState(jsonStyle.asString());
+            }
+            if (auto jsonStyle{ json[JsonKey(SplitModeKey)] })
+            {
+                args->_SplitMode = ParseSplitModeState(jsonStyle.asString());
+            }
            return { *args, {} };
        }
    };

+    // Possible SettingsTarget values
+    // TODO:GH#2550/#3475 - move these to a centralized deserializing place
+    static constexpr std::string_view SettingsFileString{ "settingsFile" };
+    static constexpr std::string_view DefaultsFileString{ "defaultsFile" };
+    static constexpr std::string_view AllFilesString{ "allFiles" };
+
+    // Function Description:
+    // - Helper function for parsing a SettingsTarget from a string
+    // Arguments:
+    // - targetString: the string to attempt to parse
+    // Return Value:
+    // - The encoded SettingsTarget value, or SettingsTarget::SettingsFile if it was an invalid string
+    static TerminalApp::SettingsTarget ParseSettingsTarget(const std::string& targetString)
+    {
+        if (targetString == SettingsFileString)
+        {
+            return TerminalApp::SettingsTarget::SettingsFile;
+        }
+        else if (targetString == DefaultsFileString)
+        {
+            return TerminalApp::SettingsTarget::DefaultsFile;
+        }
+        else if (targetString == AllFilesString)
+        {
+            return TerminalApp::SettingsTarget::AllFiles;
+        }
+        // default behavior for invalid data
+        return TerminalApp::SettingsTarget::SettingsFile;
+    };
+
    struct OpenSettingsArgs : public OpenSettingsArgsT<OpenSettingsArgs>
    {
        OpenSettingsArgs() = default;
@@ -327,7 +456,10 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<OpenSettingsArgs>();
-            JsonUtils::GetValueForKey(json, TargetKey, args->_Target);
+            if (auto targetString{ json[JsonKey(TargetKey)] })
+            {
+                args->_Target = ParseSettingsTarget(targetString.asString());
+            }
            return { *args, {} };
        }
    };
@@ -355,10 +487,16 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<SetTabColorArgs>();
-            if (const auto temp{ JsonUtils::GetValueForKey<std::optional<til::color>>(json, ColorKey) })
+            std::optional<til::color> temp;
+            try
            {
-                args->_TabColor = static_cast<uint32_t>(*temp);
+                ::TerminalApp::JsonUtils::GetOptionalColor(json, ColorKey, temp);
+                if (temp.has_value())
+                {
+                    args->_TabColor = static_cast<uint32_t>(temp.value());
+                }
            }
+            CATCH_LOG();
            return { *args, {} };
        }
    };
@@ -386,99 +524,13 @@ namespace winrt::TerminalApp::implementation
        {
            // LOAD BEARING: Not using make_self here _will_ break you in the future!
            auto args = winrt::make_self<RenameTabArgs>();
-            JsonUtils::GetValueForKey(json, TitleKey, args->_Title);
-            return { *args, {} };
-        }
-    };
-
-    struct ExecuteCommandlineArgs : public ExecuteCommandlineArgsT<ExecuteCommandlineArgs>
-    {
-        ExecuteCommandlineArgs() = default;
-        GETSET_PROPERTY(winrt::hstring, Commandline, L"");
-
-        static constexpr std::string_view CommandlineKey{ "commandline" };
-
-    public:
-        hstring GenerateName() const;
-
-        bool Equals(const IActionArgs& other)
-        {
-            auto otherAsUs = other.try_as<ExecuteCommandlineArgs>();
-            if (otherAsUs)
+            if (auto title{ json[JsonKey(TitleKey)] })
            {
-                return otherAsUs->_Commandline == _Commandline;
-            }
-            return false;
-        };
-        static FromJsonResult FromJson(const Json::Value& json)
-        {
-            // LOAD BEARING: Not using make_self here _will_ break you in the future!
-            auto args = winrt::make_self<ExecuteCommandlineArgs>();
-            JsonUtils::GetValueForKey(json, CommandlineKey, args->_Commandline);
-            if (args->_Commandline.empty())
-            {
-                return { nullptr, { ::TerminalApp::SettingsLoadWarnings::MissingRequiredParameter } };
+                args->_Title = winrt::to_hstring(title.asString());
            }
            return { *args, {} };
        }
    };
-
-    struct CloseOtherTabsArgs : public CloseOtherTabsArgsT<CloseOtherTabsArgs>
-    {
-        CloseOtherTabsArgs() = default;
-        GETSET_PROPERTY(uint32_t, Index, 0);
-
-        static constexpr std::string_view IndexKey{ "index" };
-
-    public:
-        hstring GenerateName() const;
-
-        bool Equals(const IActionArgs& other)
-        {
-            auto otherAsUs = other.try_as<CloseOtherTabsArgs>();
-            if (otherAsUs)
-            {
-                return otherAsUs->_Index == _Index;
-            }
-            return false;
-        };
-        static FromJsonResult FromJson(const Json::Value& json)
-        {
-            // LOAD BEARING: Not using make_self here _will_ break you in the future!
-            auto args = winrt::make_self<CloseOtherTabsArgs>();
-            JsonUtils::GetValueForKey(json, IndexKey, args->_Index);
-            return { *args, {} };
-        }
-    };
-
-    struct CloseTabsAfterArgs : public CloseTabsAfterArgsT<CloseTabsAfterArgs>
-    {
-        CloseTabsAfterArgs() = default;
-        GETSET_PROPERTY(uint32_t, Index, 0);
-
-        static constexpr std::string_view IndexKey{ "index" };
-
-    public:
-        hstring GenerateName() const;
-
-        bool Equals(const IActionArgs& other)
-        {
-            auto otherAsUs = other.try_as<CloseTabsAfterArgs>();
-            if (otherAsUs)
-            {
-                return otherAsUs->_Index == _Index;
-            }
-            return false;
-        };
-        static FromJsonResult FromJson(const Json::Value& json)
-        {
-            // LOAD BEARING: Not using make_self here _will_ break you in the future!
-            auto args = winrt::make_self<CloseTabsAfterArgs>();
-            JsonUtils::GetValueForKey(json, IndexKey, args->_Index);
-            return { *args, {} };
-        }
-    };
-
 }

 namespace winrt::TerminalApp::factory_implementation
--- a/src/cascadia/TerminalApp/lib/ActionArgs.idl
+++ b/src/cascadia/TerminalApp/lib/ActionArgs.idl
@@ -115,19 +115,4 @@ namespace TerminalApp
    {
        String Title { get; };
    };
-
-    [default_interface] runtimeclass ExecuteCommandlineArgs : IActionArgs
-    {
-        String Commandline;
-    };
-
-    [default_interface] runtimeclass CloseOtherTabsArgs : IActionArgs
-    {
-        UInt32 Index { get; };
-    };
-
-    [default_interface] runtimeclass CloseTabsAfterArgs : IActionArgs
-    {
-        UInt32 Index { get; };
-    };
 }
--- a/src/cascadia/TerminalApp/lib/App.base.h
+++ b/src/cascadia/TerminalApp/lib/App.base.h
--- a/src/cascadia/TerminalApp/lib/App.cpp
+++ b/src/cascadia/TerminalApp/lib/App.cpp
--- a/src/cascadia/TerminalApp/lib/App.h
+++ b/src/cascadia/TerminalApp/lib/App.h
--- a/src/cascadia/TerminalApp/lib/App.idl
+++ b/src/cascadia/TerminalApp/lib/App.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

-import "AppLogic.idl";
+import "../AppLogic.idl";

 namespace TerminalApp
 {
--- a/src/cascadia/TerminalApp/lib/App.xaml
+++ b/src/cascadia/TerminalApp/lib/App.xaml
--- a/src/cascadia/TerminalApp/lib/AppActionHandlers.cpp
+++ b/src/cascadia/TerminalApp/lib/AppActionHandlers.cpp
@@ -11,9 +11,9 @@ using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Text;
 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;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace ::TerminalApp;
@@ -334,65 +334,4 @@ namespace winrt::TerminalApp::implementation
        }
        args.Handled(true);
    }
-
-    void TerminalPage::_HandleExecuteCommandline(const IInspectable& /*sender*/,
-                                                 const TerminalApp::ActionEventArgs& actionArgs)
-    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::ExecuteCommandlineArgs>())
-        {
-            auto actions = winrt::single_threaded_vector<winrt::TerminalApp::ActionAndArgs>(std::move(
-                TerminalPage::ConvertExecuteCommandlineToActions(realArgs)));
-
-            if (_startupActions.Size() != 0)
-            {
-                actionArgs.Handled(true);
-                _ProcessStartupActions(actions, false);
-            }
-        }
-    }
-
-    void TerminalPage::_HandleCloseOtherTabs(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& actionArgs)
-    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseOtherTabsArgs>())
-        {
-            uint32_t index = realArgs.Index();
-
-            // Remove tabs after the current one
-            while (_tabs.Size() > index + 1)
-            {
-                _RemoveTabViewItemByIndex(_tabs.Size() - 1);
-            }
-
-            // Remove all of them leading up to the selected tab
-            while (_tabs.Size() > 1)
-            {
-                _RemoveTabViewItemByIndex(0);
-            }
-
-            actionArgs.Handled(true);
-        }
-    }
-    void TerminalPage::_HandleCloseTabsAfter(const IInspectable& /*sender*/,
-                                             const TerminalApp::ActionEventArgs& actionArgs)
-    {
-        if (const auto& realArgs = actionArgs.ActionArgs().try_as<TerminalApp::CloseTabsAfterArgs>())
-        {
-            uint32_t index = realArgs.Index();
-
-            // Remove tabs after the current one
-            while (_tabs.Size() > index + 1)
-            {
-                _RemoveTabViewItemByIndex(_tabs.Size() - 1);
-            }
-
-            // TODO:GH#7182 For whatever reason, if you run this action
-            // when the tab that's currently focused is _before_ the `index`
-            // param, then the tabs will expand to fill the entire width of the
-            // tab row, until you mouse over them. Probably has something to do
-            // with tabs not resizing down until there's a mouse exit event.
-
-            actionArgs.Handled(true);
-        }
-    }
 }
--- a/src/cascadia/TerminalApp/lib/AppCommandlineArgs.cpp
+++ b/src/cascadia/TerminalApp/lib/AppCommandlineArgs.cpp
@@ -599,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<winrt::TerminalApp::ActionAndArgs>& AppCommandlineArgs::GetStartupActions()
+std::deque<winrt::TerminalApp::ActionAndArgs>& AppCommandlineArgs::GetStartupActions()
 {
    return _startupActions;
 }
@@ -658,8 +658,7 @@ void AppCommandlineArgs::ValidateStartupCommands()
        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.push_front(*newTabAction);
    }
 }

@@ -667,52 +666,3 @@ std::optional<winrt::TerminalApp::LaunchMode> AppCommandlineArgs::GetLaunchMode(
 {
    return _launchMode;
 }
-
-// Method Description:
-// - Attempts to parse an array of commandline args into a list of
-//   commands to execute, and then parses these commands. As commands are
-//   successfully parsed, they will generate ShortcutActions for us to be
-//   able to execute. If we fail to parse any commands, we'll return the
-//   error code from the failure to parse that command, and stop processing
-//   additional commands.
-// - The first arg in args should be the program name "wt" (or some variant). It
-//   will be ignored during parsing.
-// Arguments:
-// - args: an array of strings to process as a commandline. These args can contain spaces
-// Return Value:
-// - 0 if the commandline was successfully parsed
-int AppCommandlineArgs::ParseArgs(winrt::array_view<const winrt::hstring>& args)
-{
-    auto commands = ::TerminalApp::AppCommandlineArgs::BuildCommands(args);
-
-    for (auto& cmdBlob : commands)
-    {
-        // On one hand, it seems like we should be able to have one
-        // AppCommandlineArgs for parsing all of them, and collect the
-        // results one at a time.
-        //
-        // On the other hand, re-using a CLI::App seems to leave state from
-        // previous parsings around, so we could get mysterious behavior
-        // where one command affects the values of the next.
-        //
-        // From https://cliutils.github.io/CLI11/book/chapters/options.html:
-        // > If that option is not given, CLI11 will not touch the initial
-        // > value. This allows you to set up defaults by simply setting
-        // > your value beforehand.
-        //
-        // So we pretty much need the to either manually reset the state
-        // each command, or build new ones.
-        const auto result = ParseCommand(cmdBlob);
-
-        // If this succeeded, result will be 0. Otherwise, the caller should
-        // exit(result), to exit the program.
-        if (result != 0)
-        {
-            return result;
-        }
-    }
-
-    // If all the args were successfully parsed, we'll have some commands
-    // built in _appArgs, which we'll use when the application starts up.
-    return 0;
-}
--- a/src/cascadia/TerminalApp/lib/AppCommandlineArgs.h
+++ b/src/cascadia/TerminalApp/lib/AppCommandlineArgs.h
@@ -28,15 +28,13 @@ public:

    AppCommandlineArgs();
    ~AppCommandlineArgs() = default;
-
    int ParseCommand(const Commandline& command);
-    int ParseArgs(winrt::array_view<const winrt::hstring>& args);

    static std::vector<Commandline> BuildCommands(const std::vector<const wchar_t*>& args);
    static std::vector<Commandline> BuildCommands(winrt::array_view<const winrt::hstring>& args);

    void ValidateStartupCommands();
-    std::vector<winrt::TerminalApp::ActionAndArgs>& GetStartupActions();
+    std::deque<winrt::TerminalApp::ActionAndArgs>& GetStartupActions();
    const std::string& GetExitMessage();
    bool ShouldExitEarly() const noexcept;

@@ -92,7 +90,7 @@ private:
    std::optional<winrt::TerminalApp::LaunchMode> _launchMode{ std::nullopt };
    // Are you adding more args here? Make sure to reset them in _resetStateToDefault

-    std::vector<winrt::TerminalApp::ActionAndArgs> _startupActions;
+    std::deque<winrt::TerminalApp::ActionAndArgs> _startupActions;
    std::string _exitMessage;
    bool _shouldExitEarly{ false };

--- a/src/cascadia/TerminalApp/lib/AppKeyBindings.cpp
+++ b/src/cascadia/TerminalApp/lib/AppKeyBindings.cpp
@@ -9,12 +9,12 @@

 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;

 namespace winrt::TerminalApp::implementation
 {
    void AppKeyBindings::SetKeyBinding(const TerminalApp::ActionAndArgs& actionAndArgs,
-                                       const KeyChord& chord)
+                                       const Settings::KeyChord& chord)
    {
        _keyShortcuts[chord] = actionAndArgs;
    }
@@ -25,7 +25,7 @@ namespace winrt::TerminalApp::implementation
    // - chord: the keystroke to remove the action for.
    // Return Value:
    // - <none>
-    void AppKeyBindings::ClearKeyBinding(const KeyChord& chord)
+    void AppKeyBindings::ClearKeyBinding(const Settings::KeyChord& chord)
    {
        _keyShortcuts.erase(chord);
    }
@@ -67,7 +67,7 @@ namespace winrt::TerminalApp::implementation
        return { nullptr };
    }

-    bool AppKeyBindings::TryKeyChord(const KeyChord& kc)
+    bool AppKeyBindings::TryKeyChord(const Settings::KeyChord& kc)
    {
        const auto keyIter = _keyShortcuts.find(kc);
        if (keyIter != _keyShortcuts.end())
@@ -87,19 +87,19 @@ namespace winrt::TerminalApp::implementation
    // - Takes the KeyModifier flags from Terminal and maps them to the WinRT types which are used by XAML
    // Return Value:
    // - a Windows::System::VirtualKeyModifiers object with the flags of which modifiers used.
-    Windows::System::VirtualKeyModifiers AppKeyBindings::ConvertVKModifiers(KeyModifiers modifiers)
+    Windows::System::VirtualKeyModifiers AppKeyBindings::ConvertVKModifiers(Settings::KeyModifiers modifiers)
    {
        Windows::System::VirtualKeyModifiers keyModifiers = Windows::System::VirtualKeyModifiers::None;

-        if (WI_IsFlagSet(modifiers, KeyModifiers::Ctrl))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Ctrl))
        {
            keyModifiers |= Windows::System::VirtualKeyModifiers::Control;
        }
-        if (WI_IsFlagSet(modifiers, KeyModifiers::Shift))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Shift))
        {
            keyModifiers |= Windows::System::VirtualKeyModifiers::Shift;
        }
-        if (WI_IsFlagSet(modifiers, KeyModifiers::Alt))
+        if (WI_IsFlagSet(modifiers, Settings::KeyModifiers::Alt))
        {
            // note: Menu is the Alt VK_MENU
            keyModifiers |= Windows::System::VirtualKeyModifiers::Menu;
--- a/src/cascadia/TerminalApp/lib/AppKeyBindings.h
+++ b/src/cascadia/TerminalApp/lib/AppKeyBindings.h
@@ -20,10 +20,10 @@ namespace winrt::TerminalApp::implementation
 {
    struct KeyChordHash
    {
-        std::size_t operator()(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& key) const
+        std::size_t operator()(const winrt::Microsoft::Terminal::Settings::KeyChord& key) const
        {
            std::hash<int32_t> keyHash;
-            std::hash<winrt::Microsoft::Terminal::TerminalControl::KeyModifiers> modifiersHash;
+            std::hash<winrt::Microsoft::Terminal::Settings::KeyModifiers> modifiersHash;
            std::size_t hashedKey = keyHash(key.Vkey());
            std::size_t hashedMods = modifiersHash(key.Modifiers());
            return hashedKey ^ hashedMods;
@@ -32,7 +32,7 @@ namespace winrt::TerminalApp::implementation

    struct KeyChordEquality
    {
-        bool operator()(const winrt::Microsoft::Terminal::TerminalControl::KeyChord& lhs, const winrt::Microsoft::Terminal::TerminalControl::KeyChord& rhs) const
+        bool operator()(const winrt::Microsoft::Terminal::Settings::KeyChord& lhs, const winrt::Microsoft::Terminal::Settings::KeyChord& rhs) const
        {
            return lhs.Modifiers() == rhs.Modifiers() && lhs.Vkey() == rhs.Vkey();
        }
@@ -42,15 +42,15 @@ namespace winrt::TerminalApp::implementation
    {
        AppKeyBindings() = default;

-        bool TryKeyChord(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& kc);
+        bool TryKeyChord(winrt::Microsoft::Terminal::Settings::KeyChord const& kc);

        void SetKeyBinding(TerminalApp::ActionAndArgs const& actionAndArgs,
-                           winrt::Microsoft::Terminal::TerminalControl::KeyChord const& chord);
-        void ClearKeyBinding(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& chord);
-        Microsoft::Terminal::TerminalControl::KeyChord GetKeyBindingForAction(TerminalApp::ShortcutAction const& action);
-        Microsoft::Terminal::TerminalControl::KeyChord GetKeyBindingForActionWithArgs(TerminalApp::ActionAndArgs const& actionAndArgs);
+                           winrt::Microsoft::Terminal::Settings::KeyChord const& chord);
+        void ClearKeyBinding(winrt::Microsoft::Terminal::Settings::KeyChord const& chord);
+        Microsoft::Terminal::Settings::KeyChord GetKeyBindingForAction(TerminalApp::ShortcutAction const& action);
+        Microsoft::Terminal::Settings::KeyChord GetKeyBindingForActionWithArgs(TerminalApp::ActionAndArgs const& actionAndArgs);

-        static Windows::System::VirtualKeyModifiers ConvertVKModifiers(winrt::Microsoft::Terminal::TerminalControl::KeyModifiers modifiers);
+        static Windows::System::VirtualKeyModifiers ConvertVKModifiers(winrt::Microsoft::Terminal::Settings::KeyModifiers modifiers);

        // Defined in AppKeyBindingsSerialization.cpp
        std::vector<::TerminalApp::SettingsLoadWarnings> LayerJson(const Json::Value& json);
@@ -59,7 +59,7 @@ namespace winrt::TerminalApp::implementation
        void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);

    private:
-        std::unordered_map<winrt::Microsoft::Terminal::TerminalControl::KeyChord, TerminalApp::ActionAndArgs, KeyChordHash, KeyChordEquality> _keyShortcuts;
+        std::unordered_map<winrt::Microsoft::Terminal::Settings::KeyChord, TerminalApp::ActionAndArgs, KeyChordHash, KeyChordEquality> _keyShortcuts;

        winrt::TerminalApp::ShortcutActionDispatch _dispatch{ nullptr };

--- a/src/cascadia/TerminalApp/AppKeyBindings.idl
+++ b/src/cascadia/TerminalApp/AppKeyBindings.idl
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+import "../ActionArgs.idl";
+import "../ShortcutActionDispatch.idl";
+
+namespace TerminalApp
+{
+    [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.Settings.IKeyBindings
+    {
+        AppKeyBindings();
+
+        void SetKeyBinding(ActionAndArgs actionAndArgs, Microsoft.Terminal.Settings.KeyChord chord);
+        void ClearKeyBinding(Microsoft.Terminal.Settings.KeyChord chord);
+
+        Microsoft.Terminal.Settings.KeyChord GetKeyBindingForAction(ShortcutAction action);
+        Microsoft.Terminal.Settings.KeyChord GetKeyBindingForActionWithArgs(ActionAndArgs actionAndArgs);
+
+        void SetDispatch(ShortcutActionDispatch dispatch);
+    }
+}
--- a/src/cascadia/TerminalApp/lib/AppKeyBindingsSerialization.cpp
+++ b/src/cascadia/TerminalApp/lib/AppKeyBindingsSerialization.cpp
@@ -12,8 +12,9 @@
 #include "KeyChordSerialization.h"
 #include "Utils.h"
 #include "JsonUtils.h"
+#include <winrt/Microsoft.Terminal.Settings.h>

-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::TerminalApp;

 static constexpr std::string_view KeysKey{ "keys" };
--- a/src/cascadia/TerminalApp/lib/AppLogic.cpp
+++ b/src/cascadia/TerminalApp/lib/AppLogic.cpp
@@ -15,6 +15,7 @@ using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace ::TerminalApp;

@@ -473,7 +474,7 @@ namespace winrt::TerminalApp::implementation
    // - <none>
    // Return Value:
    // - a point containing the requested dimensions in pixels.
-    winrt::Windows::Foundation::Size AppLogic::GetLaunchDimensions(uint32_t dpi)
+    winrt::Windows::Foundation::Point AppLogic::GetLaunchDimensions(uint32_t dpi)
    {
        if (!_loadedInitialSettings)
        {
@@ -503,7 +504,7 @@ namespace winrt::TerminalApp::implementation
            // of the height calculation here.
            auto titlebar = TitlebarControl{ static_cast<uint64_t>(0) };
            titlebar.Measure({ SHRT_MAX, SHRT_MAX });
-            proposedSize.Height += (titlebar.DesiredSize().Height) * scale;
+            proposedSize.Y += (titlebar.DesiredSize().Height) * scale;
        }
        else if (_settings->GlobalSettings().AlwaysShowTabs())
        {
@@ -518,7 +519,7 @@ namespace winrt::TerminalApp::implementation
            // For whatever reason, there's about 6px of unaccounted-for space
            // in the application. I couldn't tell you where these 6px are
            // coming from, but they need to be included in this math.
-            proposedSize.Width += (tabControl.DesiredSize().Height + 6) * scale;
+            proposedSize.Y += (tabControl.DesiredSize().Height + 6) * scale;
        }

        return proposedSize;
@@ -973,7 +974,7 @@ namespace winrt::TerminalApp::implementation
    //   or 0. (see AppLogic::_ParseArgs)
    int32_t AppLogic::SetStartupCommandline(array_view<const winrt::hstring> args)
    {
-        const auto result = _appArgs.ParseArgs(args);
+        const auto result = _ParseArgs(args);
        if (result == 0)
        {
            _appArgs.ValidateStartupCommands();
@@ -983,6 +984,53 @@ namespace winrt::TerminalApp::implementation
        return result;
    }

+    // Method Description:
+    // - Attempts to parse an array of commandline args into a list of
+    //   commands to execute, and then parses these commands. As commands are
+    //   successfully parsed, they will generate ShortcutActions for us to be
+    //   able to execute. If we fail to parse any commands, we'll return the
+    //   error code from the failure to parse that command, and stop processing
+    //   additional commands.
+    // Arguments:
+    // - args: an array of strings to process as a commandline. These args can contain spaces
+    // Return Value:
+    // - 0 if the commandline was successfully parsed
+    int AppLogic::_ParseArgs(winrt::array_view<const hstring>& args)
+    {
+        auto commands = ::TerminalApp::AppCommandlineArgs::BuildCommands(args);
+
+        for (auto& cmdBlob : commands)
+        {
+            // On one hand, it seems like we should be able to have one
+            // AppCommandlineArgs for parsing all of them, and collect the
+            // results one at a time.
+            //
+            // On the other hand, re-using a CLI::App seems to leave state from
+            // previous parsings around, so we could get mysterious behavior
+            // where one command affects the values of the next.
+            //
+            // From https://cliutils.github.io/CLI11/book/chapters/options.html:
+            // > If that option is not given, CLI11 will not touch the initial
+            // > value. This allows you to set up defaults by simply setting
+            // > your value beforehand.
+            //
+            // So we pretty much need the to either manually reset the state
+            // each command, or build new ones.
+            const auto result = _appArgs.ParseCommand(cmdBlob);
+
+            // If this succeeded, result will be 0. Otherwise, the caller should
+            // exit(result), to exit the program.
+            if (result != 0)
+            {
+                return result;
+            }
+        }
+
+        // If all the args were successfully parsed, we'll have some commands
+        // built in _appArgs, which we'll use when the application starts up.
+        return 0;
+    }
+
    // Method Description:
    // - If there were any errors parsing the commandline that was used to
    //   initialize the terminal, this will return a string containing that
--- a/src/cascadia/TerminalApp/lib/AppLogic.h
+++ b/src/cascadia/TerminalApp/lib/AppLogic.h
@@ -37,7 +37,7 @@ namespace winrt::TerminalApp::implementation
        bool Fullscreen() const;
        bool AlwaysOnTop() const;

-        Windows::Foundation::Size GetLaunchDimensions(uint32_t dpi);
+        Windows::Foundation::Point GetLaunchDimensions(uint32_t dpi);
        winrt::Windows::Foundation::Point GetLaunchInitialPositions(int32_t defaultInitialX, int32_t defaultInitialY);
        winrt::Windows::UI::Xaml::ElementTheme GetRequestedTheme();
        LaunchMode GetLaunchMode();
--- a/src/cascadia/TerminalApp/lib/AppLogic.idl
+++ b/src/cascadia/TerminalApp/lib/AppLogic.idl
@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

-import "TerminalPage.idl";
-import "ShortcutActionDispatch.idl";
-import "IDirectKeyListener.idl";
+import "../TerminalPage.idl";
+import "../ShortcutActionDispatch.idl";
+import "../IDirectKeyListener.idl";

 namespace TerminalApp
 {
@@ -45,8 +45,7 @@ namespace TerminalApp
        Boolean Fullscreen { get; };
        Boolean AlwaysOnTop { get; };

-        Windows.Foundation.Size GetLaunchDimensions(UInt32 dpi);
-
+        Windows.Foundation.Point GetLaunchDimensions(UInt32 dpi);
        Windows.Foundation.Point GetLaunchInitialPositions(Int32 defaultInitialX, Int32 defaultInitialY);
        Windows.UI.Xaml.ElementTheme GetRequestedTheme();
        LaunchMode GetLaunchMode();
--- a/src/cascadia/TerminalApp/lib/AzureCloudShellGenerator.cpp
+++ b/src/cascadia/TerminalApp/lib/AzureCloudShellGenerator.cpp
--- a/src/cascadia/TerminalApp/lib/AzureCloudShellGenerator.h
+++ b/src/cascadia/TerminalApp/lib/AzureCloudShellGenerator.h
--- a/src/cascadia/TerminalApp/lib/CascadiaSettings.cpp
+++ b/src/cascadia/TerminalApp/lib/CascadiaSettings.cpp
@@ -17,6 +17,7 @@
 #include "WslDistroGenerator.h"
 #include "AzureCloudShellGenerator.h"

+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace ::TerminalApp;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::TerminalApp;
@@ -92,7 +93,7 @@ const Profile* CascadiaSettings::FindProfile(GUID profileGuid) const noexcept
 // - <none>
 // Return Value:
 // - an iterable collection of all of our Profiles.
-gsl::span<const Profile> CascadiaSettings::GetProfiles() const noexcept
+std::basic_string_view<Profile> CascadiaSettings::GetProfiles() const noexcept
 {
    return { &_profiles[0], _profiles.size() };
 }
--- a/src/cascadia/TerminalApp/lib/CascadiaSettings.h
+++ b/src/cascadia/TerminalApp/lib/CascadiaSettings.h
@@ -54,12 +54,12 @@ public:

    static const CascadiaSettings& GetCurrentAppSettings();

-    std::tuple<GUID, winrt::TerminalApp::TerminalSettings> BuildSettings(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const;
-    winrt::TerminalApp::TerminalSettings BuildSettings(GUID profileGuid) const;
+    std::tuple<GUID, winrt::Microsoft::Terminal::Settings::TerminalSettings> BuildSettings(const winrt::TerminalApp::NewTerminalArgs& newTerminalArgs) const;
+    winrt::Microsoft::Terminal::Settings::TerminalSettings BuildSettings(GUID profileGuid) const;

    GlobalAppSettings& GlobalSettings();

-    gsl::span<const Profile> GetProfiles() const noexcept;
+    std::basic_string_view<Profile> GetProfiles() const noexcept;

    winrt::TerminalApp::AppKeyBindings GetKeybindings() const noexcept;

--- a/src/cascadia/TerminalApp/lib/CascadiaSettingsSerialization.cpp
+++ b/src/cascadia/TerminalApp/lib/CascadiaSettingsSerialization.cpp
@@ -249,9 +249,9 @@ void CascadiaSettings::_LoadDynamicProfiles()
    const auto disabledProfileSources = CascadiaSettings::_GetDisabledProfileSourcesJsonObject(_userSettings);
    if (disabledProfileSources.isArray())
    {
-        for (const auto& json : disabledProfileSources)
+        for (const auto& ns : disabledProfileSources)
        {
-            ignoredNamespaces.emplace(JsonUtils::GetValue<std::wstring>(json));
+            ignoredNamespaces.emplace(GetWstringFromJson(ns));
        }
    }

--- a/src/cascadia/TerminalApp/lib/ColorHelper.cpp
+++ b/src/cascadia/TerminalApp/lib/ColorHelper.cpp
--- a/src/cascadia/TerminalApp/lib/ColorHelper.h
+++ b/src/cascadia/TerminalApp/lib/ColorHelper.h
--- a/src/cascadia/TerminalApp/lib/ColorPickupFlyout.cpp
+++ b/src/cascadia/TerminalApp/lib/ColorPickupFlyout.cpp
--- a/src/cascadia/TerminalApp/lib/ColorPickupFlyout.h
+++ b/src/cascadia/TerminalApp/lib/ColorPickupFlyout.h
--- a/src/cascadia/TerminalApp/lib/ColorPickupFlyout.idl
+++ b/src/cascadia/TerminalApp/lib/ColorPickupFlyout.idl
--- a/src/cascadia/TerminalApp/lib/ColorPickupFlyout.xaml
+++ b/src/cascadia/TerminalApp/lib/ColorPickupFlyout.xaml
--- a/src/cascadia/TerminalApp/lib/ColorScheme.cpp
+++ b/src/cascadia/TerminalApp/lib/ColorScheme.cpp
@@ -10,7 +10,8 @@

 using namespace ::Microsoft::Console;
 using namespace TerminalApp;
-using namespace winrt::TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings;
+using namespace winrt::Microsoft::Terminal::TerminalControl;

 static constexpr std::string_view NameKey{ "name" };
 static constexpr std::string_view ForegroundKey{ "foreground" };
@@ -104,9 +105,9 @@ ColorScheme ColorScheme::FromJson(const Json::Value& json)
 // - true iff the json object has the same `name` as we do.
 bool ColorScheme::ShouldBeLayered(const Json::Value& json) const
 {
-    std::wstring nameFromJson{};
-    if (JsonUtils::GetValueForKey(json, NameKey, nameFromJson))
+    if (const auto name{ json[JsonKey(NameKey)] })
    {
+        const auto nameFromJson = GetWstringFromJson(name);
        return nameFromJson == _schemeName;
    }
    return false;
@@ -124,16 +125,39 @@ bool ColorScheme::ShouldBeLayered(const Json::Value& json) const
 // <none>
 void ColorScheme::LayerJson(const Json::Value& json)
 {
-    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);
+    if (auto name{ json[JsonKey(NameKey)] })
+    {
+        _schemeName = winrt::to_hstring(name.asString());
+    }
+    if (auto fgString{ json[JsonKey(ForegroundKey)] })
+    {
+        const auto color = Utils::ColorFromHexString(fgString.asString());
+        _defaultForeground = color;
+    }
+    if (auto bgString{ json[JsonKey(BackgroundKey)] })
+    {
+        const auto color = Utils::ColorFromHexString(bgString.asString());
+        _defaultBackground = color;
+    }
+    if (auto sbString{ json[JsonKey(SelectionBackgroundKey)] })
+    {
+        const auto color = Utils::ColorFromHexString(sbString.asString());
+        _selectionBackground = color;
+    }
+    if (auto sbString{ json[JsonKey(CursorColorKey)] })
+    {
+        const auto color = Utils::ColorFromHexString(sbString.asString());
+        _cursorColor = color;
+    }

    int i = 0;
    for (const auto& current : TableColors)
    {
-        JsonUtils::GetValueForKey(json, current, _table.at(i));
+        if (auto str{ json[JsonKey(current)] })
+        {
+            const auto color = Utils::ColorFromHexString(str.asString());
+            _table.at(i) = color;
+        }
        i++;
    }
 }
@@ -176,7 +200,11 @@ til::color ColorScheme::GetCursorColor() const noexcept
 // - the name of the color scheme represented by `json` as a std::wstring optional
 //   i.e. the value of the `name` property.
 // - returns std::nullopt if `json` doesn't have the `name` property
-std::optional<std::wstring> ColorScheme::GetNameFromJson(const Json::Value& json)
+std::optional<std::wstring> TerminalApp::ColorScheme::GetNameFromJson(const Json::Value& json)
 {
-    return JsonUtils::GetValueForKey<std::optional<std::wstring>>(json, NameKey);
+    if (const auto name{ json[JsonKey(NameKey)] })
+    {
+        return GetWstringFromJson(name);
+    }
+    return std::nullopt;
 }
--- a/src/cascadia/TerminalApp/lib/ColorScheme.h
+++ b/src/cascadia/TerminalApp/lib/ColorScheme.h
@@ -15,7 +15,8 @@ Author(s):

 --*/
 #pragma once
-#include "TerminalSettings.h"
+#include <winrt/Microsoft.Terminal.Settings.h>
+#include <winrt/Microsoft.Terminal.TerminalControl.h>
 #include "../../inc/conattrs.hpp"

 // fwdecl unittest classes
@@ -37,7 +38,7 @@ public:
    ColorScheme(std::wstring name, til::color defaultFg, til::color defaultBg, til::color cursorColor);
    ~ColorScheme();

-    void ApplyScheme(winrt::TerminalApp::TerminalSettings terminalSettings) const;
+    void ApplyScheme(winrt::Microsoft::Terminal::Settings::TerminalSettings terminalSettings) const;

    static ColorScheme FromJson(const Json::Value& json);
    bool ShouldBeLayered(const Json::Value& json) const;
--- a/src/cascadia/TerminalApp/lib/Command.cpp
+++ b/src/cascadia/TerminalApp/lib/Command.cpp
@@ -7,11 +7,10 @@

 #include "Utils.h"
 #include "ActionAndArgs.h"
-#include "JsonUtils.h"
 #include <LibraryResources.h>

+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::TerminalApp;
-using namespace ::TerminalApp;

 static constexpr std::string_view NameKey{ "name" };
 static constexpr std::string_view IconPathKey{ "iconPath" };
@@ -36,17 +35,25 @@ namespace winrt::TerminalApp::implementation
        {
            if (name.isObject())
            {
-                if (const auto resourceKey{ JsonUtils::GetValueForKey<std::optional<std::wstring>>(name, "key") })
+                try
                {
-                    if (HasLibraryResourceWithName(*resourceKey))
+                    if (const auto keyJson{ name[JsonKey("key")] })
                    {
-                        return GetLibraryResourceString(*resourceKey);
+                        // Make sure the key is present before we try
+                        // loading it. Otherwise we'll crash
+                        const auto resourceKey = GetWstringFromJson(keyJson);
+                        if (HasLibraryResourceWithName(resourceKey))
+                        {
+                            return GetLibraryResourceString(resourceKey);
+                        }
                    }
                }
+                CATCH_LOG();
            }
            else if (name.isString())
            {
-                return JsonUtils::GetValue<winrt::hstring>(name);
+                auto nameStr = name.asString();
+                return winrt::to_hstring(nameStr);
            }
        }

--- a/src/cascadia/TerminalApp/lib/Command.h
+++ b/src/cascadia/TerminalApp/lib/Command.h
--- a/src/cascadia/TerminalApp/lib/Command.idl
+++ b/src/cascadia/TerminalApp/lib/Command.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

-import "ShortcutActionDispatch.idl";
+import "../ShortcutActionDispatch.idl";

 namespace TerminalApp
 {
--- a/src/cascadia/TerminalApp/lib/CommandKeyChordVisibilityConverter.cpp
+++ b/src/cascadia/TerminalApp/lib/CommandKeyChordVisibilityConverter.cpp
--- a/src/cascadia/TerminalApp/lib/CommandKeyChordVisibilityConverter.h
+++ b/src/cascadia/TerminalApp/lib/CommandKeyChordVisibilityConverter.h
--- a/src/cascadia/TerminalApp/lib/CommandKeyChordVisibilityConverter.idl
+++ b/src/cascadia/TerminalApp/lib/CommandKeyChordVisibilityConverter.idl
--- a/src/cascadia/TerminalApp/lib/CommandPalette.cpp
+++ b/src/cascadia/TerminalApp/lib/CommandPalette.cpp
@@ -5,6 +5,7 @@
 #include "CommandPalette.h"

 #include "CommandPalette.g.cpp"
+#include <winrt/Microsoft.Terminal.Settings.h>

 using namespace winrt;
 using namespace winrt::TerminalApp;
@@ -186,16 +187,14 @@ namespace winrt::TerminalApp::implementation
        {
            const auto actionAndArgs = command.Action();
            _dispatch.DoAction(actionAndArgs);
+            _close();

            TraceLoggingWrite(
                g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
                "CommandPaletteDispatchedAction",
                TraceLoggingDescription("Event emitted when the user selects an action in the Command Palette"),
-                TraceLoggingUInt32(_searchBox().Text().size(), "SearchTextLength", "Number of characters in the search string"),
                TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
                TelemetryPrivacyDataTag(PDT_ProductAndServicePerformance));
-
-            _close();
        }
    }

@@ -272,17 +271,16 @@ namespace winrt::TerminalApp::implementation
    };

    // Method Description:
-    // - Produce a list of filtered actions to reflect the current contents of
+    // - Update our list of filtered actions to reflect the current contents of
    //   the input box. For more details on which commands will be displayed,
    //   see `_getWeight`.
    // Arguments:
-    // - A collection that will receive the filtered actions
+    // - <none>
    // Return Value:
    // - <none>
-    std::vector<winrt::TerminalApp::Command> CommandPalette::_collectFilteredActions()
+    void CommandPalette::_updateFilteredActions()
    {
-        std::vector<winrt::TerminalApp::Command> actions;
-
+        _filteredActions.Clear();
        auto searchText = _searchBox().Text();
        const bool addAll = searchText.empty();

@@ -305,10 +303,10 @@ namespace winrt::TerminalApp::implementation

            for (auto action : sortedCommands)
            {
-                actions.push_back(action);
+                _filteredActions.Append(action);
            }

-            return actions;
+            return;
        }

        // Here, there was some filter text.
@@ -345,56 +343,7 @@ namespace winrt::TerminalApp::implementation
        {
            auto top = heap.top();
            heap.pop();
-            actions.push_back(top.command);
-        }
-
-        return actions;
-    }
-
-    // Method Description:
-    // - Update our list of filtered actions to reflect the current contents of
-    //   the input box. For more details on which commands will be displayed,
-    //   see `_getWeight`.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void CommandPalette::_updateFilteredActions()
-    {
-        auto actions = _collectFilteredActions();
-
-        // Make _filteredActions look identical to actions, using only Insert and Remove.
-        // This allows WinUI to nicely animate the ListView as it changes.
-        for (uint32_t i = 0; i < _filteredActions.Size() && i < actions.size(); i++)
-        {
-            for (uint32_t j = i; j < _filteredActions.Size(); j++)
-            {
-                if (_filteredActions.GetAt(j) == actions[i])
-                {
-                    for (uint32_t k = i; k < j; k++)
-                    {
-                        _filteredActions.RemoveAt(i);
-                    }
-                    break;
-                }
-            }
-
-            if (_filteredActions.GetAt(i) != actions[i])
-            {
-                _filteredActions.InsertAt(i, actions[i]);
-            }
-        }
-
-        // Remove any extra trailing items from the destination
-        while (_filteredActions.Size() > actions.size())
-        {
-            _filteredActions.RemoveAtEnd();
-        }
-
-        // Add any extra trailing items from the source
-        while (_filteredActions.Size() < actions.size())
-        {
-            _filteredActions.Append(actions[_filteredActions.Size()]);
+            _filteredActions.Append(top.command);
        }
    }

--- a/src/cascadia/TerminalApp/lib/CommandPalette.h
+++ b/src/cascadia/TerminalApp/lib/CommandPalette.h
@@ -37,7 +37,6 @@ namespace winrt::TerminalApp::implementation
        void _selectNextItem(const bool moveDown);

        void _updateFilteredActions();
-        std::vector<winrt::TerminalApp::Command> _collectFilteredActions();
        static int _getWeight(const winrt::hstring& searchText, const winrt::hstring& name);
        void _close();

--- a/src/cascadia/TerminalApp/lib/CommandPalette.idl
+++ b/src/cascadia/TerminalApp/lib/CommandPalette.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

-import "Command.idl";
+import "../Command.idl";

 namespace TerminalApp
 {
--- a/src/cascadia/TerminalApp/lib/CommandPalette.xaml
+++ b/src/cascadia/TerminalApp/lib/CommandPalette.xaml
@@ -195,10 +195,9 @@ the MIT License. See LICENSE in the project root for license information. -->
                        <Grid HorizontalAlignment="Stretch"  >

                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="16"/>   <!-- icon -->
-                                <ColumnDefinition Width="Auto"/> <!-- command label -->
-                                <ColumnDefinition Width="*"/>    <!-- key chord -->
-                                <ColumnDefinition Width="16"/>   <!-- gutter for scrollbar -->
+                                <ColumnDefinition Width="16"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
                            </Grid.ColumnDefinitions>

                            <!-- TODO GH#6644: Add Icon to command palette entries, in column 0 -->
--- a/src/cascadia/TerminalApp/lib/Commandline.cpp
+++ b/src/cascadia/TerminalApp/lib/Commandline.cpp
--- a/src/cascadia/TerminalApp/lib/Commandline.h
+++ b/src/cascadia/TerminalApp/lib/Commandline.h
--- a/src/cascadia/TerminalApp/lib/DebugTapConnection.cpp
+++ b/src/cascadia/TerminalApp/lib/DebugTapConnection.cpp
--- a/src/cascadia/TerminalApp/lib/DebugTapConnection.h
+++ b/src/cascadia/TerminalApp/lib/DebugTapConnection.h
--- a/src/cascadia/TerminalApp/lib/DefaultProfileUtils.cpp
+++ b/src/cascadia/TerminalApp/lib/DefaultProfileUtils.cpp
--- a/src/cascadia/TerminalApp/lib/DefaultProfileUtils.h
+++ b/src/cascadia/TerminalApp/lib/DefaultProfileUtils.h
--- a/src/cascadia/TerminalApp/lib/GlobalAppSettings.cpp
+++ b/src/cascadia/TerminalApp/lib/GlobalAppSettings.cpp
@@ -7,10 +7,11 @@
 #include "../../inc/DefaultSettings.h"
 #include "Utils.h"
 #include "JsonUtils.h"
-#include "TerminalSettingsSerializationHelpers.h"

 using namespace TerminalApp;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::TerminalApp;
+using namespace winrt::Windows::Data::Json;
 using namespace winrt::Windows::UI::Xaml;
 using namespace ::Microsoft::Console;
 using namespace winrt::Microsoft::UI::Xaml::Controls;
@@ -43,6 +44,21 @@ static constexpr std::string_view ForceFullRepaintRenderingKey{ "experimental.re
 static constexpr std::string_view SoftwareRenderingKey{ "experimental.rendering.software" };
 static constexpr std::string_view ForceVTInputKey{ "experimental.input.forceVT" };

+// Launch mode values
+static constexpr std::wstring_view DefaultLaunchModeValue{ L"default" };
+static constexpr std::wstring_view MaximizedLaunchModeValue{ L"maximized" };
+static constexpr std::wstring_view FullscreenLaunchModeValue{ L"fullscreen" };
+
+// Tab Width Mode values
+static constexpr std::wstring_view EqualTabWidthModeValue{ L"equal" };
+static constexpr std::wstring_view TitleLengthTabWidthModeValue{ L"titleLength" };
+static constexpr std::wstring_view TitleLengthCompactModeValue{ L"compact" };
+
+// Theme values
+static constexpr std::wstring_view LightThemeValue{ L"light" };
+static constexpr std::wstring_view DarkThemeValue{ L"dark" };
+static constexpr std::wstring_view SystemThemeValue{ L"system" };
+
 #ifdef _DEBUG
 static constexpr bool debugFeaturesDefault{ true };
 #else
@@ -133,51 +149,66 @@ GlobalAppSettings GlobalAppSettings::FromJson(const Json::Value& json)

 void GlobalAppSettings::LayerJson(const Json::Value& json)
 {
-    JsonUtils::GetValueForKey(json, DefaultProfileKey, _unparsedDefaultProfile);
+    if (auto defaultProfile{ json[JsonKey(DefaultProfileKey)] })
+    {
+        _unparsedDefaultProfile.emplace(GetWstringFromJson(defaultProfile));
+    }

-    JsonUtils::GetValueForKey(json, AlwaysShowTabsKey, _AlwaysShowTabs);
+    JsonUtils::GetBool(json, AlwaysShowTabsKey, _AlwaysShowTabs);

-    JsonUtils::GetValueForKey(json, ConfirmCloseAllKey, _ConfirmCloseAllTabs);
+    JsonUtils::GetBool(json, ConfirmCloseAllKey, _ConfirmCloseAllTabs);

-    JsonUtils::GetValueForKey(json, InitialRowsKey, _InitialRows);
+    JsonUtils::GetInt(json, InitialRowsKey, _InitialRows);

-    JsonUtils::GetValueForKey(json, InitialColsKey, _InitialCols);
+    JsonUtils::GetInt(json, InitialColsKey, _InitialCols);

-    JsonUtils::GetValueForKey(json, InitialPositionKey, _InitialPosition);
+    if (auto initialPosition{ json[JsonKey(InitialPositionKey)] })
+    {
+        _ParseInitialPosition(initialPosition.asString(), _InitialPosition);
+    }

-    JsonUtils::GetValueForKey(json, ShowTitleInTitlebarKey, _ShowTitleInTitlebar);
+    JsonUtils::GetBool(json, ShowTitleInTitlebarKey, _ShowTitleInTitlebar);

-    JsonUtils::GetValueForKey(json, ShowTabsInTitlebarKey, _ShowTabsInTitlebar);
+    JsonUtils::GetBool(json, ShowTabsInTitlebarKey, _ShowTabsInTitlebar);

-    JsonUtils::GetValueForKey(json, WordDelimitersKey, _WordDelimiters);
+    JsonUtils::GetWstring(json, WordDelimitersKey, _WordDelimiters);

-    JsonUtils::GetValueForKey(json, CopyOnSelectKey, _CopyOnSelect);
+    JsonUtils::GetBool(json, CopyOnSelectKey, _CopyOnSelect);

-    JsonUtils::GetValueForKey(json, CopyFormattingKey, _CopyFormatting);
+    JsonUtils::GetBool(json, CopyFormattingKey, _CopyFormatting);

-    JsonUtils::GetValueForKey(json, WarnAboutLargePasteKey, _WarnAboutLargePaste);
+    JsonUtils::GetBool(json, WarnAboutLargePasteKey, _WarnAboutLargePaste);

-    JsonUtils::GetValueForKey(json, WarnAboutMultiLinePasteKey, _WarnAboutMultiLinePaste);
+    JsonUtils::GetBool(json, WarnAboutMultiLinePasteKey, _WarnAboutMultiLinePaste);

-    JsonUtils::GetValueForKey(json, LaunchModeKey, _LaunchMode);
+    if (auto launchMode{ json[JsonKey(LaunchModeKey)] })
+    {
+        _LaunchMode = _ParseLaunchMode(GetWstringFromJson(launchMode));
+    }

-    JsonUtils::GetValueForKey(json, ThemeKey, _Theme);
+    if (auto theme{ json[JsonKey(ThemeKey)] })
+    {
+        _Theme = _ParseTheme(GetWstringFromJson(theme));
+    }

-    JsonUtils::GetValueForKey(json, TabWidthModeKey, _TabWidthMode);
+    if (auto tabWidthMode{ json[JsonKey(TabWidthModeKey)] })
+    {
+        _TabWidthMode = _ParseTabWidthMode(GetWstringFromJson(tabWidthMode));
+    }

-    JsonUtils::GetValueForKey(json, SnapToGridOnResizeKey, _SnapToGridOnResize);
+    JsonUtils::GetBool(json, SnapToGridOnResizeKey, _SnapToGridOnResize);

-    // GetValueForKey will only override the current value if the key exists
-    JsonUtils::GetValueForKey(json, DebugFeaturesKey, _DebugFeaturesEnabled);
+    JsonUtils::GetBool(json, ForceFullRepaintRenderingKey, _ForceFullRepaintRendering);

-    JsonUtils::GetValueForKey(json, ForceFullRepaintRenderingKey, _ForceFullRepaintRendering);
+    JsonUtils::GetBool(json, SoftwareRenderingKey, _SoftwareRendering);
+    JsonUtils::GetBool(json, ForceVTInputKey, _ForceVTInput);

-    JsonUtils::GetValueForKey(json, SoftwareRenderingKey, _SoftwareRendering);
-    JsonUtils::GetValueForKey(json, ForceVTInputKey, _ForceVTInput);
+    // GetBool will only override the current value if the key exists
+    JsonUtils::GetBool(json, DebugFeaturesKey, _DebugFeaturesEnabled);

-    JsonUtils::GetValueForKey(json, EnableStartupTaskKey, _StartOnUserLogin);
+    JsonUtils::GetBool(json, EnableStartupTaskKey, _StartOnUserLogin);

-    JsonUtils::GetValueForKey(json, AlwaysOnTopKey, _AlwaysOnTop);
+    JsonUtils::GetBool(json, AlwaysOnTopKey, _AlwaysOnTop);

    // This is a helper lambda to get the keybindings and commands out of both
    // and array of objects. We'll use this twice, once on the legacy
@@ -198,12 +229,123 @@ void GlobalAppSettings::LayerJson(const Json::Value& json)
            warnings = winrt::TerminalApp::implementation::Command::LayerJson(_commands, bindings);
            // It's possible that the user provided commands have some warnings
            // in them, similar to the keybindings.
+            _keybindingsWarnings.insert(_keybindingsWarnings.end(), warnings.begin(), warnings.end());
        }
    };
    parseBindings(LegacyKeybindingsKey);
    parseBindings(BindingsKey);
 }

+// Method Description:
+// - Helper function for converting a user-specified cursor style corresponding
+//   CursorStyle enum value
+// Arguments:
+// - themeString: The string value from the settings file to parse
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+ElementTheme GlobalAppSettings::_ParseTheme(const std::wstring& themeString) noexcept
+{
+    if (themeString == LightThemeValue)
+    {
+        return ElementTheme::Light;
+    }
+    else if (themeString == DarkThemeValue)
+    {
+        return ElementTheme::Dark;
+    }
+    // default behavior for invalid data or SystemThemeValue
+    return ElementTheme::Default;
+}
+
+// Method Description:
+// - Helper function for converting the initial position string into
+//   2 coordinate values. We allow users to only provide one coordinate,
+//   thus, we use comma as the separator:
+//   (100, 100): standard input string
+//   (, 100), (100, ): if a value is missing, we set this value as a default
+//   (,): both x and y are set to default
+//   (abc, 100): if a value is not valid, we treat it as default
+//   (100, 100, 100): we only read the first two values, this is equivalent to (100, 100)
+// Arguments:
+// - initialPosition: the initial position string from json
+//   ret: reference to a struct whose optionals will be populated
+// Return Value:
+// - None
+void GlobalAppSettings::_ParseInitialPosition(const std::string& initialPosition,
+                                              LaunchPosition& ret) noexcept
+{
+    static constexpr char singleCharDelim = ',';
+    std::stringstream tokenStream(initialPosition);
+    std::string token;
+    uint8_t initialPosIndex = 0;
+
+    // Get initial position values till we run out of delimiter separated values in the stream
+    // or we hit max number of allowable values (= 2)
+    // Non-numeral values or empty string will be caught as exception and we do not assign them
+    for (; std::getline(tokenStream, token, singleCharDelim) && (initialPosIndex < 2); initialPosIndex++)
+    {
+        try
+        {
+            int32_t position = std::stoi(token);
+            if (initialPosIndex == 0)
+            {
+                ret.x.emplace(position);
+            }
+
+            if (initialPosIndex == 1)
+            {
+                ret.y.emplace(position);
+            }
+        }
+        catch (...)
+        {
+            // Do nothing
+        }
+    }
+}
+
+// Method Description:
+// - Helper function for converting the user-specified launch mode
+//   to a LaunchMode enum value
+// Arguments:
+// - launchModeString: The string value from the settings file to parse
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+LaunchMode GlobalAppSettings::_ParseLaunchMode(const std::wstring& launchModeString) noexcept
+{
+    if (launchModeString == MaximizedLaunchModeValue)
+    {
+        return LaunchMode::MaximizedMode;
+    }
+    else if (launchModeString == FullscreenLaunchModeValue)
+    {
+        return LaunchMode::FullscreenMode;
+    }
+
+    return LaunchMode::DefaultMode;
+}
+
+// Method Description:
+// - Helper function for converting the user-specified tab width
+//   to a TabViewWidthMode enum value
+// Arguments:
+// - tabWidthModeString: The string value from the settings file to parse
+// Return Value:
+// - The corresponding enum value which maps to the string provided by the user
+TabViewWidthMode GlobalAppSettings::_ParseTabWidthMode(const std::wstring& tabWidthModeString) noexcept
+{
+    if (tabWidthModeString == TitleLengthTabWidthModeValue)
+    {
+        return TabViewWidthMode::SizeToContent;
+    }
+    else if (tabWidthModeString == TitleLengthCompactModeValue)
+    {
+        return TabViewWidthMode::Compact;
+    }
+    // default behavior for invalid data or EqualTabWidthValue
+    return TabViewWidthMode::Equal;
+}
+
 // Method Description:
 // - Adds the given colorscheme to our map of schemes, using its name as the key.
 // Arguments:
--- a/src/cascadia/TerminalApp/lib/GlobalAppSettings.h
+++ b/src/cascadia/TerminalApp/lib/GlobalAppSettings.h
@@ -17,7 +17,6 @@ Author(s):
 #include "AppKeyBindings.h"
 #include "ColorScheme.h"
 #include "Command.h"
-#include "SettingsTypes.h"

 // fwdecl unittest classes
 namespace TerminalAppLocalTests
@@ -29,6 +28,12 @@ namespace TerminalAppLocalTests
 namespace TerminalApp
 {
    class GlobalAppSettings;
+
+    struct LaunchPosition
+    {
+        std::optional<int> x;
+        std::optional<int> y;
+    };
 };

 class TerminalApp::GlobalAppSettings final
@@ -46,7 +51,7 @@ public:
    static GlobalAppSettings FromJson(const Json::Value& json);
    void LayerJson(const Json::Value& json);

-    void ApplyToSettings(winrt::TerminalApp::TerminalSettings& settings) const noexcept;
+    void ApplyToSettings(winrt::Microsoft::Terminal::Settings::TerminalSettings& settings) const noexcept;

    std::vector<TerminalApp::SettingsLoadWarnings> GetKeybindingsWarnings() const;

@@ -91,6 +96,15 @@ private:
    std::unordered_map<std::wstring, ColorScheme> _colorSchemes;
    std::unordered_map<winrt::hstring, winrt::TerminalApp::Command> _commands;

+    static winrt::Windows::UI::Xaml::ElementTheme _ParseTheme(const std::wstring& themeString) noexcept;
+
+    static winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode _ParseTabWidthMode(const std::wstring& tabWidthModeString) noexcept;
+
+    static void _ParseInitialPosition(const std::string& initialPosition,
+                                      LaunchPosition& ret) noexcept;
+
+    static winrt::TerminalApp::LaunchMode _ParseLaunchMode(const std::wstring& launchModeString) noexcept;
+
    friend class TerminalAppLocalTests::SettingsTests;
    friend class TerminalAppLocalTests::ColorSchemeTests;
 };
--- a/src/cascadia/TerminalApp/lib/IDirectKeyListener.idl
+++ b/src/cascadia/TerminalApp/lib/IDirectKeyListener.idl
--- a/src/cascadia/TerminalApp/lib/IDynamicProfileGenerator.h
+++ b/src/cascadia/TerminalApp/lib/IDynamicProfileGenerator.h
--- a/src/cascadia/TerminalApp/JsonUtils.cpp
+++ b/src/cascadia/TerminalApp/JsonUtils.cpp
@@ -0,0 +1,125 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "Utils.h"
+#include "JsonUtils.h"
+#include "../../types/inc/Utils.hpp"
+
+void TerminalApp::JsonUtils::GetOptionalColor(const Json::Value& json,
+                                              std::string_view key,
+                                              std::optional<til::color>& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> til::color {
+        return ::Microsoft::Console::Utils::ColorFromHexString(value.asString());
+    };
+    GetOptionalValue(json,
+                     key,
+                     target,
+                     conversionFn);
+}
+
+void TerminalApp::JsonUtils::GetOptionalString(const Json::Value& json,
+                                               std::string_view key,
+                                               std::optional<std::wstring>& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> std::wstring {
+        return GetWstringFromJson(value);
+    };
+    GetOptionalValue(json,
+                     key,
+                     target,
+                     conversionFn);
+}
+
+void TerminalApp::JsonUtils::GetOptionalGuid(const Json::Value& json,
+                                             std::string_view key,
+                                             std::optional<GUID>& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> GUID {
+        return ::Microsoft::Console::Utils::GuidFromString(GetWstringFromJson(value));
+    };
+    GetOptionalValue(json,
+                     key,
+                     target,
+                     conversionFn);
+}
+
+void TerminalApp::JsonUtils::GetOptionalDouble(const Json::Value& json,
+                                               std::string_view key,
+                                               std::optional<double>& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> double {
+        return value.asFloat();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isNumeric();
+    };
+    GetOptionalValue(json,
+                     key,
+                     target,
+                     conversionFn,
+                     validationFn);
+}
+
+void TerminalApp::JsonUtils::GetInt(const Json::Value& json,
+                                    std::string_view key,
+                                    int& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> int {
+        return value.asInt();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isInt();
+    };
+    GetValue(json, key, target, conversionFn, validationFn);
+}
+
+void TerminalApp::JsonUtils::GetUInt(const Json::Value& json,
+                                     std::string_view key,
+                                     uint32_t& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> uint32_t {
+        return value.asUInt();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isUInt();
+    };
+    GetValue(json, key, target, conversionFn, validationFn);
+}
+
+void TerminalApp::JsonUtils::GetDouble(const Json::Value& json,
+                                       std::string_view key,
+                                       double& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> double {
+        return value.asFloat();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isNumeric();
+    };
+    GetValue(json, key, target, conversionFn, validationFn);
+}
+
+void TerminalApp::JsonUtils::GetBool(const Json::Value& json,
+                                     std::string_view key,
+                                     bool& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> bool {
+        return value.asBool();
+    };
+    const auto validationFn = [](const Json::Value& value) -> bool {
+        return value.isBool();
+    };
+    GetValue(json, key, target, conversionFn, validationFn);
+}
+
+void TerminalApp::JsonUtils::GetWstring(const Json::Value& json,
+                                        std::string_view key,
+                                        std::wstring& target)
+{
+    const auto conversionFn = [](const Json::Value& value) -> std::wstring {
+        return GetWstringFromJson(value);
+    };
+    GetValue(json, key, target, conversionFn, nullptr);
+}
--- a/src/cascadia/TerminalApp/JsonUtils.h
+++ b/src/cascadia/TerminalApp/JsonUtils.h
@@ -0,0 +1,144 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- JsonUtils.h
+
+Abstract:
+- Helpers for the TerminalApp project
+Author(s):
+- Mike Griese - August 2019
+
+--*/
+#pragma once
+
+namespace TerminalApp::JsonUtils
+{
+    void GetOptionalColor(const Json::Value& json,
+                          std::string_view key,
+                          std::optional<til::color>& target);
+
+    void GetOptionalString(const Json::Value& json,
+                           std::string_view key,
+                           std::optional<std::wstring>& target);
+
+    void GetOptionalGuid(const Json::Value& json,
+                         std::string_view key,
+                         std::optional<GUID>& target);
+
+    void GetOptionalDouble(const Json::Value& json,
+                           std::string_view key,
+                           std::optional<double>& target);
+
+    // Method Description:
+    // - Helper that can be used for retrieving an optional value from a json
+    //   object, and parsing it's value to layer on a given target object.
+    //    - If the key we're looking for _doesn't_ exist in the json object,
+    //      we'll leave the target object unmodified.
+    //    - If the key exists in the json object, but is set to `null`, then
+    //      we'll instead set the target back to nullopt.
+    // - Each caller should provide a conversion function that takes a
+    //   Json::Value and returns an object of the same type as target.
+    // Arguments:
+    // - json: The json object to search for the given key
+    // - key: The key to look for in the json object
+    // - target: the optional object to receive the value from json
+    // - conversion: a std::function<T(const Json::Value&)> which can be used to
+    //   convert the Json::Value to the appropriate type.
+    // - validation: optional, if provided, will be called first to ensure that
+    //   the json::value is of the correct type before attempting to call
+    //   `conversion`.
+    // Return Value:
+    // - <none>
+    template<typename T, typename F>
+    void GetOptionalValue(const Json::Value& json,
+                          std::string_view key,
+                          std::optional<T>& target,
+                          F&& conversion,
+                          const std::function<bool(const Json::Value&)>& validation = nullptr)
+    {
+        if (json.isMember(JsonKey(key)))
+        {
+            if (auto jsonVal{ json[JsonKey(key)] })
+            {
+                if (validation == nullptr || validation(jsonVal))
+                {
+                    target = conversion(jsonVal);
+                }
+            }
+            else
+            {
+                // This branch is hit when the json object contained the key,
+                // but the key was set to `null`. In this case, explicitly clear
+                // the target.
+                target = std::nullopt;
+            }
+        }
+    }
+
+    // Method Description:
+    // - Helper that can be used for retrieving a value from a json
+    //   object, and parsing it's value to set on a given target object.
+    //    - If the key we're looking for _doesn't_ exist in the json object,
+    //      we'll leave the target object unmodified.
+    //    - If the key exists in the json object, we'll use the provided
+    //      `validation` function to ensure that the json value is of the
+    //      correct type.
+    //    - If we successfully validate the json value type (or no validation
+    //      function was provided), then we'll use `conversion` to parse the
+    //      value and place the result into `target`
+    // - Each caller should provide a conversion function that takes a
+    //   Json::Value and returns an object of the same type as target.
+    // - Unlike GetOptionalValue, if the key exists but is set to `null`, we'll
+    //   just ignore it.
+    // Arguments:
+    // - json: The json object to search for the given key
+    // - key: The key to look for in the json object
+    // - target: the optional object to receive the value from json
+    // - conversion: a std::function<T(const Json::Value&)> which can be used to
+    //   convert the Json::Value to the appropriate type.
+    // - validation: optional, if provided, will be called first to ensure that
+    //   the json::value is of the correct type before attempting to call
+    //   `conversion`.
+    // Return Value:
+    // - <none>
+    template<typename T, typename F>
+    void GetValue(const Json::Value& json,
+                  std::string_view key,
+                  T& target,
+                  F&& conversion,
+                  const std::function<bool(const Json::Value&)>& validation = nullptr)
+    {
+        if (json.isMember(JsonKey(key)))
+        {
+            if (auto jsonVal{ json[JsonKey(key)] })
+            {
+                if (validation == nullptr || validation(jsonVal))
+                {
+                    target = conversion(jsonVal);
+                }
+            }
+        }
+    }
+
+    void GetInt(const Json::Value& json,
+                std::string_view key,
+                int& target);
+
+    void GetUInt(const Json::Value& json,
+                 std::string_view key,
+                 uint32_t& target);
+
+    void GetDouble(const Json::Value& json,
+                   std::string_view key,
+                   double& target);
+
+    void GetBool(const Json::Value& json,
+                 std::string_view key,
+                 bool& target);
+
+    void GetWstring(const Json::Value& json,
+                    std::string_view key,
+                    std::wstring& target);
+};
--- a/src/cascadia/TerminalApp/lib/JsonUtils.h
+++ b/src/cascadia/TerminalApp/lib/JsonUtils.h
@@ -285,7 +285,6 @@ namespace TerminalApp::JsonUtils
    struct EnumMapper
    {
        using BaseEnumMapper = EnumMapper<T, TBase>;
-        using ValueType = T;
        using pair_type = std::pair<std::string_view, T>;
        T FromJson(const Json::Value& json)
        {
--- a/src/cascadia/TerminalApp/lib/KeyChordSerialization.cpp
+++ b/src/cascadia/TerminalApp/lib/KeyChordSerialization.cpp
@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "KeyChordSerialization.h"

-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Settings;

 static constexpr std::wstring_view CTRL_KEY{ L"ctrl" };
 static constexpr std::wstring_view SHIFT_KEY{ L"shift" };
@@ -99,7 +99,7 @@ static const std::unordered_map<std::wstring_view, int32_t> vkeyNamePairs {
 // - hstr: the string to parse into a keychord.
 // Return Value:
 // - a newly constructed KeyChord
-KeyChord KeyChordSerialization::FromString(const winrt::hstring& hstr)
+winrt::Microsoft::Terminal::Settings::KeyChord KeyChordSerialization::FromString(const winrt::hstring& hstr)
 {
    std::wstring wstr{ hstr };

@@ -201,7 +201,7 @@ KeyChord KeyChordSerialization::FromString(const winrt::hstring& hstr)
        }
    }

-    return KeyChord{ modifiers, vkey };
+    return winrt::Microsoft::Terminal::Settings::KeyChord{ modifiers, vkey };
 }

 // Function Description:
--- a/src/cascadia/TerminalApp/KeyChordSerialization.h
+++ b/src/cascadia/TerminalApp/KeyChordSerialization.h
@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+#include <winrt/Microsoft.Terminal.Settings.h>
+
+class KeyChordSerialization final
+{
+public:
+    static winrt::Microsoft::Terminal::Settings::KeyChord FromString(const winrt::hstring& str);
+    static winrt::hstring ToString(const winrt::Microsoft::Terminal::Settings::KeyChord& chord);
+};
--- a/src/cascadia/TerminalApp/lib/LegacyProfileGeneratorNamespaces.h
+++ b/src/cascadia/TerminalApp/lib/LegacyProfileGeneratorNamespaces.h
--- a/src/cascadia/TerminalApp/lib/MinMaxCloseControl.cpp
+++ b/src/cascadia/TerminalApp/lib/MinMaxCloseControl.cpp
--- a/src/cascadia/TerminalApp/lib/MinMaxCloseControl.h
+++ b/src/cascadia/TerminalApp/lib/MinMaxCloseControl.h
--- a/src/cascadia/TerminalApp/lib/MinMaxCloseControl.idl
+++ b/src/cascadia/TerminalApp/lib/MinMaxCloseControl.idl
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.

-import "TitlebarControl.idl";
+import "..\TitlebarControl.idl";

 namespace TerminalApp
 {
--- a/src/cascadia/TerminalApp/lib/MinMaxCloseControl.xaml
+++ b/src/cascadia/TerminalApp/lib/MinMaxCloseControl.xaml
--- a/src/cascadia/TerminalApp/lib/Pane.LayoutSizeNode.cpp
+++ b/src/cascadia/TerminalApp/lib/Pane.LayoutSizeNode.cpp
--- a/src/cascadia/TerminalApp/lib/Pane.cpp
+++ b/src/cascadia/TerminalApp/lib/Pane.cpp
@@ -7,11 +7,11 @@
 #include "CascadiaSettings.h"

 using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::Graphics::Display;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Xaml::Media;
+using namespace winrt::Microsoft::Terminal::Settings;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace winrt::TerminalApp;
@@ -921,102 +921,6 @@ bool Pane::CanSplit(SplitState splitType)
    return false;
 }

-// Method Description:
-// - This is a helper to determine if a given Pane can be split, but without
-//   using the ActualWidth() and ActualHeight() methods. This is used during
-//   processing of many "split-pane" commands, which could happen _before_ we've
-//   laid out a Pane for the first time. When this happens, the Pane's don't
-//   have an actual size yet. However, we'd still like to figure out if the pane
-//   could be split, once they're all laid out.
-// - This method assumes that the Pane we're attempting to split is `target`,
-//   and this method should be called on the root of a tree of Panes.
-// - We'll walk down the tree attempting to find `target`. As we traverse the
-//   tree, we'll reduce the size passed to each subsequent recursive call. The
-//   size passed to this method represents how much space this Pane _will_ have
-//   to use.
-//   * If this pane is a leaf, and it's the pane we're looking for, use the
-//     available space to calculate which direction to split in.
-//   * If this pane is _any other leaf_, then just return nullopt, to indicate
-//     that the `target` Pane is not down this branch.
-//   * If this pane is a parent, calculate how much space our children will be
-//     able to use, and recurse into them.
-// Arguments:
-// - target: The Pane we're attempting to split.
-// - splitType: The direction we're attempting to split in.
-// - availableSpace: The theoretical space that's available for this pane to be able to split.
-// Return Value:
-// - nullopt if `target` is not this pane or a child of this pane, otherwise
-//   true iff we could split this pane, given `availableSpace`
-// Note:
-// - This method is highly similar to Pane::PreCalculateAutoSplit
-std::optional<bool> Pane::PreCalculateCanSplit(const std::shared_ptr<Pane> target,
-                                               SplitState splitType,
-                                               const winrt::Windows::Foundation::Size availableSpace) const
-{
-    if (_IsLeaf())
-    {
-        if (target.get() == this)
-        {
-            // If this pane is a leaf, and it's the pane we're looking for, use
-            // the available space to calculate which direction to split in.
-            const Size minSize = _GetMinSize();
-
-            if (splitType == SplitState::None)
-            {
-                return { false };
-            }
-
-            else if (splitType == SplitState::Vertical)
-            {
-                const auto widthMinusSeparator = availableSpace.Width - CombinedPaneBorderSize;
-                const auto newWidth = widthMinusSeparator * Half;
-
-                return { newWidth > minSize.Width };
-            }
-
-            else if (splitType == SplitState::Horizontal)
-            {
-                const auto heightMinusSeparator = availableSpace.Height - CombinedPaneBorderSize;
-                const auto newHeight = heightMinusSeparator * Half;
-
-                return { newHeight > minSize.Height };
-            }
-        }
-        else
-        {
-            // If this pane is _any other leaf_, then just return nullopt, to
-            // indicate that the `target` Pane is not down this branch.
-            return std::nullopt;
-        }
-    }
-    else
-    {
-        // If this pane is a parent, calculate how much space our children will
-        // be able to use, and recurse into them.
-
-        const bool isVerticalSplit = _splitState == SplitState::Vertical;
-        const float firstWidth = isVerticalSplit ?
-                                     (availableSpace.Width * _desiredSplitPosition) - PaneBorderSize :
-                                     availableSpace.Width;
-        const float secondWidth = isVerticalSplit ?
-                                      (availableSpace.Width - firstWidth) - PaneBorderSize :
-                                      availableSpace.Width;
-        const float firstHeight = !isVerticalSplit ?
-                                      (availableSpace.Height * _desiredSplitPosition) - PaneBorderSize :
-                                      availableSpace.Height;
-        const float secondHeight = !isVerticalSplit ?
-                                       (availableSpace.Height - firstHeight) - PaneBorderSize :
-                                       availableSpace.Height;
-
-        const auto firstResult = _firstChild->PreCalculateCanSplit(target, splitType, { firstWidth, firstHeight });
-        return firstResult.has_value() ? firstResult : _secondChild->PreCalculateCanSplit(target, splitType, { secondWidth, secondHeight });
-    }
-
-    // We should not possibly be getting here - both the above branches should
-    // return a value.
-    FAIL_FAST();
-}
-
 // Method Description:
 // - Split the focused pane in our tree of panes, and place the given
 //   TermControl into the newly created pane. If we're the focused pane, then
--- a/src/cascadia/TerminalApp/lib/Pane.h
+++ b/src/cascadia/TerminalApp/lib/Pane.h
@@ -51,7 +51,7 @@ public:
    void ClearActive();
    void SetActive();

-    void UpdateSettings(const winrt::TerminalApp::TerminalSettings& settings,
+    void UpdateSettings(const winrt::Microsoft::Terminal::Settings::TerminalSettings& settings,
                        const GUID& profile);
    void ResizeContent(const winrt::Windows::Foundation::Size& newSize);
    void Relayout();
@@ -64,9 +64,7 @@ public:
                                                                  const winrt::Microsoft::Terminal::TerminalControl::TermControl& control);
    float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
    std::optional<winrt::TerminalApp::SplitState> PreCalculateAutoSplit(const std::shared_ptr<Pane> target, const winrt::Windows::Foundation::Size parentSize) const;
-    std::optional<bool> PreCalculateCanSplit(const std::shared_ptr<Pane> target,
-                                             winrt::TerminalApp::SplitState splitType,
-                                             const winrt::Windows::Foundation::Size availableSpace) const;
+
    void Shutdown();
    void Close();

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dustin L. Howett	3dca4263d5	Migrate spelling-0.0.21 changes from main	2020-07-13 16:59:33 -07:00
Dustin L. Howett	462006ba51	Migrate spelling-0.0.19 changes from main	2020-07-13 16:59:33 -07:00
Michael Niksa	5b6d2e0708	change interface to not use Clusters. Just build a string and a clustermap vector.	2020-07-14 15:40:59 -07:00
Michael Niksa	ffe0e024b3	Go at the buffer a bit more directly and get some perf.	2020-07-14 15:40:55 -07:00