Migrate spelling-0.0.21 changes from main

We still need to reference MUX
    to get mdmerge happy, but we can't roll that up without rolling up the DLL
    and now we'll get duplicate types in WT.vcxproj. GAH. We'll need to have
    Remoting accept a callback to say "I encountered a commandline, someone,
    deal with it?", then have apphost register for that callback. So the flow
    is monarch->AppHost->AppLogic

NuGet.Config

@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <packageSources>
-        <clear />
-        <!-- Dependencies that we can turn on to force override for testing purposes before uploading. -->
+        <add key="NuGet.org" value="https://api.nuget.org/v3/index.json" />
+        <!-- Add repositories here to the list of available repositories -->
+        
+        <!-- Dependencies that we must carry because they're not on public nuget feeds right now. -->
         <!--<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" />
+		
+		<!-- Temporarily? use the feeds from our friends in MUX for Helix test stuff -->
+		<add key="dotnetfeed" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+        <add key="dnceng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+        <add key="MUX-Dependencies" value="https://pkgs.dev.azure.com/ms/microsoft-ui-xaml/_packaging/MUX-Dependencies/nuget/v3/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" />
+        <add key="OpenConsole - Internal" value="https://microsoft.pkgs.visualstudio.com/_packaging/OpenConsole/nuget/v3/index.json" />-->
     </packageSources>
-    <disabledPackageSources>
-        <clear />
-    </disabledPackageSources>
     <config>
         <add key="repositorypath" value=".\packages" />
     </config>

consolegit2gitfilters.json

@@ -21,8 +21,7 @@
     "/res/terminal/",
     "/doc/specs/",
     "/doc/cascadia/",
-    "/doc/user-docs/",
-    "/src/tools/MonarchPeasantSample/",
+    "/doc/user-docs/"
   ],
   "SuffixFilters": [
     ".dbb",
@@ -39,5 +38,5 @@
     ".rec",
     ".err",
     ".xlsx"
-  ]
+  ]    
 }

custom.props

@@ -3,9 +3,9 @@
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2021</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2020</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>7</VersionMinor>
+    <VersionMinor>6</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
   </PropertyGroup>
 </Project>

doc/AddASetting.md

@@ -11,7 +11,7 @@
         - Yes, the large majority of the `DEFINE_PROPERTYKEY` defs are the same, it's only the last byte of the guid that changes
 
 2. Add matching fields to Settings.hpp
-    - Add getters, setters, the whole drill.
+    - add getters, setters, the whole drill.
 
 3. Add to the propsheet
     - We need to add it to *reading and writing* the registry from the propsheet, and *reading* the link from the propsheet. Yes, that's weird, but the propsheet is smart enough to re-use ShortcutSerialization::s_SetLinkValues, but not smart enough to do the same with RegistrySerialization.

doc/TAEF.md

@@ -48,17 +48,3 @@ Invoke-OpenConsoleTests
 ```
 
 `Invoke-OpenConsoleTests` supports a number of options, which you can enumerate by running `Invoke-OpenConsoleTests -?`.
-
-
-### Debugging Tests
-
-If you want to debug a test, you can do so by using the TAEF /waitForDebugger flag, such as:
-
-	runut *Tests.dll /name:TextBufferTests::TestInsertCharacter /waitForDebugger
-
-Replace the test name with the one you want to debug.  Then, TAEF will begin executing the test and output something like this:
-
-	TAEF: Waiting for debugger - PID <some PID> @ IP <some IP address>
-
-You can then attach to that PID in your debugger of choice.  In Visual Studio, you can use Debug -> Attach To Process, or you could use WinDbg or whatever you want.
-Once the debugger attaches, the test will execute and your breakpoints will be hit.

doc/cascadia/AddASetting.md

@@ -1,397 +0,0 @@
-# Adding Settings to Windows Terminal
-
-Adding a setting to Windows Terminal is fairly straightforward. This guide serves as a reference on how to add a setting.
-
-## 1. Terminal Settings Model
-
-The Terminal Settings Model (`Microsoft.Terminal.Settings.Model`) is responsible for (de)serializing and exposing settings.
-
-### `GETSET_SETTING` macro
-
-The `GETSET_SETTING` macro can be used to implement inheritance for your new setting and store the setting in the settings model. It takes three parameters:
-- `type`: the type that the setting will be stored as
-- `name`: the name of the variable for storage
-- `defaultValue`: the value to use if the user does not define the setting anywhere
-
-### Adding a Profile setting
-
-This tutorial will add `CloseOnExitMode CloseOnExit` as a profile setting.
-
-1. In `Profile.h`, declare/define the setting:
-
-```c++
-GETSET_SETTING(CloseOnExitMode, CloseOnExit, CloseOnExitMode::Graceful)
-```
-
-2. In `Profile.idl`, expose the setting via WinRT:
-
-```c++
-Boolean HasCloseOnExit();
-void ClearCloseOnExit();
-CloseOnExitMode CloseOnExit;
-```
-
-3. In `Profile.cpp`, add (de)serialization and copy logic:
-
-```c++
-// Top of file:
-// - Add the serialization key
-static constexpr std::string_view CloseOnExitKey{ "closeOnExit" };
-
-// CopySettings() or Copy():
-// - The setting is exposed in the Settings UI
-profile->_CloseOnExit = source->_CloseOnExit;
-
-// LayerJson():
-// - get the value from the JSON
-JsonUtils::GetValueForKey(json, CloseOnExitKey, _CloseOnExit);
-
-// ToJson():
-// - write the value to the JSON
-JsonUtils::SetValueForKey(json, CloseOnExitKey, _CloseOnExit);
-```
-
-  - If the setting is not a primitive type, in `TerminalSettingsSerializationHelpers.h` add (de)serialization logic for the accepted values:
-
-```c++
-// For enum values...
-JSON_ENUM_MAPPER(::winrt::Microsoft::Terminal::Settings::Model::CloseOnExitMode)
-{
-    JSON_MAPPINGS(3) = {
-        pair_type{ "always", ValueType::Always },
-        pair_type{ "graceful", ValueType::Graceful },
-        pair_type{ "never", ValueType::Never },
-    };
-};
-
-// For enum flag values...
-JSON_FLAG_MAPPER(::winrt::Microsoft::Terminal::TerminalControl::CopyFormat)
-{
-    JSON_MAPPINGS(5) = {
-        pair_type{ "none", AllClear },
-        pair_type{ "html", ValueType::HTML },
-        pair_type{ "rtf", ValueType::RTF },
-        pair_type{ "all", AllSet },
-    };
-};
-
-// NOTE: This is also where you can add functionality for...
-// - overloaded type support (i.e. accept a bool and an enum)
-// - custom (de)serialization logic (i.e. coordinates)
-```
-
-### Adding a Global setting
-
-Follow the "adding a Profile setting" instructions above, but do it on the `GlobalAppSettings` files.
-
-### Adding an Action
-
-This tutorial will add the `openSettings` action.
-
-1. In `KeyMapping.idl`, declare the action:
-
-```c++
-// Add the action to ShortcutAction
-enum ShortcutAction
-{
-    OpenSettings
-}
-```
-
-2. In `ActionAndArgs.cpp`, add serialization logic:
-
-```c++
-// Top of file:
-// - Add the serialization key
-static constexpr std::string_view OpenSettingsKey{ "openSettings" };
-
-// ActionKeyNamesMap:
-// - map the new enum to the json key
-{ OpenSettingsKey, ShortcutAction::OpenSettings },
-```
-
-3. If the action should automatically generate a name when it appears in the Command Palette...
-```c++
-// In ActionAndArgs.cpp GenerateName() --> GeneratedActionNames
-{ ShortcutAction::OpenSettings, RS_(L"OpenSettingsCommandKey") },
-
-// In Resources.resw for Microsoft.Terminal.Settings.Model.Lib,
-// add the generated name
-// NOTE: Visual Studio presents the resw file as a table.
-//       If you choose to edit the file with a text editor,
-//       the code should look something like this...
-<data name="OpenSettingsCommandKey" xml:space="preserve">
-    <value>Open settings file</value>
-</data>
-```
-
-4. If the action supports arguments...
-  - In `ActionArgs.idl`, declare the arguments
-```c++
-[default_interface] runtimeclass OpenSettingsArgs : IActionArgs
-{
-    // this declares the "target" arg
-    SettingsTarget Target { get; };
-};
-```
-  - In `ActionArgs.h`, define the new runtime class
-```c++
-struct OpenSettingsArgs : public OpenSettingsArgsT<OpenSettingsArgs>
-{
-    OpenSettingsArgs() = default;
-
-    // adds a getter/setter for your argument, and defines the json key
-    GETSET_PROPERTY(SettingsTarget, Target, SettingsTarget::SettingsFile);
-    static constexpr std::string_view TargetKey{ "target" };
-
-    public:
-        hstring GenerateName() const;
-
-        bool Equals(const IActionArgs& other)
-        {
-            auto otherAsUs = other.try_as<OpenSettingsArgs>();
-            if (otherAsUs)
-            {
-                return otherAsUs->_Target == _Target;
-            }
-            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<OpenSettingsArgs>();
-            JsonUtils::GetValueForKey(json, TargetKey, args->_Target);
-            return { *args, {} };
-        }
-
-        IActionArgs Copy() const
-        {
-            auto copy{ winrt::make_self<OpenSettingsArgs>() };
-            copy->_Target = _Target;
-            return *copy;
-        }
-};
-```
-  - In `ActionArgs.cpp`, define `GenerateName()`. This is used to automatically generate a name when it appears in the Command Palette.
-  - In `ActionAndArgs.cpp`, add serialization logic:
-
-```c++
-// ActionKeyNamesMap --> argParsers
-{ ShortcutAction::OpenSettings, OpenSettingsArgs::FromJson },
-```
-
-### Adding an Action Argument
-
-Follow step 3 from the "adding an Action" instructions above, but modify the relevant `ActionArgs` files.
-
-## 2. Setting Functionality
-
-Now that the Terminal Settings Model is updated, Windows Terminal can read and write to the settings file. This section covers how to add functionality to your newly created setting.
-
-### App-level settings
-
-App-level settings are settings that affect the frame of Windows Terminal. Generally, these tend to be global settings. The `TerminalApp` project is responsible for presenting the frame of Windows Terminal. A few files of interest include:
-- `TerminalPage`: XAML control responsible for the look and feel of Windows Terminal
-- `AppLogic`: WinRT class responsible for window-related issues (i.e. the titlebar, focus mode, etc...)
-
-Both have access to a `CascadiaSettings` object, for you to read the loaded setting and update Windows Terminal appropriately.
-
-### Terminal-level settings
-
-Terminal-level settings are settings that affect a shell session. Generally, these tend to be profile settings. The `TerminalApp` project is responsible for packaging this settings from the Terminal Settings Model to the terminal instance. There are two kinds of settings here:
-- `IControlSettings`:
-  - These are settings that affect the `TerminalControl` (a XAML control that hosts a shell session).
-  - Examples include background image customization, interactivity behavior (i.e. selection), acrylic and font customization.
-  - The `TerminalControl` project has access to these settings via a saved `IControlSettings` member.
-- `ICoreSettings`:
-  - These are settings that affect the `TerminalCore` (a lower level object that interacts with the text buffer).
-  - Examples include initial size, history size, and cursor customization.
-  - The `TerminalCore` project has access to these settings via a saved `ICoreSettings` member.
-
-`TerminalApp` packages these settings into a `TerminalSettings : IControlSettings, ICoreSettings` object upon creating a new terminal instance. To do so, you must submit the following changes:
-- Declare the setting in `IControlSettings.idl` or `ICoreSettings.idl` (whichever is relevant to your setting). If your setting is an enum setting, declare the enum here instead of in the `TerminalSettingsModel` project.
-- In `TerminalSettings.h`, declare/define the setting...
-```c++
-// The GETSET_PROPERTY macro declares/defines a getter setter for the setting.
-// Like GETSET_SETTING, it takes in a type, name, and defaultValue.
-GETSET_PROPERTY(bool, UseAcrylic, false);
-```
-- In `TerminalSettings.cpp`...
-  - update `_ApplyProfileSettings` for profile settings
-  - update `_ApplyGlobalSettings` for global settings
-  - If additional processing is necessary, that would happen here. For example, `backgroundImageAlignment` is stored as a `ConvergedAlignment` in the Terminal Settings Model, but converted into XAML's separate horizontal and vertical alignment enums for packaging.
-
-### Actions
-
-Actions are packaged as an `ActionAndArgs` object, then handled in `TerminalApp`. To add functionality for actions...
-- In the `ShortcutActionDispatch` files, dispatch an event when the action occurs...
-```c++
-// ShortcutActionDispatch.idl
-event Windows.Foundation.TypedEventHandler<ShortcutActionDispatch, Microsoft.Terminal.Settings.Model.ActionEventArgs> OpenSettings;
-
-// ShortcutActionDispatch.h
-TYPED_EVENT(OpenSettings, TerminalApp::ShortcutActionDispatch, Microsoft::Terminal::Settings::Model::ActionEventArgs);
-
-// ShortcutActionDispatch.cpp --> DoAction()
-// - dispatch the appropriate event
-case ShortcutAction::OpenSettings:
-{
-    _OpenSettingsHandlers(*this, eventArgs);
-    break;
-}
-```
-- In `TerminalPage` files, handle the event...
-```c++
-// TerminalPage.h
-// - declare the handler
-void _HandleOpenSettings(const IInspectable& sender, const Microsoft::Terminal::Settings::Model::ActionEventArgs& args);
-
-// TerminalPage.cpp --> _RegisterActionCallbacks()
-// - register the handler
-_actionDispatch->OpenSettings({ this, &TerminalPage::_HandleOpenSettings });
-
-// AppActionHandlers.cpp
-// - direct the function to the right place and call a helper function
-void TerminalPage::_HandleOpenSettings(const IInspectable& /*sender*/,
-                                       const ActionEventArgs& args)
-{
-    // NOTE: this if-statement can be omitted if the action does not support arguments
-    if (const auto& realArgs = args.ActionArgs().try_as<OpenSettingsArgs>())
-    {
-        _LaunchSettings(realArgs.Target());
-        args.Handled(true);
-    }
-}
-```
-
-`AppActionHandlers` vary based on the action you want to perform. A few useful helper functions include:
-- `_GetFocusedTab()`: retrieves the focused tab
-- `_GetActiveControl()`: retrieves the active terminal control
-- `_GetTerminalTabImpl()`: tries to cast the given tab as a `TerminalTab` (a tab that hosts a terminal instance)
-
-
-## 3. Settings UI
-
-### Exposing Enum Settings
-If the new setting supports enums, you need to expose a map of the enum and the respective value in the Terminal Settings Model's `EnumMappings`:
-
-```c++
-// EnumMappings.idl
-static Windows.Foundation.Collections.IMap<String, Microsoft.Terminal.Settings.Model.CloseOnExitMode> CloseOnExitMode { get; };
-
-// EnumMappings.h
-static winrt::Windows::Foundation::Collections::IMap<winrt::hstring, CloseOnExitMode> CloseOnExitMode();
-
-// EnumMappings.cpp
-// - this macro leverages the json enum mapper in TerminalSettingsSerializationHelper to expose
-//   the mapped values across project boundaries
-DEFINE_ENUM_MAP(Model::CloseOnExitMode, CloseOnExitMode);
-```
-
-### Binding and Localizing the Enum Setting
-
-Find the page in the Settings UI that the new setting fits best in. In this example, we are adding `LaunchMode`.
-1. In `Launch.idl`, expose the bindable setting...
-```c++
-// Expose the current value for the setting
-IInspectable CurrentLaunchMode;
-
-// Expose the list of possible values
-Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> LaunchModeList { get; };
-```
-
-2. In `Launch.h`, declare the bindable enum setting...
-```c++
-// the GETSET_BINDABLE_ENUM_SETTING macro accepts...
-// - name: the name of the setting
-// - enumType: the type of the setting
-// - settingsModelName: how to retrieve the setting (use State() to get access to the settings model)
-// - settingNameInModel: the name of the setting in the terminal settings model
-GETSET_BINDABLE_ENUM_SETTING(LaunchMode, Model::LaunchMode, State().Settings().GlobalSettings, LaunchMode);
-```
-
-3. In `Launch.cpp`, populate these functions...
-```c++
-// Constructor (after InitializeComponent())
-// the INITIALIZE_BINDABLE_ENUM_SETTING macro accepts...
-// - name: the name of the setting
-// - enumMappingsName: the name from the TerminalSettingsModel's EnumMappings
-// - enumType: the type for the enum
-// - resourceSectionAndType: prefix for the localization
-// - resourceProperty: postfix for the localization
-INITIALIZE_BINDABLE_ENUM_SETTING(LaunchMode, LaunchMode, LaunchMode, L"Globals_LaunchMode", L"Content");
-```
-
-4. In `Resources.resw` for Microsoft.Terminal.Settings.Editor, add the localized text to expose each enum value. Use the following format: `<SettingGroup>_<SettingName><EnumValue>.Content`
-  - `SettingGroup`:
-    - `Globals` for global settings
-    - `Profile` for profile settings
-  - `SettingName`:
-    - the Pascal-case format for the setting type (i.e. `LaunchMode` for `"launchMode"`)
-  - `EnumValue`:
-    - the json key for the setting value, but with the first letter capitalized (i.e. `Focus` for `"focus"`)
-  - The resulting resw key should look something like this `Globals_LaunchModeFocus.Content`
-  - This is the text that will be used in your control
-
-### Updating the UI
-
-When adding a setting to the UI, make sure you follow the [UWP design guidance](https://docs.microsoft.com/windows/uwp/design/).
-
-#### Enum Settings
-
-Now, create a XAML control in the relevant XAML file. Use the following tips and tricks to style everything appropriately:
-- Wrap the control in a `ContentPresenter` adhering to the `SettingContainerStyle` style
-- Bind `SelectedItem` to the relevant `Current<Setting>` (i.e. `CurrentLaunchMode`). Ensure it's a TwoWay binding
-- Bind `ItemsSource` to `<Setting>List` (i.e. `LaunchModeList`)
-- Set the ItemTemplate to the `Enum<ControlType>Template` (i.e. `EnumRadioButtonTemplate` for radio buttons)
-- Set the style to the appropriate one in `CommonResources.xaml`
-
-```xml
-<!--Launch Mode-->
-<ContentPresenter Style="{StaticResource SettingContainerStyle}">
-    <muxc:RadioButtons x:Uid="Globals_LaunchMode"
-                       SelectedItem="{x:Bind CurrentLaunchMode, Mode="TwoWay"}"
-                       ItemsSource="{x:Bind LaunchModeList}"
-                       ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
-                       Style="{StaticResource RadioButtonsSettingStyle}"/>
-</ContentPresenter>
-```
-
-To add any localized text, add a `x:Uid`, and access the relevant property via the Resources.resw file. For example, `Globals_LaunchMode.Header` sets the header for this control. You can also set the tooltip text like this:
-`Globals_DefaultProfile.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip`.
-
-#### Non-Enum Settings
-
-Continue to reference `CommonResources.xaml` for appropriate styling and wrap the control with a similar `ContentPresenter`. However, instead of binding to the `Current<Setting>` and `<Setting>List`, bind directly to the setting via the state. Binding a setting like `altGrAliasing` should look something like this:
-```xml
-<!--AltGr Aliasing-->
-<ContentPresenter Style="{StaticResource SettingContainerStyle}">
-    <CheckBox x:Uid="Profile_AltGrAliasing"
-              IsChecked="{x:Bind State.Profile.AltGrAliasing, Mode=TwoWay}"
-              Style="{StaticResource CheckBoxSettingStyle}"/>
-</ContentPresenter>
-```
-
-#### Profile Settings
-
-If you are specifically adding a Profile setting, in addition to the steps above, you need to make the setting observable by modifying the `Profiles` files...
-```c++
-// Profiles.idl --> ProfileViewModel
-// - this declares the setting as observable using the type and the name of the setting
-OBSERVABLE_PROJECTED_SETTING(Microsoft.Terminal.Settings.Model.CloseOnExitMode, CloseOnExit);
-
-// Profiles.h --> ProfileViewModel
-// - this defines the setting as observable off of the _profile object
-OBSERVABLE_PROJECTED_SETTING(_profile, CloseOnExit);
-
-// Profiles.h --> ProfileViewModel
-// - if the setting cannot be inherited by another profile (aka missing the Clear() function), use the following macro instead:
-PERMANENT_OBSERVABLE_PROJECTED_SETTING(_profile, Guid);
-```
-
-The `ProfilePageNavigationState` holds a `ProfileViewModel`, which wraps the `Profile` object from the Terminal Settings Model. The `ProfileViewModel` makes all of the profile settings observable.
-
-### Actions
-
-Actions are not yet supported in the Settings UI.

doc/cascadia/profiles.schema.json

@@ -93,8 +93,6 @@
         "scrollDownPage",
         "scrollUp",
         "scrollUpPage",
-        "scrollToBottom",
-        "scrollToTop",
         "sendInput",
         "setColorScheme",
         "setTabColor",
@@ -105,7 +103,6 @@
         "toggleFocusMode",
         "toggleFullscreen",
         "togglePaneZoom",
-        "toggleReadOnlyMode",
         "toggleShaderEffects",
         "wt",
         "unbound"
@@ -372,13 +369,6 @@
             "splitMode": {
               "default": "duplicate",
               "description": "Control how the pane splits. Only accepts \"duplicate\" which will duplicate the focused pane's profile into a new pane."
-            },
-            "size": {
-              "default": 0.5,
-              "description": "Specify how large the new pane should be, as a fraction of the current pane's size. 1.0 would be 'all of the current pane', and 0.0 is 'None of the parent'. Accepts floating point values from 0-1 (default 0.5).",
-              "maximum": 1,
-              "minimum": 0,
-              "type": "number"
             }
           }
         }
@@ -635,11 +625,6 @@
           "description": "When set to true, a selection is immediately copied to your clipboard upon creation. When set to false, the selection persists and awaits further action.",
           "type": "boolean"
         },
-        "focusFollowMouse": {
-          "default": false,
-          "description": "When set to true, the terminal will focus the pane on mouse hover.",
-          "type": "boolean"
-        },
         "copyFormatting": {
           "default": true,
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -664,10 +649,6 @@
           "description": "Sets the default profile. Opens by clicking the \"+\" icon or typing the key binding assigned to \"newTab\".",
           "type": "string"
         },
-        "startupActions": {
-          "description": "Sets the list of actions to apply if no command line is provided. Uses the same format as command line arguments",
-          "type": "string"
-        },
         "disabledProfileSources": {
           "description": "Disables all the dynamic profile generators in this list, preventing them from adding their profiles to the list of profiles on startup.",
           "items": {
@@ -941,10 +922,9 @@
         },
         "cursorShape": {
           "default": "bar",
-          "description": "Sets the shape of the cursor. Possible values:\n -\"bar\" ( ┃, default )\n -\"doubleUnderscore\" ( ‗ )\n -\"emptyBox\" ( ▯ )\n -\"filledBox\" ( █ )\n -\"underscore\" ( ▁ )\n -\"vintage\" ( ▃ )",
+          "description": "Sets the shape of the cursor. Possible values:\n -\"bar\" ( ┃, default )\n -\"emptyBox\" ( ▯ )\n -\"filledBox\" ( █ )\n -\"underscore\" ( ▁ )\n -\"vintage\" ( ▃ )",
           "enum": [
             "bar",
-            "doubleUnderscore",
             "emptyBox",
             "filledBox",
             "underscore",

doc/specs/#2871 - Pane Navigation/#2871 - Pane Navigation.md

@@ -1,302 +0,0 @@
----
-author: Mike Griese @zadjii-msft
-created on: 2020-11-23
-last updated: 2020-12-15
-issue id: #2871
----
-
-# Focus Pane Actions
-
-## Abstract
-
-Currently, the Terminal only allows users to navigate through panes
-_directionally_. However, we might also want to allow a user to navigate through
-panes in most recently used order ("MRU" order), or to navigate directly to a
-specific pane. This spec proposes some additional actions in order to enable
-these sorts of scenarios.
-
-## Background
-
-### Inspiration
-
-`tmux` allows the user to navigate through panes using its `select-pane`
-command. The `select-pane` command works in the following way:
-
-```
-select-pane [-DLlMmRU] [-T title] [-t target-pane]
-
-     Make pane target-pane the active pane in window target-window, or set its
-     style (with -P).  If one of -D, -L, -R, or -U is used, respectively the
-     pane below, to the left, to the right, or above the target pane is used.
-     -l is the same as using the last-pane command.
-
-     -m and -M are used to set and clear the marked pane.  There is one marked
-     pane at a time, setting a new marked pane clears the last.  The marked pane
-     is the default target for -s to join-pane, swap-pane and swap-window.
-```
-_from `man tmux`_.
-
-The Terminal currently allows the user to navigate through panes with the
-`moveFocus` action, which only accepts a `direction` to move in.
-
-Additionally, the Terminal allows movement between tabs with the `nextTab` and
-`prevTab` actions, who move between tabs either in-order or in MRU order.
-Furthermore, these actions may or may not display the "tab switcher" user
-interface, based on the value of `tabSwitcherMode`.
-
-### User Stories
-
-* **Scenario 1**: A user who wants to be able to split the window into 4 equal
-  corners from the commandline. Currently this isn't possible, because the user
-  cannot move focus during the startup actions - `split-pane` actions always end
-  up splitting the current leaf in the tree of panes. (see [#5464])
-* **Scenario 2**: A user who wants to quickly navigate to the previous pane they
-  had opened. (see [#2871])
-* **Scenario 3**: A user who wants to bind a keybinding like <kbd>alt+1</kbd>,
-  <kbd>alt+2</kbd>, etc to immediately focus the first, second, etc. pane in a
-  tab. (see [#5803])
-
-### Future Considerations
-
-There's been talk of updating the advanced tab switcher to also display panes,
-in addition to just tabs. This would allow users to navigate through the ATS
-directly to a pane, and see all the panes in a tab. Currently, `tabSwitcherMode`
-changes the behavior of `nextTab`, `prevTab` - should we just build the
-`paneSwitcherMode` directly into the action we end up designing?
-
-## Solution Design
-
-Does using the pane switcher with a theoretical `focusPane(target=id)` action
-even make sense? Certainly not! That's like `switchToTab(index=id)`, the user
-already knows which tab they want to go to, there's no reason to pop an
-ephemeral UI in front of them.
-
-Similarly, it almost certainly doesn't make sense to display the pane switcher
-while moving focus directionally. Consider moving focus with a key bound to the
-arrow keys. Displaying another UI in front of them while moving focus with the
-arrow keys would be confusing.
-
-Addressing Scenario 1 is relatively easy. So long as we add any of the proposed
-actions, including the existing `moveFocus` action as a subcommand that can be
-passed to `wt.exe`, then the user should be able to navigate through the panes
-they've created with the startup commandline, and build the tree of panes
-however they see fit.
-
-Scenario 2 is more complicated, because MRU switching is always more
-complicated. Without a UI of some sort, there's no way to switch to another pane
-in the MRU order without also updating the MRU order as you go. So this would
-almost certainly necessitate a "pane switcher", like the tab switcher.
-
-
-### Proposal A: Add next, prev to moveFocus
-
-* `moveFocus(direction="up|down|left|right|next|prev")`
-
-* **Pros**:
-  - Definitely gets the "MRU Pane Switching" scenario working
-* **Cons**:
-  - Doesn't really address any of the other scenarios
-  - How will it play with pane switching in the UI?
-  - MRU switching without a dialog to track & display the MRU stack doesn't
-    really work - this only allows to the user to navigate to the most recently
-    used pane, or through all the panes in least-recently-used order. This is
-    because switching to the MRU pane _will update the MRU pane_.
-
-❌ This proposal is no longer being considered.
-
-### Proposal B: focusNextPane, focusPrevPane with order, useSwitcher args
-
-```json
-// Focus pane 1
-// - This is sensible, no arguments here
-{ "command": { "action": "focusPane", "id": 1 } },
-
-// Focus the next MRU pane
-// - Without the switcher, this can only go one pane deep in the MRU stack
-// - presumably once there's a pane switcher, it would default to enabled?
-{ "command": { "action": "focusNextPane", "order": "mru" } },
-
-// Focus the prev inOrder pane
-// - this seems straightforward
-{ "command": { "action": "focusPrevPane", "order": "inOrder" } },
-
-// Focus the next pane, in mru order, explicitly disable the switcher
-// - The user opted in to only being able to MRU switch one deep. That's fine, that's what they want.
-{ "command": { "action": "focusNextPane", "order": "mru", "useSwitcher": false} },
-
-// Focus the prev inOrder pane, explicitly with the switcher
-// - Maybe they disabled the switcher globally, but what it on for this action?
-{ "command": { "action": "focusPrevPane", "order": "inOrder", "useSwitcher": true } },
-```
-_From [discussion in the implementation
-PR](https://github.com/microsoft/terminal/pull/8183#issuecomment-729672645)_
-
-Boiled down, that's three actions:
-* `focusPane(target=id)`
-* `focusNextPane(order="inOrder|mru", useSwitcher=true|false)`
-* `focusPrevPane(order="inOrder|mru", useSwitcher=true|false)`
-
-* **Pros**:
-  - Everything is explicit, including the option to use the pane switcher (when
-    available)
-  - Adds support for in-order pane switching
-  - No "conditional parameters" - where providing one argument makes other
-    arguments invalid or ambiguous.
-* **Cons**:
-  - Doesn't really address any of the other scenarios
-  - What does the "next most-recently-used tab" even mean? How is it different
-    than "previous most-recently-used tab"? Semantically, these are the same
-    thing!
-  - No one's even asked for in-order pane switching. Is that a UX that even
-    really makes sense?
-
-❌ This proposal is no longer being considered.
-
-> 👉 **NOTE**: At this point, we stopped considering navigating in both MRU
-> "directions", since both the next and prev MRU pane are the same thing. We're
-> now using "last" to mean "the previous MRU pane".
-
-### Proposal C: One actions, combine the args
-
-* `moveFocus(target=id|"up|down|left|right|last")`
-
-* **Pros**:
-  - Absolutely the least complicated action to author. There's only one
-    parameter, `target`.
-  - No "conditional parameters".
-* **Cons**:
-  - How do we express this in the Settings UI? Mixed-type enums work fine for
-    the font weight, where each enum value has a distinct integer value it maps
-    to, but in this case, using `id` is entirely different from the other
-    directional values
-
-❌ This proposal is no longer being considered.
-
-### Proposal D: Two actions
-
-* `focusPane(target=id)`
-* `moveFocus(direction="up|down|left|right|last")`
-
-* **Pros**:
-  - Each action does explicitly one thing.
-* **Cons**:
-  - two actions for _similar_ behavior
-  - This now forks the "Direction" enum into "MoveFocusDirection" and
-    "ResizeDirection" (because `resizePane(last)` doesn't make any sense).
-
-This proposal doesn't really have any special consideration for the pane
-switcher UX. Neither of these actions would summon the pane switcher UX.
-
-### Proposal E: Three actions
-
-* `focusPane(target=id)`
-* `moveFocus(direction="up|down|left|right")`
-* `focusLastPane(usePaneSwitcher=false|true)`
-
-In this design, neither `focusPane` nor `moveFocus` will summon the pane
-switcher UI (even once it's added). However, the `focusLastPane` one _could_,
-and subsequent keypresses could pop you through the MRU stack, while it's
-visible? The pane switcher could then display the panes for the tab in MRU
-order, and the user could just use the arrow keys to navigate the list if they
-so choose.
-
-* **Pros**:
-  - Each action does explicitly one thing.
-  - Design accounts for future pane switcher UX
-* **Cons**:
-  - Three separate actions for similar behavior
-
-❌ This proposal is no longer being considered.
-
-### Proposal F: It's literally just tmux
-
-_Also known as the "one action to rule them all" proposal_
-
-`focusPane(target=id, direction="up|down|left|right|last")`
-
-Previously, this design was avoided, because what does `focusPane(target=4,
-direction=down)` do? Does it focus pane 4, or does it move focus down?
-
-`tmux` solves this in one action by just doing both!
-
-```
-Make pane target-pane the active pane ...  If one of -D, -L, -R, or -U is used,
-respectively the pane below, to the left, to the right, or above the target pane
-is used.
-```
-_from `man tmux`_.
-
-So `focusPane(target=1, direction=up)` will attempt to focus the pane above pane
-1. This action would not summon the pane switcher UX, even for
-`focusPane(direction=last)`
-
-* **Pros**:
-  - Fewest redundant actions
-* **Cons**:
-  - Is this intuitive? That combining the params would do both, with `target`
-    happening "first"?
-  - Assumes that there will be a separate action added in the future for "Open
-    the pane switcher (with some given ordering)"
-
-
-> 👉 **NOTE**: At this point, the author considered "Do we even want a separate
-> action to engage the tab switcher with panes expanded?" Perhaps panes being
-> visible in the tab switcher is just part fo the tab switcher's behavior. Maybe
-> there shouldn't be a separate "open the tab switcher with the panes expanded
-> to the pane I'm currently on, and the panes listed in MRU order" action.
-
-❌ This proposal is no longer being considered.
-
-## Conclusion
-
-After much discussion as a team, we decided that **Proposal D** would be the
-best option. We felt that there wasn't a need to add any extra configuration to
-invoke the "pane switcher" as anything different than the "tab switcher". The
-"pane switcher" should really just exist as a part of the functionality of the
-advanced tab switcher, not as it's own thing.
-
-Additionally, we concurred that the new "direction" value should be `prev`, not
-`last`, for consistency's sake.
-
-## UI/UX Design
-
-The only real UX being added with the agreed upon design is allowing the user to
-execute an action to move to the previously active pane within a single tab. No
-additional UX (including the pane switcher) is being prescribed in this spec at
-this time.
-
-## Potential Issues
-
-<table>
-<tr>
-<td><strong>Compatibility</strong></td>
-<td>
-
-We've only adding a single enum value to an existing enum. Since we're not
-changing the meaning of any of the existing values, we do not expect any
-compatibility issues there. Additionally, we're not changing the default value
-of the `direction` param of the `moveFocus` action, so there are no further
-compatibility concerns there. Furthermore, no additional parameters are being
-added to the `moveFocus` action that would potentially give it a different
-meaning.
-
-</td>
-</tr>
-</table>
-
-In the current design, there's no way to move through all the panes with a
-single keybinding. For example, if a user wanted to bind <kbd>Alt+]</kbd> to
-move to the "next" pane, and <kbd>Alt+[</kbd> to move to the "previous" one.
-These movements would necessarily need to be in-order traversals, since there's
-no way of doing multiple MRU steps.
-
-Fortunately, no one's really asked for traversing the panes in-order, so we're
-not really worried about this. Otherwise, it would maybe make sense for `last`
-to be the "previous MRU pane", and reserve `next`/`prev` for in-order traversal.
-
-
-[#2871]: https://github.com/microsoft/terminal/issues/2871
-[#5464]: https://github.com/microsoft/terminal/issues/5464
-[#5803]: https://github.com/microsoft/terminal/issues/5803
-
-

doc/specs/#3062 - Appearance configuration object for profiles.md

@@ -1,128 +0,0 @@
----
-author: Pankaj Bhojwani, pabhojwa@microsoft.com
-created on: 2020-11-20
-last updated: 2021-2-5
-issue id: #8345
----
-
-# Appearance configuration objects for profiles
-
-## Abstract
-
-This spec outlines how we can support 'configuration objects' in our profiles, which
-will allow us to render differently depending on the state of the control. For example, a
-control can be rendered differently if it's focused as compared to when it's unfocused.
-
-## Inspiration
-
-Reference: [#3062](https://github.com/microsoft/terminal/issues/3062)
-
-Users want there to be a more visible indicator than the one we have currently for which
-pane is focused and which panes are unfocused. This change would grant us that feature.
-
-## Solution Design
-
-The implementation design for appearance config objects centers around the recent change where inheritance was added to the
-`TerminalSettings` class in the Terminal Settings Model - i.e. different `TerminalSettings` objects can inherit from each other.
-The reason for this change was that we did not want a settings reload to erase any overrides `TermControl` may have made
-to the settings during runtime. By instead passing a child of the `TerminalSettings` object to the control, we can change
-the parent of the child during a settings reload without the overrides being erased (since those overrides live in the child).
-
-The idea behind unfocused appearance configurations is similar. We will pass in another `TerminalSettings` object to the control,
-which is simply a child that already has some overrides in it. When the control gains or loses focus, it simply switches between
-the two settings objects appropriately.
-
-### Allowed parameters
-
-For now, these states are meant to be entirely appearance-based. So, not all parameters which can be
-defined in a `Profile` can be defined in this new object (for example, we do not want parameters which
-would cause a resize in this object.) Here is the list of parameters we will allow:
-
-- Anything regarding colors: `colorScheme`, `foreground`, `background`, `cursorColor` etc
-- Anything regarding background image: `path`, `opacity`, `alignment`, `stretchMode`
-- `cursorShape`
-
-We may wish to allow further parameters in these objects in the future (like `bellStyle`?). The addition
-of further parameters can be discussed in the future and is out of scope for this spec.
-
-### Inheritance
-
-The inheritance model can be thought of as an 'all-or-nothing' approach in the sense that the `unfocusedAppearance` object
-is considered as a *single* setting instead of an object with many settings. We have chosen this model because it is cleaner
-and easier to understand than the alternative, where each setting within an `unfocusedAppearance` object has a parent from which
-it obtains its value.
-
-Note that when `TerminalApp` initializes a control, it creates a `TerminalSettings` object for that profile and passes the
-control a child of that object (so that the control can store overrides in the child, as described earlier). If an unfocused
-config is defined in the profile (or in globals/profile defaults), then `TerminalApp` will create a *child of that child*,
-put the relevant overrides in it, and pass that into the control as well. Thus, the inheritance of any undefined parameters
-in the unfocused config will be as follows:
-
-1. The unfocused config specified in the profile (or in globals/profile defaults)
-2. Overrides made by the terminal control
-3. The parent profile
-
-## UI/UX Design
-
-Users will be able to add a new setting to their profiles that will look like this:
-
-```
-"unfocusedAppearance":
-{
-    "colorScheme": "Campbell",
-    "cursorColor": "#888",
-    "cursorShape": "emptyBox",
-    "foreground": "#C0C0C0",
-    "background": "#000000"
-}
-```
-
-When certain appearance settings are changed via OSC sequences (such as the background color), only the focused/regular
-appearance will change and the unfocused one will remain unchanged. However, since the unfocused settings object inherits
-from the regular one, it will still apply the change (provided it does not define its own value for that setting).
-
-## Capabilities
-
-### Accessibility
-
-Does not affect accessibility.
-
-### Security
-
-Does not affect security.
-
-### Reliability
-
-This is another location in the settings where parsing/loading the settings may fail. However, this is the case
-for any new setting we add so I would say that this is a reasonable cost for this feature.
-
-### Compatibility
-
-Should not affect compatibility.
-
-### Performance, Power, and Efficiency
-
-Rapidly switching between many panes, causing several successive appearance changes in a short period of time, could
-potentially impact performance. However, regular/reasonable pane switching should not have a noticeable effect.
-
-## Potential Issues
-
-Inactive tabs will be 'rendered' in the background with the `UnfocusedRenderingParams` object, we need to make
-sure that switching to an inactive tab (and so causing the renderer to update with the 'normal' parameters)
-does not cause the window to flash/show a jarring indicator that the rendering values changed.
-
-## Future considerations
-
-We will need to decide how this will look in the settings UI.
-
-We may wish to add more states in the future (like 'elevated'). When that happens, we will need to deal with how
-these appearance objects can scale/layer over each other. We had a lot of discussion about this and could not find
-a suitable solution to the problem of multiple states being valid at the same time (like unfocused and elevated).
-This, along with the fact that it is uncertain if there even will be more states we would want to add led us to
-the conclusion that we should only support the unfocused state for now, and come back to this issue later. If there
-are no more states other than unfocused and elevated, we could allow combining them (like having an 'unfocused elevated' state).
-If there are more states, we could do the implementation as an extension rather than inherently supporting it.
-
-## Resources
-
-

doc/specs/#5000 - Process Model 2.0/#4472 - Windows Terminal Session Management.md

@@ -1,562 +0,0 @@
----
-author: Mike Griese @zadjii-msft
-created on: 2020-10-30
-last updated: 2020-02-05
-issue id: #4472
----
-
-# Windows Terminal Session Management
-
-## Abstract
-This document is intended to serve as an addition to the [Process Model 2.0
-Spec]. That document provides a big-picture overview of changes to the entirety
-of the Windows Terminal process architecture, including both the split of
-window/content processes, as well as the introduction of monarch/peasant
-processes. The focus of that document was to identify solutions to a set of
-scenarios that were closely intertwined, and establish these solutions would
-work together, without preventing any one scenario from working. What that
-document did not do was prescribe specific solutions to the given scenarios.
-
-This document offers a deeper dive on a subset of the issues in [#5000], to
-describe specifics for managing multiple windows with the Windows Terminal. This
-includes features such as:
-
-* Run `wt` in the current window ([#4472])
-* Single Instance Mode ([#2227])
-
-## Solution Design
-
-### Monarch and Peasant Processes
-
-This document assumes the reader is already familiar with the "Monarch and
-Peasant" architecture as detailed in the [Windows Terminal Process Model 2.0
-Spec]. As a quick summary:
-
-* Every Windows Terminal window is a "Peasant" process.
-* One of the Windows Terminal window processes is also the "Monarch" process.
-  The Monarch is picked randomly from the Terminal windows, and there is only
-  ever one Monarch process at a time.
-* Peasants can communicate with the monarch when certain state changes (such as
-  their window being activated), and the monarch can send commands to any of the
-  peasants.
-
-This architecture will be used to enable each of the following scenarios.
-
-### Scenario: Open new tabs in most recently used window
-
-A common feature of many browsers is that when a web URL is clicked somewhere,
-the web page is opened as a new tab in the most recently used window of the
-browser. This functionality is often referred to as "glomming", as the new tab
-"gloms" onto the existing window.
-
-Currently, the terminal does not support such a feature - every `wt` invocation
-creates a new window. With the monarch/peasant architecture, it'll now be
-possible to enable such a scenario.
-
-As each window is activated, it will call a method on the `Monarch` object
-(hosted by the monarch process) which will indicate that "I am peasant N, and
-I've been focused". The monarch will use those method calls to update its own
-internal stack of the most recently used windows.
-
-Whenever a new `wt.exe` process is launched, that process will _first_ ask the
-monarch if it should run the commandline in an existing window, or create its
-own window.
-
-![auto-glom-wt-exe](auto-glom-wt-exe.png)
-
-If glomming is enabled, the monarch will dispatch the commandline to the
-appropriate window for them to handle instead. To the user, it'll seem as if the
-tab just opened in the most recent window.
-
-Users should certainly be able to specify if they want new instances to glom
-onto the MRU window or not. You could imagine that currently, we default to the
-hypothetical value `"windowingBehavior": "useNew"`, meaning that each new wt gets
-its own new window.
-
-If glomming is disabled, then the Monarch will call back to the peasant and tell
-it to run the provided commandline. The monarch will use the return value of
-`ExecuteCommandline` to indicate that the calling process should create a window
-and become a peasant process, and run the commandline itself.
-
-#### Glomming within the same virtual desktop
-
-When links are opened in the new Edge browser, they will only glom onto an
-existing window if that window is open in the current virtual desktop. This
-seems like a good idea of a feature for the Terminal to follow as well.
-
-There must be some way for an application to determine which virtual desktop it
-is open on. We could use that information to have the monarch track the last
-active window _per-desktop_, and only glom when there's one on the current
-desktop.
-
-We could make the `windowingBehavior` property accept a variety of
-configurations:
-
-- `"useExisting"`: always glom to the most recent window, regardless of desktop.
-- `"useExistingOnSameDesktop"`: Only glom if there's an existing window on this
-  virtual desktop, otherwise create a new window. This will be the new default
-  value.
-- `"useNew"`: Never glom, always create a new window. This is technically the
-  current behavior of the Terminal.
-
-### Handling the current working directory
-
-Consider the following scenario: the user runs `wt -d .` in the address bar of
-explorer, and the monarch determines that this new tab should be created in an
-existing window. For clarity during this example, we will label the existing
-window WT[1], and the second `wt.exe` process WT[2].
-
-An example of this scenario is given in the following diagram:
-
-![single-instance-mode-cwd](single-instance-mode-cwd.png)
-
-In this scenario, we want the new tab to be spawned in the current working
-directory of WT[2], not WT[1]. So when WT[1] is about to run the commands that
-were passed to WT[2], WT[1] will need to:
-
-* First, stash its own CWD
-* Change to the CWD of WT[2]
-* Run the commands from WT[2]
-* Then return to its original CWD.
-
-So, as a part of the interface that a peasant uses to communicate the startup
-commandline to the monarch, we should also include the current working
-directory.
-
-### Scenario: Run `wt` in the current window
-
-One often requested scenario is the ability to run a `wt.exe` commandline in the
-current window, as opposed to always creating a new window. Presume we have the
-ability to communicate between different window processes. The logical extension
-of this scenario would be "run a `wt` commandline in _any_ given WT window".
-
-Each window process will have its own unique ID assigned to it by the monarch.
-This ID will be a positive number. Windows can also have names assigned to them.
-These names are strings that the user specifies. A window will always have an
-ID, but not necessarily a name. Running a command in a given window with ID N
-should be as easy as something like:
-
-```sh
-wt.exe --window N new-tab ; split-pane
-```
-
-(or for shorthand, `wt -w N new-tab ; split-pane`).
-
-More formally, we will add the following parameter to the top-level `wt`
-command:
-
-#### `--window,-w <window-id>`
-Run these commands in the given Windows Terminal session. This enables opening
-new tabs, splits, etc. in already running Windows Terminal windows.
-* If `window-id` is `0`, run the given commands in _the current window_.
-* If `window-id` is a negative number, or the reserved name `new`, run the
-  commands in a _new_ Terminal window.
-* If `window-id` is the ID or name of an existing window, then run the
-  commandline in that window.
-* If `window-id` is _not_ the ID or name of an existing window, create a new
-  window. That window will be assigned the ID or name provided in the
-  commandline. The provided subcommands will be run in that new window.
-* If `window-id` is omitted, then obey the value of `windowingBehavior` when
-  determining which window to run the command in.
-
-_Whenever_ `wt.exe` is started, it must _always_ pass the provided commandline
-first to the monarch process for handling. This is important for glomming
-scenarios (as noted above). The monarch will parse the commandline, determine
-which window the commandline is destined for, then call `ExecuteCommandline` on
-that peasant, who will then run the command.
-
-#### Running commands in the current window:`wt --window 0`
-
-If `wt -w 0 <commands>` is run _outside_ a WT instance, it could attempt to glom
-onto _the most recent WT window_ instead. This seems more logical than something
-like `wt --window last` or some other special value indicating "run this in the
-MRU window".<sup>[[2]](#footnote-2)</sup>
-
-That might be a simple, but **wrong**, implementation for "the current window".
-If the peasants always raise an event when their window is focused, and the
-monarch keeps track of the MRU order for peasants, then one could naively assume
-that the execution of `wt -w 0 <commands>` would always return the window the
-user was typing in, the current one. However, if someone were to do something
-like `sleep 10 ; wt -w 0 <commands>`, then the user could easily focus another
-WT window during the sleep, which would cause the MRU window to not be the same
-as the window executing the command.
-
-To solve this issue, we'll  other than
-attempting to use the `WT_SESSION` environment variable. If a `wt.exe` process
-is spawned and that's in its environment variables, it could try and ask the
-monarch for the peasant who's hosting the session corresponding to that GUID.
-This is more of a theoretical solution than anything else.
-
-In the past we've been reluctant to rely too heavily on `WT_SESSION`. However,
-an environment variable does seem to be the only reliable way to be confident
-where the window was created from. We could introduce another environment
-variable instead - `WT_WINDOW_ID`. That would allow us to shortcut the session
-ID lookup. However, I worry about exposing the window ID as an environment
-variable. If we do that, users will inevitably use that instead of the `wt -0`
-alias, which should take care of the work for them. Additionally, `WT_WINDOW_ID`
-wouldn't update in the child processes as tabs are torn out of windows to create
-new windows.
-
-Both solutions are prone to the user changing the value of the variable to some
-garbage value. If they do that, this lookup will most certainly not work as
-expected. Using the session ID (a GUID) instead of the window ID (an int) makes
-it less likely that they guess the ID of an existing instance.
-
-#### Running commands in a new window:`wt --window -1` / `wt --window new`
-
-If the user passes a negative number, or the reserved name `new` to the
-`--window` parameter, then we will always create a new window for that
-commandline, regardless of the value of `windowingBehavior`. This will allow
-users to do something like `wt -w -1 new-tab` to _always_ create a new window.
-
-#### `--window` in subcommands
-
-The `--window` parameter is a setting to `wt.exe` itself, not to one of its
-subcommands (like `new-tab` or `split-pane`). This means that all of the
-subcommands in a particular `wt` commandline will all be handled by the same
-session. For example, let us consider a user who wants to open a new tab in
-window 2, and split a new pane in window 3, all at once. The user _cannot_ do
-something like:
-
-```cmd
-wt -w 2 new-tab ; -w 3 split-pane
-```
-
-Instead, the user will need to separate the commands (by whatever their shell's
-own command delimiter is) and run two different `wt.exe` instances:
-
-```cmd
-wt -w 2 new-tab & wt -w 3 split-pane
-```
-
-This is done to make the parsing of the subcommands easier, and for the internal
-passing of arguments simpler. If the `--window` parameter were a part of each
-subcommand, then each individual subcommand's parser would need to be
-enlightened about that parameter, and then it would need to be possible for any
-single part of the commandline to call out to another process. It would be
-especially tricky then to coordinate the work being done across process here.
-The source process would need some sort of way to wait for the other process to
-notify the source that a particular subcommand completed, before allowing the
-source to dispatch the next part of the commandline.
-
-Overall, this is seen as unnecessarily complex, and dispatching whole sets of
-commands as a simpler solution.
-
-### Naming Windows
-
-It's not user-friendly to rely on automatically generated, invisible numbers to
-identify windows. There's not a great way of identifying which window is which.
-The user would need to track the IDs in their head manually. Instead, we'll
-allow the user to provide a string name for the window. This name can be used to
-address a window in addition to the ID.
-
-Names can be provided on the commandline, in the original commandline. For
-example, `wt -w foo nt` would name the new window "foo". Names can also be set
-with a new action, `NameWindow`<sup>[[3]](#footnote-3)</sup>. `name-window`
-could also be used as a subcommand. For example, `wt -w 4 name-window bar` would
-name window 4 "bar".
-
-To keep identities mentally distinct, we will disallow names that are integers
-(positive or negative). This will prevent users from renaming a window to `2`,
-then having `wt -w 2` be ambiguous as to which window it refers to.
-
-Names must also be unique. If a user attempts to set the name of the window to
-an already-used name, we'll need to ignore the name change. We could also
-display a "toast" or some other type of low-impact message to the user. That
-message would have some text like: "Unable to rename window. Another window with
-that name already exists".
-
-The Terminal will reserve the name `new`. It will also reserve any names
-starting with the character `_`. The user will not be allowed to set the window
-name to any of these reserved names. Reserving `_*` allows us to add other
-keywords in the future, without introducing a breaking change.
-
-## UI/UX Design
-
-### `windowingBehavior` details
-
-The following list gives greater breakdown of the values of `windowingBehavior`,
-and how they operate:
-
-* `"windowingBehavior": "useExisting", "useExistingOnSameDesktop"`:
-  **Browser-like glomming**
-  - New instances open in the current window by default.
-  - `newWindow` opens a new window.
-  - Tabs can be torn out to create new windows.
-  - `wt -w -1` opens a new window.
-* `"windowingBehavior": "useNew"`: No auto-glomming. This is **the current
-  behavior** of the Terminal.
-  - New instances open in new windows by default
-  - `newWindow` opens a new window
-  - Tabs can be torn out to create new windows.
-  - `wt -w -1` opens a new window.
-
-We'll be changing the default behavior from `useNew` to
-`useExistingOnSameDesktop`. This will be more consistent with other tabbed
-applications.
-
-## Concerns
-
-<table>
-<tr>
-<td><strong>Accessibility</strong></td>
-<td>
-
-There is no expected accessibility impact from this feature. Each window will
-handle UIA access as it normally does.
-
-In the future, we could consider exposing the window IDs and/or names via UIA.
-
-</td>
-</tr>
-<tr>
-<td><strong>Security</strong></td>
-<td>
-
-Many security concerns have already be covered in greater detail in the parent
-spec, [Process Model 2.0 Spec].
-
-When attempting to instantiate the Monarch, COM will only return the object from
-a server running at the same elevation level. We don't need to worry about
-unelevated peasants connecting to the elevated Monarch, or vice-versa.
-
-</td>
-</tr>
-<tr>
-<td><strong>Reliability</strong></td>
-<td>
-
-We will need to be careful when working with objects hosted by another process.
-Any work we do with it MUST be in a try/catch, because at _any_ time, the other
-process could be killed. At any point, a window process could be killed. Both
-the monarch and peasant code will need to be redundant to such a scenario, and
-if the other process is killed, make sure to display an appropriate error and
-either recover or exit gracefully.
-
-In any and all these situations, we will want to try and be as verbose as
-possible in the logging. This will make tracking which process had the error
-occur easier.
-
-</td>
-</tr>
-<tr>
-<td><strong>Compatibility</strong></td>
-<td>
-
-We will be changing the default behavior of the Terminal to auto-glom to the
-most-recently used window on the same desktop in the course of this work, which
-will be a breaking UX change. This is behavior that can be reverted with the
-`"windowingBehavior": "useNew"` setting.
-
-We acknowledge that this is a pretty massive change to the default experience of
-the Terminal. We're planning on doing some polling of users to determine which
-behavior they want by default. Additionally, we'll be staging the rollout of
-this feature, using the Preview builds of the Terminal. The release notes that
-first include it will call extra attention to this feature. We'll ask that users
-provide their feedback in a dedicated thread, so we have time to collect
-opinions from users before rolling the change out to all users.
-
-We may choose to only change the default to `useExistingOnSameDesktop` once tab
-tear out is available, so users who are particularly unhappy about this change
-can still tear out the tab (if they can't be bothered to change the setting).
-
-</td>
-</tr>
-<tr>
-<td><strong>Performance, Power, and Efficiency</strong></td>
-<td>
-
-There's no dramatic change expected here. There may be a minor delay in the
-spawning of new terminal instances, due to requiring cross-process hops for the
-communication between monarch and peasant processes.
-
-</td>
-</tr>
-</table>
-
-## Potential Issues
-
-### Mixed Elevation Levels
-
-As of December 2020, we're no longer pursuing a "mixed-elevation" scenario for
-the Terminal. This makes many of the cross-elevation scenarios simpler. Elevated
-and unelevated `wt` instances will always remain separate. The different
-elevation levels will maintain separate lists of window IDs. If the user is
-running both an elevated and unelevated window, then there will be two monarchs.
-One elevated, and the other unelevated.
-
-There will also be some edge cases when handling the commandline that will need
-special care. Say the user wanted to open a new tab in the elevated window, from
-and unelevated `explorer.exe`. That would be a commandline like:
-
-```sh
-wt -w 0 new-tab -d . --elevated
-```
-
-Typically we first determine which window the commandline is intended for, then
-dispatch it to that window. In this case, the `-w 0` will cause us to pass the
-commandline to the current unelevated window. Then, that window will try to open
-an elevated tab, fail, and create a new `wt.exe` process. This second `wt.exe`
-process will lose the `-w 0` context. It won't inform the elevated monarch that
-this commandline should be run in the active session.
-
-We will need to make sure that special care is taken when creating elevated
-instances that we maintain the `--window` parameter passed to the Terminal.
-
-### `wt` Startup Commandline Options
-
-There are a few commandline options which can be provided to `wt.exe` which
-don't make sense to pass to another session. These options include (but are not
-limited to):
-
-* `--initialSize r,c`
-* `--initialPosition x,y`
-* `--fullscreen`, `--maximized`, etc.
-
-When we're passing a commandline to another instance to handle, these arguments
-will be ignored. they only apply to the initial creation of a window.
-`--initialSize 32, 120` doesn't make sense if the window already has a size.
-
-On startup of a new window, we currently assume that the first command is always
-`new-tab`. When passing commandlines to existing windows, we won't need to make
-that assumption anymore. There will already be existing tabs.
-
-### Monarch MRU Window Tracking
-
-As stated above, the monarch is responsible for tracking the MRU window stack.
-However, when the monarch is closed, this state will be lost. The new monarch
-will be elected, but it will be unable to ask the old monarch for the MRU
-order of the windows.
-
-We had previously considered an _acceptable_ UX when this would occur. We would
-randomize the order (with the new monarch becoming the MRU window). If someone
-noticed this bug and complained, then we had a theoretical solution prepared.
-The peasants could inform not only the monarch, but _all other peasants_ when
-they become activated. This would mean all peasants are simultaneously tracking
-the MRU stack. This would mean that any given peasant would be prepared always
-to become the monarch.
-
-A simpler solution though would be to not track the MRU stack in the Monarch at
-all. Instead, each peasant could just track internally when they were last
-activated. The Monarch wouldn't track any state itself. It would be distributed
-across all the peasants. The Monarch could then iterate over the list of
-peasants and find the one with the newest `LastActivated` timestamp.
-
-Now, when a Monarch dies, the new Peasant doesn't have to come up with the stack
-itself. All the other Peasants keep their state. The new Monarch can query them
-and get the same answer the old Monarch would have.
-
-We could further optimize this by having the Monarch also track the stack. Then,
-the monarch could query the MRU window quickly. The `LastActivated` timestamps
-would only be used by a new Monarch when it is elected, to reconstruct the MRU
-stack.
-
-## Implementation Plan
-
-This is a list of actionable tasks generated as described by this spec:
-
-* [ ] Add support for `wt.exe` processes to be Monarchs and Peasants, and
-  communicate that state between themselves. This task does not otherwise add
-  any user-facing features, merely an architectural update.
-* [ ] Add support for the `windowingBehavior` setting as a boolean. Opening new
-  WT windows will conditionally glom to existing windows.
-* [ ] Add support for per-desktop `windowingBehavior`, by adding the support for
-  the enum values `"useExisting"`, `"useExistingOnSameDesktop"` and `"useNew"`.
-* [ ] Add support for `wt.exe` to pass commandlines intended for another window
-  to the monarch, then to the intended window, with the `--window,-w
-  window-id` commandline parameter.
-* [ ] Add support for targeting and naming windows via the `-w` parameter on the
-  commandline
-* [ ] Add a `NameWindow` action, subcommand that allows the user to set the name
-  for the window.
-* [ ] Add an action that will cause all windows to briefly display a overlay
-  with the current window ID and name. This would be something like the
-  "identify" feature of the Windows "Display" settings.
-
-## Future considerations
-
-* What if the user wanted to pipe a command to a pane in an existing window?
-  ```sh
-  man ping > wt -w 0 split-pane cat
-  ```
-  Is there some way for WT to pass its stdin/out handles to the child process
-  it's creating? This is _not_ related to the current spec at hand, just
-  something the author considered while writing the spec. This likely belongs
-  over in [#492], or in its own spec.
-  - Or I suppose, with less confusion, someone could run `wt -w 0 split-pane --
-    man ping > cat`. That's certainly more sensible, and wouldn't require any
-    extra work.
-* "Single Instance Mode" is a scenario in which there is only ever one single WT
-  window. A user might want this functionality to only ever allow a single
-  terminal window to be open on their desktop. This is especially frequently
-  requested in combination with "quake mode", as discussed in [#653]. When Single
-  Instance Mode is active, and the user runs a new `wt.exe` commandline, it will
-  always end up running in the existing window, if there is one.
-
-  An earlier version of this spec proposed a new value of `glomToLastWindow`.
-  (`glomToLastWindow` was later renamed `windowingBehavior`). The `always` value
-  would disable tab tear out<sup>[[1]](#footnote-1)</sup>. It would additionally
-  disable the `newWindow` action, and prevent `wt -w new` from opening a new
-  window.
-
-  In discussion, it was concluded that this setting didn't make sense. Why did the
-  `glomToLastWindow` setting change the behavior of tear out? Single Instance Mode
-  is most frequently requested in regards to quake mode. We're leaving the
-  implementation of true single instance mode to that spec.
-* It was suggested in review that we could auto-generate names for windows, from
-  some list of words. Prior art could be the URLS for gfycat.com or
-  what3words.com, which use three random words. I believe `docker` also assigns
-  names from a random selection of `adjective`+`name`. This is an interesting
-  idea, and something that could be pursued in the future.
-    - This would be a massive pain to localize though, hence why this is left as
-      a future consideration.
-* We will _need_ to provide a commandline tool to list windows and their IDs &
-  names. We're thinking a list of windows, their IDs, names, PIDs, and the title
-  of the window.
-
-  Currently we're stuck with `wt.exe` which is a GUI application, and cannot
-  print to the console. Our need is now fairly high for the ability to print
-  info to the console. To remedy this, we'll need to ship another helper exe as
-  a commandline tool for working with the terminal. The design for this is left
-  for the future.
-
-## Footnotes
-
-<a name="footnote-1"><a>[1]: While tear-out is a separate track of work from
-session management in general, this setting could be implemented along with this
-set of features, and later used to control tear out as well.
-
-<a name="footnote-2"><a>[2]: Since we're reserving the keyword `new` to mean "a
-new window", then we could also reserve `last` or `current` as an alias for "the
-current window".
-
-<a name="footnote-3"><a>[3]: We currently have two actions for renaming _tabs_
-in the Terminal: `renameTab(name)`, and `openTabRenamer()`. We will likely
-similarly need `nameWindow(name)` and `openWindowNamer()`. `openWindowNamer`
-could display a dialog to allow the user to rename the current window at
-runtime.
-
-
-## Resources
-
-* [Tab Tear-out in the community toolkit] - this document proved invaluable to
-  the background of tearing a tab out of an application to create a new window.
-
-<!-- Footnotes -->
-
-[#5000]: https://github.com/microsoft/terminal/issues/5000
-[#1256]: https://github.com/microsoft/terminal/issues/1256
-[#4472]: https://github.com/microsoft/terminal/issues/4472
-[#2227]: https://github.com/microsoft/terminal/issues/2227
-[#653]: https://github.com/microsoft/terminal/issues/653
-[#1032]: https://github.com/microsoft/terminal/issues/1032
-[#632]: https://github.com/microsoft/terminal/issues/632
-[#492]: https://github.com/microsoft/terminal/issues/492
-[#4000]: https://github.com/microsoft/terminal/issues/4000
-[#7972]: https://github.com/microsoft/terminal/pull/7972
-[#961]: https://github.com/microsoft/terminal/issues/961
-[`30b8335`]: https://github.com/microsoft/terminal/commit/30b833547928d6dcbf88d49df0dbd5b3f6a7c879
-[Tab Tear-out in the community toolkit]: https://github.com/windows-toolkit/Sample-TabView-TearOff
-[Quake mode scenarios]: https://github.com/microsoft/terminal/issues/653#issuecomment-661370107
-[`ISwapChainPanelNative2::SetSwapChainHandle`]: https://docs.microsoft.com/en-us/windows/win32/api/windows.ui.xaml.media.dxinterop/nf-windows-ui-xaml-media-dxinterop-iswapchainpanelnative2-setswapchainhandle
-[Process Model 2.0 Spec]: https://github.com/microsoft/terminal/blob/main/doc/specs/%235000%20-%20Process%20Model%202.0/%235000%20-%20Process%20Model%202.0.md

doc/specs/#597 - Tab Sizing.md

@@ -1,95 +0,0 @@
----
-author: Kayla Cinnamon @cinnamon-msft
-created on: 2020-01-03
-last updated: 2020-01-03
-issue id: 597
----
-
-# Tab Sizing
-
-## Abstract
-
-This spec outlines the tab sizing feature. This is an application-level feature that is not profile-specific (at least for now).
-
-Global properties that encompass tab sizing:
-
-* `tabWidthMode` (accepts pre-defined values for tab sizing behavior)
-* `tabWidthMin` (can never be smaller than the icon width)
-* `tabWidthMax` (can never be wider than the tab bar)
-
-Acceptable values for `tabWidthMode`:
-
-* [default] `equal` (all tabs are sized the same, regardless of tab title length)
-* `titleLength` (width of tab contains entire tab title)
-
-## Inspiration
-
-Other browsers and terminals have varying tab width behavior, so we should give people options.
-
-## Solution Design
-
-`tabWidthMode` will be a global setting that will accept the following strings:
-
-* `equal`
-    * All tabs are equal in width
-    * If the tab bar has filled, tabs will shrink as additional tabs are added
-    * Utilizes the `equal` setting from WinUI's TabView
-
-* `titleLength`
-    * Tab width varies depending on title length
-    * Width of tab will fit the whole tab title
-    * Utilizes the `sizeToContent` setting from WinUI's TabView
-
-In addition to `tabWidthMode`, the following global properties will also be available:
-
-* `tabWidthMin`
-    * Accepts an integer
-    * Value correlates to the minimum amount of pixels the tab width can be
-    * If value is less than the width of the icon, the minimum width will be the width of the icon
-    * If value is greater than the width of the tab bar, the maximum width will be the width of the tab bar
-    * If not set, the tab will have the system-defined minimum width
-
-* `tabWidthMax`
-    * Accepts an integer
-    * Value correlates to the maximum amount of pixels the tab width can be
-    * If value is less than the width of the icon, the minimum width will be the width of the icon
-    * If value is greater than the width of the tab bar, the maximum width will be the width of the tab bar
-    * If not set, the tab will have the system-defined maximum width
-
-If `tabWidthMode` is set to `titleLength`, the tab widths will fall between the `tabWidthMin` and `tabWidthMax` values if they are set, depending on the length of the tab title.
-
-If `tabWidthMode` isn't set, the default experience will be `equal`. Justification for the default experience is the results from this [twitter poll](https://twitter.com/cinnamon_msft/status/1203093459055210496).
-
-## UI/UX Design
-
-[This tweet](https://twitter.com/cinnamon_msft/status/1203094776117022720) displays how the `equal` and `titleLength` values behave for the `tabWidthMode` property.
-
-## Capabilities
-
-### Accessibility
-
-This feature could impact accessibility if the tab title isn't stored within the metadata of the tab. If the tab width is the width of the icon, then the title isn't visible. The tab title will have to be accessible by a screen reader.
-
-### Security
-
-This feature will not impact security.
-
-### Reliability
-
-This feature will not impact reliability. It provides users with additional customization options.
-
-### Compatibility
-
-This feature will not break existing compatibility.
-
-### Performance, Power, and Efficiency
-
-## Potential Issues
-
-This feature will not impact performance, power, nor efficiency.
-
-## Future considerations
-
-* Provide tab sizing options per-profile
-* A `tabWidthMode` value that will evenly divide the entirety of the tab bar by the number of open tabs
-    * i.e. One tab will take the full width of the tab bar, two tabs will each take up half the width of the tab bar, etc.

res/README.md

@@ -17,5 +17,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi
 
 ### Fonts Included
 
-* Cascadia Code, Cascadia Mono (2102.03)
-   * from microsoft/cascadia-code@b358d1ba3d1629c113671312b18eab52797cc055
+* Cascadia Code, Cascadia Mono (2009.21)
+   * from microsoft/cascadia-code@32f84124db1970fa5d032f0fe9019e6922961beb

samples/PixelShaders/Animate_breathe.hlsl

@@ -1,42 +0,0 @@
-// A simple animated shader that fades the terminal background back and forth between two colours
-
-// The terminal graphics as a texture
-Texture2D shaderTexture;
-SamplerState samplerState;
-
-// Terminal settings such as the resolution of the texture
-cbuffer PixelShaderSettings
-{
-    // The number of seconds since the pixel shader was enabled
-    float Time;
-    // UI Scale
-    float Scale;
-    // Resolution of the shaderTexture
-    float2 Resolution;
-    // Background color as rgba
-    float4 Background;
-};
-
-// pi and tau (2 * pi) are useful constants when using trigonometric functions
-#define TAU 6.28318530718
-
-// A pixel shader is a program that given a texture coordinate (tex) produces a color.
-// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
-// Just ignore the pos parameter.
-float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
-{
-	// Read the color value at the current texture coordinate (tex)
-    float4 sample = shaderTexture.Sample(samplerState, tex);
-    
-    // The number of seconds the breathing effect should span
-    float duration = 5.0;
-    
-    float3 color1 = float3(0.3, 0.0, 0.5);  // indigo
-    float3 color2 = float3(0.1, 0.1, 0.44); // midnight blue
-    
-    // Set background colour based on the time
-    float4 backgroundColor = float4(lerp(color1, color2, 0.5 * cos(TAU / duration * Time) + 0.5), 1.0);
-    
-    // Draw the terminal graphics over the background
-    return lerp(backgroundColor, sample, sample.w);
-}

samples/PixelShaders/Animate_scan.hlsl

@@ -1,45 +0,0 @@
-// A simple animated shader that draws an inverted line that scrolls down the screen
-
-// The terminal graphics as a texture
-Texture2D shaderTexture;
-SamplerState samplerState;
-
-// Terminal settings such as the resolution of the texture
-cbuffer PixelShaderSettings
-{
-    // The number of seconds since the pixel shader was enabled
-    float Time;
-    // UI Scale
-    float Scale;
-    // Resolution of the shaderTexture
-    float2 Resolution;
-    // Background color as rgba
-    float4 Background;
-};
-
-// A pixel shader is a program that given a texture coordinate (tex) produces a color.
-// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
-// Just ignore the pos parameter.
-float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
-{
-    // Read the color value at the current texture coordinate (tex)
-    float4 color = shaderTexture.Sample(samplerState, tex);
-    
-    // Here we spread the animation over 5 seconds. We use time modulo 5 because we want
-    // the timer to count to five repeatedly. We then divide the result by five again
-    // to get a value between 0.0 and 1.0, which maps to our texture coordinate.
-    float linePosition = Time % 5 / 5;
-    
-    // Since TEXCOORD ranges from 0.0 to 1.0, we need to divide 1.0 by the height of the
-    // texture to find out the size of a single pixel
-    float lineWidth = 1.0 / Resolution.y;
-	
-    // If the current texture coordinate is in the range of our line on the Y axis: 
-    if (tex.y > linePosition - lineWidth && tex.y < linePosition)
-    {
-        // Invert the sampled color
-        color.rgb = 1.0 - color.rgb;
-    }
-    
-    return color;
-}

samples/PixelShaders/Grayscale.hlsl

@@ -6,7 +6,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // The number of seconds since the pixel shader was enabled
+  // Time since pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -16,9 +16,8 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color.
-// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
-// Just ignore the pos parameter.
+// A pixel shader is a program that given a texture coordinate (tex) produces a color
+//  Just ignore the pos parameter
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)

samples/PixelShaders/Invert.hlsl

@@ -6,7 +6,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // The number of seconds since the pixel shader was enabled
+  // Time since pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -16,9 +16,8 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color.
-// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
-// Just ignore the pos parameter.
+// A pixel shader is a program that given a texture coordinate (tex) produces a color
+//  Just ignore the pos parameter
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)

samples/PixelShaders/README.md

@@ -20,7 +20,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // The number of seconds since the pixel shader was enabled
+  // Time since pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -30,9 +30,8 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color.
-// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
-// Just ignore the pos parameter.
+// A pixel shader is a program that given a texture coordinate (tex) produces a color
+//  Just ignore the pos parameter
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)
@@ -50,22 +49,16 @@ float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 Save this file as `C:\temp\invert.hlsl`, then update a profile with the setting:
 
 ```
-"experimental.pixelShaderPath": "C:\\temp\\invert.hlsl"
+"experimental.pixelShaderEffect": "C:\\temp\\invert.hlsl"
 ```
 
 Once the settings file is saved, open a terminal with the changed profile. It should now invert the colors of the screen!
 
-
- Default Terminal | Inverted Terminal 
----------|---------
- ![Default Terminal](Screenshots/TerminalDefault.PNG) | ![Inverted Terminal](Screenshots/TerminalInvert.PNG) 
-
-
 If your shader fails to compile, the Terminal will display a warning dialog and ignore it temporarily. After fixing your shader, touch the `settings.json` file again, or open a new tab, and the Terminal will try loading the shader again.
 
 ## HLSL
 
-The language we use to write pixel shaders is called `HLSL`. It's a `C`-like language, with some restrictions. You can't allocate memory, use pointers or recursion.
+The language we use to write pixel shaders is called `HLSL`. It a `C`-like language, with some restrictions.You can't allocate memory, use pointers or recursion.
 What you get access to is computing power in the teraflop range on decently recent GPUs. This means writing real-time raytracers or other cool effects are in the realm of possibility.
 
 [shadertoy](https://shadertoy.com/) is a great site that show case what's possible with pixel shaders (albeit in `GLSL`). For example this [menger sponge](https://www.shadertoy.com/view/4scXzn). Converting from `GLSL` to `HLSL` isn't overly hard once you gotten the hang of it.
@@ -83,7 +76,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // The number of seconds since the pixel shader was enabled
+  // Time since pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -93,9 +86,8 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color.
-// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
-// Just ignore the pos parameter.
+// A pixel shader is a program that given a texture coordinate (tex) produces a color
+//  Just ignore the pos parameter
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)
@@ -138,83 +130,7 @@ float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 
 Once reloaded, it should show some retro raster bars in the background, with a drop shadow to make the text more readable.
 
- ![Rasterbars](Screenshots/TerminalRasterbars.PNG)
-
 ## Retro Terminal Effect
 
-As a more complicated example, the Terminal's built-in `experimental.retroTerminalEffect` is included as the `Retro.hlsl` file in this directory. 
-
-![Retro](Screenshots/TerminalRetro.PNG)
-
-## Animated Effects
-
-You can use the `Time` value in the shader input settings to drive animated effects. `Time` is the number of seconds since the shader first loaded. Here’s a simple example with a line of inverted pixels that scrolls down the terminal (`Animate_scan.hlsl`):
-
-```hlsl
-float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
-{
-    // Read the color value at the current texture coordinate (tex)
-    float4 color = shaderTexture.Sample(samplerState, tex);
-    
-    // Here we spread the animation over 5 seconds. We use time modulo 5 because we want
-    // the timer to count to five repeatedly. We then divide the result by five again
-    // to get a value between 0.0 and 1.0, which maps to our texture coordinate.
-    float linePosition = Time % 5 / 5;
-    
-    // Since TEXCOORD ranges from 0.0 to 1.0, we need to divide 1.0 by the height of the
-    // texture to find out the size of a single pixel
-    float lineWidth = 1.0 / Resolution.y;
-	
-    // If the current texture coordinate is in the range of our line on the Y axis: 
-    if (tex.y > linePosition - lineWidth && tex.y < linePosition)
-    {
-        // Invert the sampled color
-        color.rgb = 1.0 - color.rgb;
-    }
-    
-    return color;
-}
-```
-What if we want an animation that goes backwards and forwards? In this example (`Animate_breathe.hlsl`), we'll make the background fade between two colours. Our `Time` value only ever goes up, so we need a way to generate a value that sweeps back and forth from `0.0` to `1.0`. Trigonometric functions like cosine are perfect for this and are very frequently used in shaders. 
-
-`cos()` outputs a value between `-1.0` and `1.0`. We can adjust the wave with the following formula:
-
-```
-a * cos(b * (x - c)) + d
-```
-
-Where `a` adjusts the amplitude, `b` adjusts the wavelength/frequency, `c` adjusts the offset along the x axis, and `d` adjusts the offset along the y axis. You can use a graphing calculator (such as the Windows Calculator) to help visualize the output and experiment:
-
-![Cosine](Screenshots/GraphCosine.png)
-
-As shown above, by halving the output and then adding `0.5`, we can shift the range of the function to `0.0` - `1.0`. Because `cos()` takes input in radians, if we multiply `x` (`Time`) by tau (`2*pi`), we are effectively setting the wavelength to `1.0`. 
-
-In other words, our full animation will be one second long. We can modify this duration by dividing tau by the number of seconds we want the animation to run for. In this case, we’ll go for five seconds.
-
-Finally we use linear interpolation to achieve our breathing effect by selecting a color between our two chosen colors based on the output from our cosine.
-
-```hlsl
-// pi and tau (2 * pi) are useful constants when using trigonometric functions
-#define TAU 6.28318530718
-
-float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
-{
-    // Read the color value at the current texture coordinate (tex)
-    float4 sample = shaderTexture.Sample(samplerState, tex);
-    
-    // The number of seconds the breathing effect should span
-    float duration = 5.0;
-    
-    float3 color1 = float3(0.3, 0.0, 0.5);  // indigo
-    float3 color2 = float3(0.1, 0.1, 0.44); // midnight blue
-    
-    // Set background colour based on the time
-    float4 backgroundColor = float4(lerp(color1, color2, 0.5 * cos(TAU / duration * Time) + 0.5), 1.0);
-    
-    // Draw the terminal graphics over the background
-    return lerp(backgroundColor, sample, sample.w);
-}
-```
-
-Feel free to modify and experiment!
+As a more complicated example, the Terminal's built-in `experimental.retroTerminalEffect` is included as the `Retro.hlsl` file in this directory. Feel free to modify and experiment!
 

samples/PixelShaders/Rasterbars.hlsl

@@ -6,7 +6,7 @@ SamplerState samplerState;
 
 // Terminal settings such as the resolution of the texture
 cbuffer PixelShaderSettings {
-  // The number of seconds since the pixel shader was enabled
+  // Time since pixel shader was enabled
   float  Time;
   // UI Scale
   float  Scale;
@@ -16,9 +16,8 @@ cbuffer PixelShaderSettings {
   float4 Background;
 };
 
-// A pixel shader is a program that given a texture coordinate (tex) produces a color.
-// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
-// Just ignore the pos parameter.
+// A pixel shader is a program that given a texture coordinate (tex) produces a color
+//  Just ignore the pos parameter
 float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
 {
     // Read the color value at the current texture coordinate (tex)

src/buffer/out/AttrRow.cpp

@@ -11,16 +11,10 @@
 // - attr - the default text attribute
 // Return Value:
 // - constructed object
-ATTR_ROW::ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr) noexcept
+// Note: will throw exception if unable to allocate memory for text attribute storage
+ATTR_ROW::ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr)
 {
-    try
-    {
-        _list.emplace_back(TextAttributeRun(cchRowWidth, attr));
-    }
-    catch (...)
-    {
-        FAIL_FAST_CAUGHT_EXCEPTION();
-    }
+    _list.push_back(TextAttributeRun(cchRowWidth, attr));
     _cchRowWidth = cchRowWidth;
 }
 
@@ -31,7 +25,7 @@ ATTR_ROW::ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr) noexcept
 void ATTR_ROW::Reset(const TextAttribute attr)
 {
     _list.clear();
-    _list.emplace_back(TextAttributeRun(_cchRowWidth, attr));
+    _list.push_back(TextAttributeRun(_cchRowWidth, attr));
 }
 
 // Routine Description:
@@ -184,15 +178,15 @@ size_t ATTR_ROW::FindAttrIndex(const size_t index, size_t* const pApplies) const
 // Routine Description:
 // - Finds the hyperlink IDs present in this row and returns them
 // Return value:
-// - The hyperlink IDs present in this row
-std::vector<uint16_t> ATTR_ROW::GetHyperlinks()
+// - An unordered set containing the hyperlink IDs present in this row
+std::unordered_set<uint16_t> ATTR_ROW::GetHyperlinks()
 {
-    std::vector<uint16_t> ids;
+    std::unordered_set<uint16_t> ids;
     for (const auto& run : _list)
     {
         if (run.GetAttributes().IsHyperlink())
         {
-            ids.emplace_back(run.GetAttributes().GetHyperlinkId());
+            ids.emplace(run.GetAttributes().GetHyperlinkId());
         }
     }
     return ids;
@@ -408,7 +402,7 @@ void ATTR_ROW::ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAtt
     // The original run was 3 long. The insertion run was 1 long. We need 1 more for the
     // fact that an existing piece of the run was split in half (to hold the latter half).
     const size_t cNewRun = _list.size() + newAttrs.size() + 1;
-    decltype(_list) newRun;
+    std::vector<TextAttributeRun> newRun;
     newRun.reserve(cNewRun);
 
     // We will start analyzing from the beginning of our existing run.
@@ -601,7 +595,8 @@ std::vector<TextAttributeRun> ATTR_ROW::PackAttrs(const std::vector<TextAttribut
     {
         if (runs.empty() || runs.back().GetAttributes() != attr)
         {
-            runs.emplace_back(TextAttributeRun(1, attr));
+            const TextAttributeRun run(1, attr);
+            runs.push_back(run);
         }
         else
         {

src/buffer/out/AttrRow.hpp

@@ -28,16 +28,9 @@ class ATTR_ROW final
 public:
     using const_iterator = typename AttrRowIterator;
 
-    ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr)
-    noexcept;
+    ATTR_ROW(const UINT cchRowWidth, const TextAttribute attr);
 
-    ~ATTR_ROW() = default;
-
-    ATTR_ROW(const ATTR_ROW&) = default;
-    ATTR_ROW& operator=(const ATTR_ROW&) = default;
-    ATTR_ROW(ATTR_ROW&&)
-    noexcept = default;
-    ATTR_ROW& operator=(ATTR_ROW&&) noexcept = default;
+    void Reset(const TextAttribute attr);
 
     TextAttribute GetAttrByColumn(const size_t column) const;
     TextAttribute GetAttrByColumn(const size_t column,
@@ -48,7 +41,7 @@ public:
     size_t FindAttrIndex(const size_t index,
                          size_t* const pApplies) const;
 
-    std::vector<uint16_t> GetHyperlinks();
+    std::unordered_set<uint16_t> GetHyperlinks();
 
     bool SetAttrToEnd(const UINT iStart, const TextAttribute attr);
     void ReplaceAttrs(const TextAttribute& toBeReplacedAttr, const TextAttribute& replaceWith) noexcept;
@@ -70,16 +63,12 @@ public:
 
     friend bool operator==(const ATTR_ROW& a, const ATTR_ROW& b) noexcept;
     friend class AttrRowIterator;
-    friend class ROW;
 
 private:
-    void Reset(const TextAttribute attr);
-
-    boost::container::small_vector<TextAttributeRun, 1> _list;
+    std::vector<TextAttributeRun> _list;
     size_t _cchRowWidth;
 
 #ifdef UNIT_TESTING
     friend class AttrRowTests;
-    friend class CommonState;
 #endif
 };

src/buffer/out/AttrRowIterator.cpp

@@ -39,6 +39,19 @@ bool AttrRowIterator::operator!=(const AttrRowIterator& it) const noexcept
     return !(*this == it);
 }
 
+AttrRowIterator& AttrRowIterator::operator++() noexcept
+{
+    _increment(1);
+    return *this;
+}
+
+AttrRowIterator AttrRowIterator::operator++(int) noexcept
+{
+    auto copy = *this;
+    _increment(1);
+    return copy;
+}
+
 AttrRowIterator& AttrRowIterator::operator+=(const ptrdiff_t& movement)
 {
     if (!_exceeded)
@@ -61,6 +74,19 @@ AttrRowIterator& AttrRowIterator::operator-=(const ptrdiff_t& movement)
     return this->operator+=(-movement);
 }
 
+AttrRowIterator& AttrRowIterator::operator--() noexcept
+{
+    _decrement(1);
+    return *this;
+}
+
+AttrRowIterator AttrRowIterator::operator--(int) noexcept
+{
+    auto copy = *this;
+    _decrement(1);
+    return copy;
+}
+
 const TextAttribute* AttrRowIterator::operator->() const
 {
     THROW_HR_IF(E_BOUNDS, _exceeded);

src/buffer/out/AttrRowIterator.hpp

@@ -38,38 +38,20 @@ public:
     bool operator==(const AttrRowIterator& it) const noexcept;
     bool operator!=(const AttrRowIterator& it) const noexcept;
 
-    AttrRowIterator& operator++() noexcept
-    {
-        _increment(1);
-        return *this;
-    }
-    AttrRowIterator operator++(int) noexcept
-    {
-        auto copy = *this;
-        _increment(1);
-        return copy;
-    }
+    AttrRowIterator& operator++() noexcept;
+    AttrRowIterator operator++(int) noexcept;
 
     AttrRowIterator& operator+=(const ptrdiff_t& movement);
     AttrRowIterator& operator-=(const ptrdiff_t& movement);
 
-    AttrRowIterator& operator--() noexcept
-    {
-        _decrement(1);
-        return *this;
-    }
-    AttrRowIterator operator--(int) noexcept
-    {
-        auto copy = *this;
-        _decrement(1);
-        return copy;
-    }
+    AttrRowIterator& operator--() noexcept;
+    AttrRowIterator operator--(int) noexcept;
 
     const TextAttribute* operator->() const;
     const TextAttribute& operator*() const;
 
 private:
-    boost::container::small_vector_base<TextAttributeRun>::const_iterator _run;
+    std::vector<TextAttributeRun>::const_iterator _run;
     const ATTR_ROW* _pAttrRow;
     size_t _currentAttributeIndex; // index of TextAttribute within the current TextAttributeRun
     bool _exceeded;

src/buffer/out/CharRow.cpp

@@ -15,14 +15,57 @@
 // Return Value:
 // - instantiated object
 // Note: will through if unable to allocate char/attribute buffers
-#pragma warning(push)
-#pragma warning(disable : 26447) // small_vector's constructor says it can throw but it should not given how we use it.  This suppresses this error for the AuditMode build.
-CharRow::CharRow(size_t rowWidth, ROW* const pParent) noexcept :
+CharRow::CharRow(size_t rowWidth, ROW* const pParent) :
+    _wrapForced{ false },
+    _doubleBytePadded{ false },
     _data(rowWidth, value_type()),
     _pParent{ FAIL_FAST_IF_NULL(pParent) }
 {
 }
-#pragma warning(pop)
+
+// Routine Description:
+// - Sets the wrap status for the current row
+// Arguments:
+// - wrapForced - True if the row ran out of space and we forced to wrap to the next row. False otherwise.
+// Return Value:
+// - <none>
+void CharRow::SetWrapForced(const bool wrapForced) noexcept
+{
+    _wrapForced = wrapForced;
+}
+
+// Routine Description:
+// - Gets the wrap status for the current row
+// Arguments:
+// - <none>
+// Return Value:
+// - True if the row ran out of space and we were forced to wrap to the next row. False otherwise.
+bool CharRow::WasWrapForced() const noexcept
+{
+    return _wrapForced;
+}
+
+// Routine Description:
+// - Sets the double byte padding for the current row
+// Arguments:
+// - fWrapWasForced - True if the row ran out of space for a double byte character and we padded out the row. False otherwise.
+// Return Value:
+// - <none>
+void CharRow::SetDoubleBytePadded(const bool doubleBytePadded) noexcept
+{
+    _doubleBytePadded = doubleBytePadded;
+}
+
+// Routine Description:
+// - Gets the double byte padding status for the current row.
+// Arguments:
+// - <none>
+// Return Value:
+// - True if the row didn't have space for a double byte character and we were padded out the row. False otherwise.
+bool CharRow::WasDoubleBytePadded() const noexcept
+{
+    return _doubleBytePadded;
+}
 
 // Routine Description:
 // - gets the size of the row, in glyph cells
@@ -47,6 +90,9 @@ void CharRow::Reset() noexcept
     {
         cell.Reset();
     }
+
+    _wrapForced = false;
+    _doubleBytePadded = false;
 }
 
 // Routine Description:
@@ -95,7 +141,7 @@ typename CharRow::const_iterator CharRow::cend() const noexcept
 // - The calculated left boundary of the internal string.
 size_t CharRow::MeasureLeft() const noexcept
 {
-    const_iterator it = _data.cbegin();
+    std::vector<value_type>::const_iterator it = _data.cbegin();
     while (it != _data.cend() && it->IsSpace())
     {
         ++it;
@@ -109,9 +155,9 @@ size_t CharRow::MeasureLeft() const noexcept
 // - <none>
 // Return Value:
 // - The calculated right boundary of the internal string.
-size_t CharRow::MeasureRight() const
+size_t CharRow::MeasureRight() const noexcept
 {
-    const_reverse_iterator it = _data.crbegin();
+    std::vector<value_type>::const_reverse_iterator it = _data.crbegin();
     while (it != _data.crend() && it->IsSpace())
     {
         ++it;

src/buffer/out/CharRow.hpp

@@ -49,21 +49,27 @@ class CharRow final
 public:
     using glyph_type = typename wchar_t;
     using value_type = typename CharRowCell;
-    using iterator = typename boost::container::small_vector_base<value_type>::iterator;
-    using const_iterator = typename boost::container::small_vector_base<value_type>::const_iterator;
-    using const_reverse_iterator = typename boost::container::small_vector_base<value_type>::const_reverse_iterator;
+    using iterator = typename std::vector<value_type>::iterator;
+    using const_iterator = typename std::vector<value_type>::const_iterator;
     using reference = typename CharRowCellReference;
 
-    CharRow(size_t rowWidth, ROW* const pParent) noexcept;
+    CharRow(size_t rowWidth, ROW* const pParent);
 
+    void SetWrapForced(const bool wrap) noexcept;
+    bool WasWrapForced() const noexcept;
+    void SetDoubleBytePadded(const bool doubleBytePadded) noexcept;
+    bool WasDoubleBytePadded() const noexcept;
     size_t size() const noexcept;
+    void Reset() noexcept;
     [[nodiscard]] HRESULT Resize(const size_t newSize) noexcept;
     size_t MeasureLeft() const noexcept;
-    size_t MeasureRight() const;
+    size_t MeasureRight() const noexcept;
+    void ClearCell(const size_t column);
     bool ContainsText() const noexcept;
     const DbcsAttribute& DbcsAttrAt(const size_t column) const;
     DbcsAttribute& DbcsAttrAt(const size_t column);
     void ClearGlyph(const size_t column);
+    std::wstring GetText() const;
 
     const DelimiterClass DelimiterClassAt(const size_t column, const std::wstring_view wordDelimiters) const;
 
@@ -74,11 +80,9 @@ public:
     // iterators
     iterator begin() noexcept;
     const_iterator cbegin() const noexcept;
-    const_iterator begin() const noexcept { return cbegin(); }
 
     iterator end() noexcept;
     const_iterator cend() const noexcept;
-    const_iterator end() const noexcept { return cend(); }
 
     UnicodeStorage& GetUnicodeStorage() noexcept;
     const UnicodeStorage& GetUnicodeStorage() const noexcept;
@@ -87,21 +91,29 @@ public:
     void UpdateParent(ROW* const pParent);
 
     friend CharRowCellReference;
-    friend class ROW;
-
-private:
-    void Reset() noexcept;
-    void ClearCell(const size_t column);
-    std::wstring GetText() const;
+    friend constexpr bool operator==(const CharRow& a, const CharRow& b) noexcept;
 
 protected:
+    // Occurs when the user runs out of text in a given row and we're forced to wrap the cursor to the next line
+    bool _wrapForced;
+
+    // Occurs when the user runs out of text to support a double byte character and we're forced to the next line
+    bool _doubleBytePadded;
+
     // storage for glyph data and dbcs attributes
-    boost::container::small_vector<value_type, 120> _data;
+    std::vector<value_type> _data;
 
     // ROW that this CharRow belongs to
     ROW* _pParent;
 };
 
+constexpr bool operator==(const CharRow& a, const CharRow& b) noexcept
+{
+    return (a._wrapForced == b._wrapForced &&
+            a._doubleBytePadded == b._doubleBytePadded &&
+            a._data == b._data);
+}
+
 template<typename InputIt1, typename InputIt2>
 void OverwriteColumns(InputIt1 startChars, InputIt1 endChars, InputIt2 startAttrs, CharRow::iterator outIt)
 {

src/buffer/out/CharRowCell.cpp

@@ -8,6 +8,18 @@
 // default glyph value, used for resetting the character data portion of a cell
 static constexpr wchar_t DefaultValue = UNICODE_SPACE;
 
+CharRowCell::CharRowCell() noexcept :
+    _wch{ DefaultValue },
+    _attr{}
+{
+}
+
+CharRowCell::CharRowCell(const wchar_t wch, const DbcsAttribute attr) noexcept :
+    _wch{ wch },
+    _attr{ attr }
+{
+}
+
 // Routine Description:
 // - "erases" the glyph. really sets it back to the default "empty" value
 void CharRowCell::EraseChars() noexcept

src/buffer/out/CharRowCell.hpp

@@ -17,7 +17,6 @@ Author(s):
 #pragma once
 
 #include "DbcsAttribute.hpp"
-#include "unicode.hpp"
 
 #if (defined(_M_IX86) || defined(_M_AMD64))
 // currently CharRowCell's fields use 3 bytes of memory, leaving the 4th byte in unused. this leads
@@ -28,13 +27,8 @@ Author(s):
 class CharRowCell final
 {
 public:
-    CharRowCell() noexcept = default;
-    CharRowCell(const wchar_t wch, const DbcsAttribute attr) noexcept
-        :
-        _wch(wch),
-        _attr(attr)
-    {
-    }
+    CharRowCell() noexcept;
+    CharRowCell(const wchar_t wch, const DbcsAttribute attr) noexcept;
 
     void EraseChars() noexcept;
     void Reset() noexcept;
@@ -50,8 +44,8 @@ public:
     friend constexpr bool operator==(const CharRowCell& a, const CharRowCell& b) noexcept;
 
 private:
-    wchar_t _wch{ UNICODE_SPACE };
-    DbcsAttribute _attr{};
+    wchar_t _wch;
+    DbcsAttribute _attr;
 };
 
 #if (defined(_M_IX86) || defined(_M_AMD64))

src/buffer/out/CharRowCellReference.hpp

@@ -32,8 +32,8 @@ public:
     }
 
     ~CharRowCellReference() = default;
-    CharRowCellReference(const CharRowCellReference&) noexcept = default;
-    CharRowCellReference(CharRowCellReference&&) noexcept = default;
+    CharRowCellReference(const CharRowCellReference&) = default;
+    CharRowCellReference(CharRowCellReference&&) = default;
 
     void operator=(const CharRowCellReference&) = delete;
     void operator=(CharRowCellReference&&) = delete;

src/buffer/out/Row.cpp

@@ -16,17 +16,50 @@
 // - pParent - the text buffer that this row belongs to
 // Return Value:
 // - constructed object
-ROW::ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) noexcept :
+ROW::ROW(const SHORT rowId, const short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent) :
     _id{ rowId },
-    _rowWidth{ rowWidth },
-    _charRow{ rowWidth, this },
-    _attrRow{ rowWidth, fillAttribute },
-    _wrapForced{ false },
-    _doubleBytePadded{ false },
+    _rowWidth{ gsl::narrow<size_t>(rowWidth) },
+    _charRow{ gsl::narrow<size_t>(rowWidth), this },
+    _attrRow{ gsl::narrow<UINT>(rowWidth), fillAttribute },
     _pParent{ pParent }
 {
 }
 
+size_t ROW::size() const noexcept
+{
+    return _rowWidth;
+}
+
+const CharRow& ROW::GetCharRow() const noexcept
+{
+    return _charRow;
+}
+
+CharRow& ROW::GetCharRow() noexcept
+{
+    return _charRow;
+}
+
+const ATTR_ROW& ROW::GetAttrRow() const noexcept
+{
+    return _attrRow;
+}
+
+ATTR_ROW& ROW::GetAttrRow() noexcept
+{
+    return _attrRow;
+}
+
+SHORT ROW::GetId() const noexcept
+{
+    return _id;
+}
+
+void ROW::SetId(const SHORT id) noexcept
+{
+    _id = id;
+}
+
 // Routine Description:
 // - Sets all properties of the ROW to default values
 // Arguments:
@@ -35,8 +68,6 @@ ROW::ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute f
 // - <none>
 bool ROW::Reset(const TextAttribute Attr)
 {
-    _wrapForced = false;
-    _doubleBytePadded = false;
     _charRow.Reset();
     try
     {
@@ -56,7 +87,7 @@ bool ROW::Reset(const TextAttribute Attr)
 // - width - the new width, in cells
 // Return Value:
 // - S_OK if successful, otherwise relevant error
-[[nodiscard]] HRESULT ROW::Resize(const unsigned short width)
+[[nodiscard]] HRESULT ROW::Resize(const size_t width)
 {
     RETURN_IF_FAILED(_charRow.Resize(width));
     try
@@ -82,6 +113,25 @@ void ROW::ClearColumn(const size_t column)
     _charRow.ClearCell(column);
 }
 
+// Routine Description:
+// - gets the text of the row as it would be shown on the screen
+// Return Value:
+// - wstring containing text for the row
+std::wstring ROW::GetText() const
+{
+    return _charRow.GetText();
+}
+
+RowCellIterator ROW::AsCellIter(const size_t startIndex) const
+{
+    return AsCellIter(startIndex, size() - startIndex);
+}
+
+RowCellIterator ROW::AsCellIter(const size_t startIndex, const size_t count) const
+{
+    return RowCellIterator(*this, startIndex, count);
+}
+
 UnicodeStorage& ROW::GetUnicodeStorage() noexcept
 {
     return _pParent->GetUnicodeStorage();
@@ -163,7 +213,7 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
                 else if (fillingLastColumn && it->DbcsAttr().IsLeading())
                 {
                     _charRow.ClearCell(currentIndex);
-                    SetDoubleBytePadded(true);
+                    _charRow.SetDoubleBytePadded(true);
                 }
                 // Otherwise, copy the data given and increment the iterator.
                 else
@@ -181,7 +231,7 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const size_t index, co
                 if (wrap.has_value() && fillingLastColumn)
                 {
                     // set wrap status on the row to parameter's value.
-                    SetWrapForced(*wrap);
+                    _charRow.SetWrapForced(wrap.value());
                 }
             }
             else

src/buffer/out/Row.hpp

@@ -24,6 +24,7 @@ Revision History:
 #include "OutputCell.hpp"
 #include "OutputCellIterator.hpp"
 #include "CharRow.hpp"
+#include "RowCellIterator.hpp"
 #include "UnicodeStorage.hpp"
 
 class TextBuffer;
@@ -31,39 +32,36 @@ class TextBuffer;
 class ROW final
 {
 public:
-    ROW(const SHORT rowId, const unsigned short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent)
-    noexcept;
+    ROW(const SHORT rowId, const short rowWidth, const TextAttribute fillAttribute, TextBuffer* const pParent);
 
-    size_t size() const noexcept { return _rowWidth; }
+    size_t size() const noexcept;
 
-    void SetWrapForced(const bool wrap) noexcept { _wrapForced = wrap; }
-    bool WasWrapForced() const noexcept { return _wrapForced; }
+    const CharRow& GetCharRow() const noexcept;
+    CharRow& GetCharRow() noexcept;
 
-    void SetDoubleBytePadded(const bool doubleBytePadded) noexcept { _doubleBytePadded = doubleBytePadded; }
-    bool WasDoubleBytePadded() const noexcept { return _doubleBytePadded; }
+    const ATTR_ROW& GetAttrRow() const noexcept;
+    ATTR_ROW& GetAttrRow() noexcept;
 
-    const CharRow& GetCharRow() const noexcept { return _charRow; }
-    CharRow& GetCharRow() noexcept { return _charRow; }
-
-    const ATTR_ROW& GetAttrRow() const noexcept { return _attrRow; }
-    ATTR_ROW& GetAttrRow() noexcept { return _attrRow; }
-
-    SHORT GetId() const noexcept { return _id; }
-    void SetId(const SHORT id) noexcept { _id = id; }
+    SHORT GetId() const noexcept;
+    void SetId(const SHORT id) noexcept;
 
     bool Reset(const TextAttribute Attr);
-    [[nodiscard]] HRESULT Resize(const unsigned short width);
+    [[nodiscard]] HRESULT Resize(const size_t width);
 
     void ClearColumn(const size_t column);
-    std::wstring GetText() const { return _charRow.GetText(); }
+    std::wstring GetText() const;
+
+    RowCellIterator AsCellIter(const size_t startIndex) const;
+    RowCellIterator AsCellIter(const size_t startIndex, const size_t count) const;
 
     UnicodeStorage& GetUnicodeStorage() noexcept;
     const UnicodeStorage& GetUnicodeStorage() const noexcept;
 
     OutputCellIterator WriteCells(OutputCellIterator it, const size_t index, const std::optional<bool> wrap = std::nullopt, std::optional<size_t> limitRight = std::nullopt);
 
+    friend bool operator==(const ROW& a, const ROW& b) noexcept;
+
 #ifdef UNIT_TESTING
-    friend constexpr bool operator==(const ROW& a, const ROW& b) noexcept;
     friend class RowTests;
 #endif
 
@@ -71,19 +69,15 @@ private:
     CharRow _charRow;
     ATTR_ROW _attrRow;
     SHORT _id;
-    unsigned short _rowWidth;
-    // Occurs when the user runs out of text in a given row and we're forced to wrap the cursor to the next line
-    bool _wrapForced;
-    // Occurs when the user runs out of text to support a double byte character and we're forced to the next line
-    bool _doubleBytePadded;
+    size_t _rowWidth;
     TextBuffer* _pParent; // non ownership pointer
 };
 
-#ifdef UNIT_TESTING
-constexpr bool operator==(const ROW& a, const ROW& b) noexcept
+inline bool operator==(const ROW& a, const ROW& b) noexcept
 {
-    // comparison is only used in the tests; this should suffice.
-    return (a._pParent == b._pParent &&
+    return (a._charRow == b._charRow &&
+            a._attrRow == b._attrRow &&
+            a._rowWidth == b._rowWidth &&
+            a._pParent == b._pParent &&
             a._id == b._id);
 }
-#endif

src/buffer/out/RowCellIterator.cpp

@@ -0,0 +1,110 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "precomp.h"
+
+#include "RowCellIterator.hpp"
+#include "Row.hpp"
+
+#include "../../types/inc/convert.hpp"
+#include "../../types/inc/Utf16Parser.hpp"
+
+RowCellIterator::RowCellIterator(const ROW& row, const size_t start, const size_t length) :
+    _row(row),
+    _start(start),
+    _length(length),
+    _pos(start),
+    _view(s_GenerateView(row, start))
+{
+}
+
+RowCellIterator::operator bool() const noexcept
+{
+    // In lieu of using start and end, this custom iterator type simply becomes bool false
+    // when we run out of items to iterate over.
+    return _pos < (_start + _length);
+}
+
+bool RowCellIterator::operator==(const RowCellIterator& it) const noexcept
+{
+    return _row == it._row &&
+           _start == it._start &&
+           _length == it._length &&
+           _pos == it._pos;
+}
+bool RowCellIterator::operator!=(const RowCellIterator& it) const noexcept
+{
+    return !(*this == it);
+}
+
+RowCellIterator& RowCellIterator::operator+=(const ptrdiff_t& movement) noexcept
+{
+    _pos += movement;
+
+    return (*this);
+}
+
+RowCellIterator& RowCellIterator::operator++() noexcept
+{
+    return this->operator+=(1);
+}
+
+RowCellIterator RowCellIterator::operator++(int) noexcept
+{
+    auto temp(*this);
+    operator++();
+    return temp;
+}
+
+RowCellIterator RowCellIterator::operator+(const ptrdiff_t& movement) noexcept
+{
+    auto temp(*this);
+    temp += movement;
+    return temp;
+}
+
+const OutputCellView& RowCellIterator::operator*() const noexcept
+{
+    return _view;
+}
+
+const OutputCellView* RowCellIterator::operator->() const noexcept
+{
+    return &_view;
+}
+
+// Routine Description:
+// - Member function to update the view to the current position in the buffer with
+//   the data held on this object.
+// Arguments:
+// - <none>
+// Return Value:
+// - <none>
+void RowCellIterator::_RefreshView()
+{
+    _view = s_GenerateView(_row, _pos);
+}
+
+// Routine Description:
+// - Static function to create a view.
+// - It's pulled out statically so it can be used during construction with just the given
+//   variables (so OutputCellView doesn't need an empty default constructor)
+// - This will infer the width of the glyph and apply the appropriate attributes to the view.
+// Arguments:
+// - view - View representing characters corresponding to a single glyph
+// - attr - Color attributes to apply to the text
+// Return Value:
+// - Object representing the view into this cell
+OutputCellView RowCellIterator::s_GenerateView(const ROW& row,
+                                               const size_t pos)
+{
+    const auto& charRow = row.GetCharRow();
+
+    const auto glyph = charRow.GlyphAt(pos);
+    const auto dbcsAttr = charRow.DbcsAttrAt(pos);
+
+    const auto textAttr = row.GetAttrRow().GetAttrByColumn(pos);
+    const auto behavior = TextAttributeBehavior::Stored;
+
+    return OutputCellView(glyph, dbcsAttr, textAttr, behavior);
+}

src/buffer/out/RowCellIterator.hpp

@@ -0,0 +1,59 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Module Name:
+- RowCellIterator.hpp
+
+Abstract:
+- Read-only view into cells already in the input buffer.
+- This is done for performance reasons (avoid heap allocs and copies).
+
+Author:
+- Michael Niksa (MiNiksa) 12-Oct-2018
+
+--*/
+
+#pragma once
+
+#include "OutputCellView.hpp"
+class ROW;
+
+class RowCellIterator final
+{
+public:
+    using iterator_category = std::forward_iterator_tag;
+    using value_type = OutputCellView;
+    using difference_type = ptrdiff_t;
+    using pointer = OutputCellView*;
+    using reference = OutputCellView&;
+
+    RowCellIterator(const ROW& row, const size_t start, const size_t length);
+    ~RowCellIterator() = default;
+
+    RowCellIterator& operator=(const RowCellIterator& it) = delete;
+
+    operator bool() const noexcept;
+
+    bool operator==(const RowCellIterator& it) const noexcept;
+    bool operator!=(const RowCellIterator& it) const noexcept;
+
+    RowCellIterator& operator+=(const ptrdiff_t& movement) noexcept;
+    RowCellIterator& operator++() noexcept;
+    RowCellIterator operator++(int) noexcept;
+    RowCellIterator operator+(const ptrdiff_t& movement) noexcept;
+
+    const OutputCellView& operator*() const noexcept;
+    const OutputCellView* operator->() const noexcept;
+
+private:
+    const ROW& _row;
+    const size_t _start;
+    const size_t _length;
+
+    size_t _pos;
+    OutputCellView _view;
+
+    void _RefreshView();
+    static OutputCellView s_GenerateView(const ROW& row, const size_t pos);
+};

src/buffer/out/TextAttributeRun.cpp

@@ -0,0 +1,47 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "precomp.h"
+#include "TextAttributeRun.hpp"
+
+TextAttributeRun::TextAttributeRun() noexcept :
+    _cchLength(0)
+{
+    SetAttributes(TextAttribute(0));
+}
+
+TextAttributeRun::TextAttributeRun(const size_t cchLength, const TextAttribute attr) noexcept :
+    _cchLength(cchLength)
+{
+    SetAttributes(attr);
+}
+
+size_t TextAttributeRun::GetLength() const noexcept
+{
+    return _cchLength;
+}
+
+void TextAttributeRun::SetLength(const size_t cchLength) noexcept
+{
+    _cchLength = cchLength;
+}
+
+void TextAttributeRun::IncrementLength() noexcept
+{
+    _cchLength++;
+}
+
+void TextAttributeRun::DecrementLength() noexcept
+{
+    _cchLength--;
+}
+
+const TextAttribute& TextAttributeRun::GetAttributes() const noexcept
+{
+    return _attributes;
+}
+
+void TextAttributeRun::SetAttributes(const TextAttribute textAttribute) noexcept
+{
+    _attributes = textAttribute;
+}

src/buffer/out/TextAttributeRun.hpp

@@ -25,24 +25,20 @@ Revision History:
 class TextAttributeRun final
 {
 public:
-    TextAttributeRun() = default;
-    TextAttributeRun(const size_t cchLength, const TextAttribute attr) noexcept :
-        _cchLength(gsl::narrow<unsigned int>(cchLength))
-    {
-        SetAttributes(attr);
-    }
+    TextAttributeRun() noexcept;
+    TextAttributeRun(const size_t cchLength, const TextAttribute attr) noexcept;
 
-    size_t GetLength() const noexcept { return _cchLength; }
-    void SetLength(const size_t cchLength) noexcept { _cchLength = gsl::narrow<unsigned int>(cchLength); }
-    void IncrementLength() noexcept { _cchLength++; }
-    void DecrementLength() noexcept { _cchLength--; }
+    size_t GetLength() const noexcept;
+    void SetLength(const size_t cchLength) noexcept;
+    void IncrementLength() noexcept;
+    void DecrementLength() noexcept;
 
-    const TextAttribute& GetAttributes() const noexcept { return _attributes; }
-    void SetAttributes(const TextAttribute textAttribute) noexcept { _attributes = textAttribute; }
+    const TextAttribute& GetAttributes() const noexcept;
+    void SetAttributes(const TextAttribute textAttribute) noexcept;
 
 private:
-    unsigned int _cchLength{ 0 };
-    TextAttribute _attributes{ 0 };
+    size_t _cchLength;
+    TextAttribute _attributes;
 
 #ifdef UNIT_TESTING
     friend class AttrRowTests;

src/buffer/out/lib/bufferout.vcxproj

@@ -6,7 +6,7 @@
     <RootNamespace>bufferout</RootNamespace>
     <ProjectName>BufferOut</ProjectName>
     <TargetName>ConBufferOut</TargetName>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
   </PropertyGroup>
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <ItemGroup>
@@ -18,9 +18,11 @@
     <ClCompile Include="..\OutputCellRect.cpp" />
     <ClCompile Include="..\OutputCellView.cpp" />
     <ClCompile Include="..\Row.cpp" />
+    <ClCompile Include="..\RowCellIterator.cpp" />
     <ClCompile Include="..\search.cpp" />
     <ClCompile Include="..\TextColor.cpp" />
     <ClCompile Include="..\TextAttribute.cpp" />
+    <ClCompile Include="..\TextAttributeRun.cpp" />
     <ClCompile Include="..\textBuffer.cpp" />
     <ClCompile Include="..\textBufferCellIterator.cpp" />
     <ClCompile Include="..\textBufferTextIterator.cpp" />
@@ -43,6 +45,7 @@
     <ClInclude Include="..\OutputCellRect.hpp" />
     <ClInclude Include="..\OutputCellView.hpp" />
     <ClInclude Include="..\Row.hpp" />
+    <ClInclude Include="..\RowCellIterator.hpp" />
     <ClInclude Include="..\search.h" />
     <ClInclude Include="..\TextColor.h" />
     <ClInclude Include="..\TextAttribute.h" />

src/buffer/out/sources.inc

@@ -37,8 +37,10 @@ SOURCES= \
     ..\OutputCellRect.cpp \
     ..\OutputCellView.cpp \
     ..\Row.cpp \
+    ..\RowCellIterator.cpp \
     ..\TextColor.cpp \
     ..\TextAttribute.cpp \
+    ..\TextAttributeRun.cpp \
     ..\textBuffer.cpp \
     ..\textBufferCellIterator.cpp \
     ..\textBufferTextIterator.cpp \

src/buffer/out/textBuffer.cpp

@@ -42,7 +42,6 @@ TextBuffer::TextBuffer(const COORD screenBufferSize,
     _currentPatternId{ 0 }
 {
     // initialize ROWs
-    _storage.reserve(static_cast<size_t>(screenBufferSize.Y));
     for (size_t i = 0; i < static_cast<size_t>(screenBufferSize.Y); ++i)
     {
         _storage.emplace_back(static_cast<SHORT>(i), screenBufferSize.X, _currentAttributes, this);
@@ -254,7 +253,7 @@ bool TextBuffer::_AssertValidDoubleByteSequence(const DbcsAttribute dbcsAttribut
         // Erase previous character into an N type.
         try
         {
-            prevRow.ClearColumn(coordPrevPosition.X);
+            prevRow.GetCharRow().ClearCell(coordPrevPosition.X);
         }
         catch (...)
         {
@@ -296,8 +295,8 @@ bool TextBuffer::_PrepareForDoubleByteSequence(const DbcsAttribute dbcsAttribute
         if (GetCursor().GetPosition().X == sBufferWidth - 1)
         {
             // set that we're wrapping for double byte reasons
-            auto& row = GetRowByOffset(GetCursor().GetPosition().Y);
-            row.SetDoubleBytePadded(true);
+            CharRow& charRow = GetRowByOffset(GetCursor().GetPosition().Y).GetCharRow();
+            charRow.SetDoubleBytePadded(true);
 
             // then move the cursor forward and onto the next row
             fSuccess = IncrementCursor();
@@ -480,7 +479,7 @@ void TextBuffer::_AdjustWrapOnCurrentRow(const bool fSet)
     const UINT uiCurrentRowOffset = GetCursor().GetPosition().Y;
 
     // Set the wrap status as appropriate
-    GetRowByOffset(uiCurrentRowOffset).SetWrapForced(fSet);
+    GetRowByOffset(uiCurrentRowOffset).GetCharRow().SetWrapForced(fSet);
 }
 
 //Routine Description:
@@ -810,7 +809,8 @@ void TextBuffer::Reset()
 
     for (auto& row : _storage)
     {
-        row.Reset(attr);
+        row.GetCharRow().Reset();
+        row.GetAttrRow().Reset(attr);
     }
 }
 
@@ -837,10 +837,11 @@ void TextBuffer::Reset()
         const SHORT TopRowIndex = (GetFirstRowIndex() + TopRow) % currentSize.Y;
 
         // rotate rows until the top row is at index 0
-        for (int i = 0; i < TopRowIndex; i++)
+        const ROW& newTopRow = _storage.at(TopRowIndex);
+        while (&newTopRow != &_storage.front())
         {
-            _storage.emplace_back(std::move(_storage.front()));
-            _storage.erase(_storage.begin());
+            _storage.push_back(std::move(_storage.front()));
+            _storage.pop_front();
         }
 
         _SetFirstRowIndex(0);
@@ -1229,15 +1230,9 @@ void TextBuffer::_PruneHyperlinks()
     // If the buffer does not contain the same reference, we can remove that hyperlink from our map
     // This way, obsolete hyperlink references are cleared from our hyperlink map instead of hanging around
     // Get all the hyperlink references in the row we're erasing
-    const auto hyperlinks = _storage.at(_firstRow).GetAttrRow().GetHyperlinks();
-
-    if (!hyperlinks.empty())
+    auto firstRowRefs = _storage.at(_firstRow).GetAttrRow().GetHyperlinks();
+    if (!firstRowRefs.empty())
     {
-        // Move to unordered set so we can use hashed lookup of IDs instead of linear search.
-        // Only make it an unordered set now because set always heap allocates but vector
-        // doesn't when the set is empty (saving an allocation in the common case of no links.)
-        std::unordered_set<uint16_t> firstRowRefs{ hyperlinks.cbegin(), hyperlinks.cend() };
-
         const auto total = TotalRowCount();
         // Loop through all the rows in the buffer except the first row -
         // we have found all hyperlink references in the first row and put them in refs,
@@ -1259,12 +1254,12 @@ void TextBuffer::_PruneHyperlinks()
                 break;
             }
         }
+    }
 
-        // Now delete obsolete references from our map
-        for (auto hyperlinkReference : firstRowRefs)
-        {
-            RemoveHyperlinkFromMap(hyperlinkReference);
-        }
+    // Now delete obsolete references from our map
+    for (auto hyperlinkReference : firstRowRefs)
+    {
+        RemoveHyperlinkFromMap(hyperlinkReference);
     }
 }
 
@@ -1587,7 +1582,7 @@ const TextBuffer::TextAndColor TextBuffer::GetText(const bool includeCRLF,
         }
 
         // We apply formatting to rows if the row was NOT wrapped or formatting of wrapped rows is allowed
-        const bool shouldFormatRow = formatWrappedRows || !GetRowByOffset(iRow).WasWrapForced();
+        const bool shouldFormatRow = formatWrappedRows || !GetRowByOffset(iRow).GetCharRow().WasWrapForced();
 
         if (trimTrailingWhitespace)
         {
@@ -2068,7 +2063,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
         // included.)
         // As such, adjust the "right" to be the width of the row
         // to capture all these spaces
-        if (row.WasWrapForced())
+        if (charRow.WasWrapForced())
         {
             iRight = cOldColsTotal;
 
@@ -2077,7 +2072,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
             // piece of padding because of a double byte LEADING
             // character, then remove one from the "right" to
             // leave this padding out of the copy process.
-            if (row.WasDoubleBytePadded())
+            if (charRow.WasDoubleBytePadded())
             {
                 iRight--;
             }
@@ -2141,7 +2136,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
             // Only do so if we were not forced to wrap. If we did
             // force a word wrap, then the existing line break was
             // only because we ran out of space.
-            if (iRight < cOldColsTotal && !row.WasWrapForced())
+            if (iRight < cOldColsTotal && !charRow.WasWrapForced())
             {
                 if (iRight == cOldCursorPos.X && iOldRow == cOldCursorPos.Y)
                 {
@@ -2185,7 +2180,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
                     const COORD coordNewCursor = newCursor.GetPosition();
                     if (coordNewCursor.X == 0 && coordNewCursor.Y > 0)
                     {
-                        if (newBuffer.GetRowByOffset(gsl::narrow_cast<size_t>(coordNewCursor.Y) - 1).WasWrapForced())
+                        if (newBuffer.GetRowByOffset(gsl::narrow_cast<size_t>(coordNewCursor.Y) - 1).GetCharRow().WasWrapForced())
                         {
                             hr = newBuffer.NewlineCursor() ? hr : E_OUTOFMEMORY;
                         }
@@ -2218,7 +2213,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
 
             // If the last row of the new buffer wrapped, there's going to be one less newline needed,
             //   because the cursor is already on the next line
-            if (newBuffer.GetRowByOffset(cNewLastChar.Y).WasWrapForced())
+            if (newBuffer.GetRowByOffset(cNewLastChar.Y).GetCharRow().WasWrapForced())
             {
                 iNewlines = std::max(iNewlines - 1, 0);
             }
@@ -2226,7 +2221,7 @@ HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
             {
                 // if this buffer didn't wrap, but the old one DID, then the d(columns) of the
                 //   old buffer will be one more than in this buffer, so new need one LESS.
-                if (oldBuffer.GetRowByOffset(cOldLastChar.Y).WasWrapForced())
+                if (oldBuffer.GetRowByOffset(cOldLastChar.Y).GetCharRow().WasWrapForced())
                 {
                     iNewlines = std::max(iNewlines - 1, 0);
                 }
@@ -2415,8 +2410,8 @@ PointTree TextBuffer::GetPatterns(const size_t firstRow, const size_t lastRow) c
     // all the text into one string and find the patterns in that string
     for (auto i = firstRow; i <= lastRow; ++i)
     {
-        auto& row = GetRowByOffset(i);
-        concatAll += row.GetText();
+        auto row = GetRowByOffset(i);
+        concatAll += row.GetCharRow().GetText();
     }
 
     // for each pattern we know of, iterate through the string

src/buffer/out/textBuffer.hpp

@@ -49,8 +49,6 @@ filling in the last row, and updating the screen.
 
 #pragma once
 
-#include <vector>
-
 #include "cursor.h"
 #include "Row.hpp"
 #include "TextAttribute.hpp"
@@ -192,7 +190,7 @@ public:
 private:
     void _UpdateSize();
     Microsoft::Console::Types::Viewport _size;
-    std::vector<ROW> _storage;
+    std::deque<ROW> _storage;
     Cursor _cursor;
 
     SHORT _firstRow; // indexes top row (not necessarily 0)

src/buffer/out/ut_textbuffer/ReflowTests.cpp

@@ -1,856 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "precomp.h"
-#include "WexTestClass.h"
-#include "../../inc/consoletaeftemplates.hpp"
-
-#include "../textBuffer.hpp"
-#include "../../renderer/inc/DummyRenderTarget.hpp"
-#include "../../types/inc/Utf16Parser.hpp"
-#include "../../types/inc/GlyphWidth.hpp"
-
-#include <IDataSource.h>
-
-template<>
-class WEX::TestExecution::VerifyOutputTraits<wchar_t>
-{
-public:
-    static WEX::Common::NoThrowString ToString(const wchar_t& wch)
-    {
-        return WEX::Common::NoThrowString().Format(L"'%c'", wch);
-    }
-};
-
-using namespace WEX::Common;
-using namespace WEX::Logging;
-using namespace WEX::TestExecution;
-
-namespace
-{
-    struct TestRow
-    {
-        std::wstring_view text;
-        bool wrap;
-    };
-
-    struct TestBuffer
-    {
-        COORD size;
-        std::vector<TestRow> rows;
-        COORD cursor;
-    };
-
-    struct TestCase
-    {
-        std::wstring_view name;
-        std::vector<TestBuffer> buffers;
-    };
-
-    static constexpr auto true_due_to_exact_wrap_bug{ true };
-
-    static const TestCase testCases[] = {
-        TestCase{
-            L"No reflow required",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"AB    ", false },
-                        { L"$     ", false },
-                        { L"CD    ", false },
-                        { L"EFG   ", false },
-                        { L"      ", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        { L"AB   ", false },
-                        { L"$    ", false },
-                        { L"CD   ", false },
-                        { L"EFG  ", false },
-                        { L"     ", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 4, 5 },
-                    {
-                        { L"AB  ", false },
-                        { L"$   ", false },
-                        { L"CD  ", false },
-                        { L"EFG ", false },
-                        { L"    ", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor remains in buffer, no circling, no original wrap",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", false },
-                        { L"$     ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        { L"ABCDE", true },
-                        { L"F$   ", false }, // [BUG] EXACT WRAP. $ should be alone on next line.
-                        { L"     ", false },
-                        { L"     ", false },
-                        { L"     ", false },
-                    },
-                    { 1, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 6, 5 }, // grow width back to original
-                    {
-                        { L"ABCDEF", true_due_to_exact_wrap_bug },
-                        { L"$     ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 7, 5 }, // grow width wider than original
-                    {
-                        { L"ABCDEF$", true_due_to_exact_wrap_bug }, // EXACT WRAP BUG: $ should be alone on next line
-                        { L"       ", false },
-                        { L"       ", false },
-                        { L"       ", false },
-                        { L"       ", false },
-                    },
-                    { 6, 0 } // cursor on $
-                },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor remains in buffer, no circling, with original wrap",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", true },
-                        { L"G$    ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 1, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        { L"ABCDE", true },
-                        { L"FG$  ", false },
-                        { L"     ", false },
-                        { L"     ", false },
-                        { L"     ", false },
-                    },
-                    { 2, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 6, 5 }, // grow width back to original
-                    {
-                        { L"ABCDEF", true },
-                        { L"G$    ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 1, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 7, 5 }, // grow width wider than original
-                    {
-                        { L"ABCDEFG", true },
-                        { L"$      ", false },
-                        { L"       ", false },
-                        { L"       ", false },
-                        { L"       ", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-            },
-        },
-        TestCase{
-            L"SBCS line padded with spaces (to wrap)",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"AB    ", true }, // AB    $     CD is one long wrapped line
-                        { L"$     ", true },
-                        { L"CD    ", false },
-                        { L"EFG   ", false },
-                        { L"      ", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 7, 5 }, // reduce width by 1
-                    {
-                        { L"AB    $", true },
-                        { L"     CD", true_due_to_exact_wrap_bug },
-                        { L"       ", false },
-                        { L"EFG    ", false },
-                        { L"       ", false },
-                    },
-                    { 6, 0 } // cursor on $
-                },
-                TestBuffer{
-                    { 8, 5 },
-                    {
-                        { L"AB    $ ", true },
-                        { L"    CD  ", false }, // Goes to false because we hit the end of ..CD
-                        { L"EFG     ", false }, // [BUG] EFG moves up due to exact wrap bug above
-                        { L"        ", false },
-                        { L"        ", false },
-                    },
-                    { 6, 0 } // cursor on $
-                },
-            },
-        },
-        TestCase{
-            L"DBCS, cursor remains in buffer, no circling, with original wrap",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        //--0123456--
-                        { L"カタカ", true }, // KA TA KA
-                        { L"ナ$   ", false }, // NA
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 2, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        //--012345--
-                        { L"カタ ", true }, // KA TA [FORCED SPACER]
-                        { L"カナ$", true_due_to_exact_wrap_bug }, // KA NA
-                        { L"     ", false },
-                        { L"     ", false },
-                        { L"     ", false },
-                    },
-                    { 4, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 6, 5 }, // grow width back to original
-                    {
-                        //--0123456--
-                        { L"カタカ", true }, // KA TA KA
-                        { L"ナ$   ", false }, // NA
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 2, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 7, 5 }, // grow width wider than original (by one; no visible change!)
-                    {
-                        //--0123456--
-                        { L"カタカ ", true }, // KA TA KA [FORCED SPACER]
-                        { L"ナ$    ", false }, // NA
-                        { L"       ", false },
-                        { L"       ", false },
-                        { L"       ", false },
-                    },
-                    { 2, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 8, 5 }, // grow width enough to fit second DBCS
-                    {
-                        //--01234567--
-                        { L"カタカナ", true }, // KA TA KA NA
-                        { L"$       ", false },
-                        { L"        ", false },
-                        { L"        ", false },
-                        { L"        ", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor remains in buffer, with circling, no original wrap",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", false },
-                        { L"$     ", false },
-                        { L"GHIJKL", false },
-                        { L"MNOPQR", false },
-                        { L"STUVWX", false },
-                    },
-                    { 0, 1 } // cursor on $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        { L"F$   ", false },
-                        { L"GHIJK", true }, // [BUG] We should see GHIJK\n L\n MNOPQ\n R\n
-                        { L"LMNOP", true }, // The wrapping here is irregular
-                        { L"QRSTU", true },
-                        { L"VWX  ", false },
-                    },
-                    { 1, 1 } // [BUG] cursor moves to 1,1 instead of sticking with the $
-                },
-                TestBuffer{
-                    { 6, 5 }, // going back to 6,5, the data lost has been destroyed
-                    {
-                        //{ L"F$    ", false }, // [BUG] this line is erroneously destroyed too!
-                        { L"GHIJKL", true },
-                        { L"MNOPQR", true },
-                        { L"STUVWX", true },
-                        { L"      ", false },
-                        { L"      ", false }, // [BUG] this line is added
-                    },
-                    { 1, 1 }, // [BUG] cursor does not follow [H], it sticks at 1,1
-                },
-                TestBuffer{
-                    { 7, 5 }, // a number of errors are carried forward from the previous buffer
-                    {
-                        { L"GHIJKLM", true },
-                        { L"NOPQRST", true },
-                        { L"UVWX   ", false }, // [BUG] This line loses wrap for some reason
-                        { L"       ", false },
-                        { L"       ", false },
-                    },
-                    { 0, 1 }, // [BUG] The cursor moves to 0, 1 now, sticking with the [N] from before
-                },
-            },
-        },
-        TestCase{
-            // The cursor is not found during character insertion.
-            // Instead, it is found off the right edge of the text. This triggers
-            // a separate cursor found codepath in the original algorithm.
-            L"SBCS, cursor off rightmost char in non-wrapped line",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", false },
-                        { L"$     ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 1, 1 } // cursor *after* $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        { L"ABCDE", true },
-                        { L"F$   ", false }, // [BUG] EXACT WRAP. $ should be alone on next line.
-                        { L"     ", false },
-                        { L"     ", false },
-                        { L"     ", false },
-                    },
-                    { 2, 1 } // cursor follows space after $ to next line
-                },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor off rightmost char in wrapped line, which is then pushed off bottom",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", true },
-                        { L"GHIJKL", true },
-                        { L"MNOPQR", true },
-                        { L"STUVWX", true },
-                        { L"YZ0 $ ", false },
-                    },
-                    { 5, 4 } // cursor *after* $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        { L"FGHIJ", true },
-                        { L"KLMNO", true },
-                        { L"PQRST", true },
-                        { L"UVWXY", true },
-                        { L"Z0 $ ", false },
-                    },
-                    { 4, 4 } // cursor follows space after $ to newly introduced bottom line
-                },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor off in space to far right of text (end of buffer content)",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", false },
-                        //       v cursor
-                        { L"$     ", false },
-                        //       ^ cursor
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 5, 1 } // cursor in space far after $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        { L"ABCDE", true },
-                        { L"F$   ", true }, // [BUG] This line is marked wrapped, and I do not know why
-                        //   v cursor
-                        { L"     ", false },
-                        //   ^ cursor
-                        { L"     ", false },
-                        { L"     ", false },
-                    },
-                    { 1, 2 } // cursor stays same linear distance from $
-                },
-                TestBuffer{
-                    { 6, 5 }, // grow back to original size
-                    {
-                        { L"ABCDEF", true_due_to_exact_wrap_bug },
-                        //      v cursor [BUG] cursor does not retain linear distance from $
-                        { L"$     ", false },
-                        //      ^ cursor
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 4, 1 } // cursor stays same linear distance from $
-                },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor off in space to far right of text (middle of buffer content)",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", false },
-                        //       v cursor
-                        { L"$     ", false },
-                        //       ^ cursor
-                        { L"BLAH  ", false },
-                        { L"BLAH  ", false },
-                        { L"      ", false },
-                    },
-                    { 5, 1 } // cursor in space far after $
-                },
-                TestBuffer{
-                    { 5, 5 }, // reduce width by 1
-                    {
-                        { L"ABCDE", true },
-                        { L"F$   ", false },
-                        { L"BLAH ", false },
-                        { L"BLAH ", true }, // [BUG] this line wraps, no idea why
-                        //  v cursor [BUG] cursor erroneously moved to end of all content
-                        { L"     ", false },
-                        //  ^ cursor
-                    },
-                    { 0, 4 } },
-                TestBuffer{
-                    { 6, 5 }, // grow back to original size
-                    {
-                        { L"ABCDEF", true },
-                        { L"$     ", false },
-                        { L"BLAH  ", false },
-                        //       v cursor [BUG] cursor is pulled up to previous line because it was marked wrapped
-                        { L"BLAH  ", false },
-                        //       ^ cursor
-                        { L"      ", false },
-                    },
-                    { 5, 3 } },
-            },
-        },
-        TestCase{
-            // Shrinking the buffer this much forces a multi-line wrap before the cursor
-            L"SBCS, cursor off in space to far right of text (end of buffer content), aggressive shrink",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", false },
-                        //       v cursor
-                        { L"$     ", false },
-                        //       ^ cursor
-                        { L"      ", false },
-                        { L"      ", false },
-                        { L"      ", false },
-                    },
-                    { 5, 1 } // cursor in space far after $
-                },
-                TestBuffer{
-                    { 2, 5 }, // reduce width aggressively
-                    {
-                        { L"CD", true },
-                        { L"EF", true },
-                        { L"$ ", true },
-                        { L"  ", true },
-                        //   v cursor
-                        { L"  ", false },
-                        //   ^ cursor
-                    },
-                    { 1, 4 } },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor off in space to far right of text (end of buffer content), fully wrapped, aggressive shrink",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", true },
-                        //       v cursor
-                        { L"$     ", true },
-                        //       ^ cursor
-                        { L"      ", true },
-                        { L"      ", true },
-                        { L"      ", true },
-                    },
-                    { 5, 1 } // cursor in space far after $
-                },
-                TestBuffer{
-                    { 2, 5 }, // reduce width aggressively
-                    {
-                        { L"EF", true },
-                        { L"$ ", true },
-                        { L"  ", true },
-                        { L"  ", true },
-                        //   v cursor [BUG] cursor does not maintain linear distance from $
-                        { L"  ", false },
-                        //   ^ cursor
-                    },
-                    { 1, 4 } },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor off in space to far right of text (middle of buffer content), fully wrapped, aggressive shrink",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", true },
-                        //       v cursor
-                        { L"$     ", true },
-                        //       ^ cursor
-                        { L"      ", true },
-                        { L"      ", true },
-                        { L"     Q", true },
-                    },
-                    { 5, 1 } // cursor in space far after $
-                },
-                TestBuffer{
-                    { 2, 5 }, // reduce width aggressively
-                    {
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L" Q", true },
-                        //   v cursor [BUG] cursor jumps to end of world
-                        { L"  ", false }, // POTENTIAL [BUG] a whole new blank line is added for the cursor
-                        //   ^ cursor
-                    },
-                    { 1, 4 } },
-            },
-        },
-        TestCase{
-            L"SBCS, cursor off in space to far right of text (middle of buffer content), partially wrapped, aggressive shrink",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", false },
-                        //       v cursor
-                        { L"$     ", false },
-                        //       ^ cursor
-                        { L"      ", false },
-                        { L"      ", true },
-                        { L"     Q", true },
-                    },
-                    { 5, 1 } // cursor in space far after $
-                },
-                TestBuffer{
-                    { 2, 5 }, // reduce width aggressively
-                    {
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L" Q", true },
-                        //  v  cursor [BUG] cursor jumps to different place than fully wrapped case
-                        { L"  ", false },
-                        //  ^  cursor
-                    },
-                    { 0, 4 } },
-            },
-        },
-        TestCase{
-            // This triggers the cursor being walked forward w/ newlines to maintain
-            // distance from the last char in the buffer
-            L"SBCS, cursor at end of buffer, otherwise same as previous test",
-            {
-                TestBuffer{
-                    { 6, 5 },
-                    {
-                        { L"ABCDEF", false },
-                        { L"$     ", false },
-                        { L"     Q", true },
-                        { L"      ", true },
-                        //       v cursor
-                        { L"      ", true },
-                        //       ^ cursor
-                    },
-                    { 5, 4 } // cursor at end of buffer
-                },
-                TestBuffer{
-                    { 2, 5 }, // reduce width aggressively
-                    {
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L" Q", true },
-                        { L"  ", false },
-                        //  v  cursor [BUG] cursor loses linear distance from Q; is this important?
-                        { L"  ", false },
-                        //  ^  cursor
-                    },
-                    { 0, 4 } },
-            },
-        },
-    };
-
-#pragma region TAEF hookup for the test case array above
-    struct ArrayIndexTaefAdapterRow : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataRow>
-    {
-        HRESULT RuntimeClassInitialize(const size_t index)
-        {
-            _index = index;
-            return S_OK;
-        }
-
-        STDMETHODIMP GetTestData(BSTR /*pszName*/, SAFEARRAY** ppData) override
-        {
-            const auto indexString{ wil::str_printf<std::wstring>(L"%zu", _index) };
-            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
-            LONG index{ 0 };
-            auto indexBstr{ wil::make_bstr(indexString.c_str()) };
-            (void)SafeArrayPutElement(safeArray, &index, indexBstr.release());
-            *ppData = safeArray;
-            return S_OK;
-        }
-
-        STDMETHODIMP GetMetadataNames(SAFEARRAY** ppMetadataNames) override
-        {
-            *ppMetadataNames = nullptr;
-            return S_FALSE;
-        }
-
-        STDMETHODIMP GetMetadata(BSTR /*pszName*/, SAFEARRAY** ppData) override
-        {
-            *ppData = nullptr;
-            return S_FALSE;
-        }
-
-        STDMETHODIMP GetName(BSTR* ppszRowName) override
-        {
-            *ppszRowName = nullptr;
-            return S_FALSE;
-        }
-
-    private:
-        size_t _index;
-    };
-
-    struct ArrayIndexTaefAdapterSource : public Microsoft::WRL::RuntimeClass<Microsoft::WRL::RuntimeClassFlags<Microsoft::WRL::ClassicCom | Microsoft::WRL::InhibitFtmBase>, IDataSource>
-    {
-        STDMETHODIMP Advance(IDataRow** ppDataRow) override
-        {
-            if (_index < std::extent<decltype(testCases)>::value)
-            {
-                Microsoft::WRL::MakeAndInitialize<ArrayIndexTaefAdapterRow>(ppDataRow, _index++);
-            }
-            else
-            {
-                *ppDataRow = nullptr;
-            }
-            return S_OK;
-        }
-
-        STDMETHODIMP Reset() override
-        {
-            _index = 0;
-            return S_OK;
-        }
-
-        STDMETHODIMP GetTestDataNames(SAFEARRAY** names) override
-        {
-            auto safeArray{ SafeArrayCreateVector(VT_BSTR, 0, 1) };
-            LONG index{ 0 };
-            auto dataNameBstr{ wil::make_bstr(L"index") };
-            (void)SafeArrayPutElement(safeArray, &index, dataNameBstr.release());
-            *names = safeArray;
-            return S_OK;
-        }
-
-        STDMETHODIMP GetTestDataType(BSTR /*name*/, BSTR* type) override
-        {
-            *type = nullptr;
-            return S_OK;
-        }
-
-    private:
-        size_t _index{ 0 };
-    };
-#pragma endregion
-}
-
-extern "C" HRESULT __declspec(dllexport) __cdecl ReflowTestDataSource(IDataSource** ppDataSource, void*)
-{
-    auto source{ Microsoft::WRL::Make<ArrayIndexTaefAdapterSource>() };
-    return source.CopyTo(ppDataSource);
-}
-
-class ReflowTests
-{
-    TEST_CLASS(ReflowTests);
-
-    static DummyRenderTarget target;
-    static std::unique_ptr<TextBuffer> _textBufferFromTestBuffer(const TestBuffer& testBuffer)
-    {
-        auto buffer = std::make_unique<TextBuffer>(testBuffer.size, TextAttribute{ 0x7 }, 0, target);
-
-        size_t i{};
-        for (const auto& testRow : testBuffer.rows)
-        {
-            auto& row{ buffer->GetRowByOffset(i) };
-
-            auto& charRow{ row.GetCharRow() };
-            row.SetWrapForced(testRow.wrap);
-
-            size_t j{};
-            for (auto it{ charRow.begin() }; it != charRow.end(); ++it)
-            {
-                // Yes, we're about to manually create a buffer. It is unpleasant.
-                const auto ch{ til::at(testRow.text, j) };
-                it->Char() = ch;
-                if (IsGlyphFullWidth(ch))
-                {
-                    it->DbcsAttr().SetLeading();
-                    it++;
-                    it->Char() = ch;
-                    it->DbcsAttr().SetTrailing();
-                }
-                else
-                {
-                    it->DbcsAttr().SetSingle();
-                }
-                j++;
-            }
-            i++;
-        }
-
-        buffer->GetCursor().SetPosition(testBuffer.cursor);
-        return buffer;
-    }
-
-    static std::unique_ptr<TextBuffer> _textBufferByReflowingTextBuffer(TextBuffer& originalBuffer, const COORD newSize)
-    {
-        auto buffer = std::make_unique<TextBuffer>(newSize, TextAttribute{ 0x7 }, 0, target);
-        TextBuffer::Reflow(originalBuffer, *buffer, std::nullopt, std::nullopt);
-        return buffer;
-    }
-
-    static void _compareTextBufferAgainstTestBuffer(const TextBuffer& buffer, const TestBuffer& testBuffer)
-    {
-        VERIFY_ARE_EQUAL(testBuffer.cursor, buffer.GetCursor().GetPosition());
-        VERIFY_ARE_EQUAL(testBuffer.size, buffer.GetSize().Dimensions());
-
-        size_t i{};
-        for (const auto& testRow : testBuffer.rows)
-        {
-            NoThrowString indexString;
-            const auto& row{ buffer.GetRowByOffset(i) };
-
-            const auto& charRow{ row.GetCharRow() };
-
-            indexString.Format(L"[Row %d]", i);
-            VERIFY_ARE_EQUAL(testRow.wrap, row.WasWrapForced(), indexString);
-
-            size_t j{};
-            for (auto it{ charRow.begin() }; it != charRow.end(); ++it)
-            {
-                indexString.Format(L"[Cell %d, %d; Text line index %d]", it - charRow.begin(), i, j);
-                // Yes, we're about to manually create a buffer. It is unpleasant.
-                const auto ch{ til::at(testRow.text, j) };
-                if (IsGlyphFullWidth(ch))
-                {
-                    // Char is full width in test buffer, so
-                    // ensure that real buffer is LEAD, TRAIL (ch)
-                    VERIFY_IS_TRUE(it->DbcsAttr().IsLeading(), indexString);
-                    VERIFY_ARE_EQUAL(ch, it->Char(), indexString);
-
-                    it++;
-                    VERIFY_IS_TRUE(it->DbcsAttr().IsTrailing(), indexString);
-                }
-                else
-                {
-                    VERIFY_IS_TRUE(it->DbcsAttr().IsSingle(), indexString);
-                }
-
-                VERIFY_ARE_EQUAL(ch, it->Char(), indexString);
-                j++;
-            }
-            i++;
-        }
-    }
-
-    TEST_METHOD(TestReflowCases)
-    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"DataSource", L"Export:ReflowTestDataSource")
-        END_TEST_METHOD_PROPERTIES()
-
-        WEX::TestExecution::DisableVerifyExceptions disableVerifyExceptions{};
-        WEX::TestExecution::SetVerifyOutput verifyOutputScope{ WEX::TestExecution::VerifyOutputSettings::LogOnlyFailures };
-
-        unsigned int i{};
-        TestData::TryGetValue(L"index", i); // index is produced by the ArrayIndexTaefAdapterSource above
-        const auto& testCase{ testCases[i] };
-        Log::Comment(NoThrowString().Format(L"[%zu.0] Test case \"%.*s\"", i, testCase.name.size(), testCase.name.data()));
-
-        // Create initial text buffer from Buffer 0
-        auto textBuffer{ _textBufferFromTestBuffer(testCase.buffers.front()) };
-        for (size_t bufferIndex{ 1 }; bufferIndex < testCase.buffers.size(); ++bufferIndex)
-        {
-            const auto& testBuffer{ til::at(testCase.buffers, bufferIndex) };
-            Log::Comment(NoThrowString().Format(L"[%zu.%zu] Resizing to %dx%d", i, bufferIndex, testBuffer.size.X, testBuffer.size.Y));
-
-            auto newBuffer{ _textBufferByReflowingTextBuffer(*textBuffer, testBuffer.size) };
-
-            // All future operations are based on the new buffer
-            std::swap(textBuffer, newBuffer);
-
-            _compareTextBufferAgainstTestBuffer(*textBuffer, testBuffer);
-        }
-    }
-};
-
-DummyRenderTarget ReflowTests::target{};

src/buffer/out/ut_textbuffer/TextBuffer.Unit.Tests.vcxproj

@@ -10,8 +10,6 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <ItemGroup>
-    <ClCompile Include="AttrRowTests.cpp" />
-    <ClCompile Include="ReflowTests.cpp" />
     <ClCompile Include="TextColorTests.cpp" />
     <ClCompile Include="TextAttributeTests.cpp" />
     <ClCompile Include="UnicodeStorageTests.cpp" />
@@ -20,9 +18,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\types\lib\types.vcxproj">
-      <Project>{18d09a24-8240-42d6-8cb6-236eee820263}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\lib\bufferout.vcxproj">
       <Project>{0cf235bd-2da0-407e-90ee-c467e8bbc714}</Project>
     </ProjectReference>

src/buffer/out/ut_textbuffer/sources

@@ -14,15 +14,12 @@ DLLDEF                  =
 
 SOURCES = \
     $(SOURCES) \
-    AttrRowTests.cpp \
-    ReflowTests.cpp \
     TextColorTests.cpp \
     TextAttributeTests.cpp \
     DefaultResource.rc \
 
 TARGETLIBS = \
     $(CONSOLE_OBJ_PATH)\buffer\out\lib\$(O)\ConBufferOut.lib \
-    $(CONSOLE_OBJ_PATH)\types\lib\$(O)\ConTypes.lib \
     $(TARGETLIBS) \
 
 # -------------------------------------

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -3,7 +3,8 @@
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\wap-common.build.pre.props" />
   <PropertyGroup Label="Configuration">
-
+    <!-- This is necessary so the build system doesn't think we're a .NET project... -->
+    <TargetRuntime>Native</TargetRuntime>
     <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
     <!--

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -82,9 +82,14 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                <!-- Due to a bug in the OS, this doesn't actually work right -
+                we'll get a nullptr in our implementation. So this is disabled
+                temporarily. See MSFT:24623699 for more details.
+
                 <desktop5:ItemType Type="Directory\Background">
-                  <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
-                </desktop5:ItemType>                
+                    <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
+                </desktop5:ItemType>
+                -->
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
 

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -82,9 +82,15 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                <!-- Due to a bug in the OS, this doesn't actually work right -
+                we'll get a nullptr in our implementation. So this is disabled
+                temporarily. See MSFT:24623699 for more details.
+
                 <desktop5:ItemType Type="Directory\Background">
-                  <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
+                    <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                -->
+
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
 

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -83,9 +83,14 @@
                 <desktop5:ItemType Type="Directory">
                     <desktop5:Verb Id="Command1" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                <!-- Due to a bug in the OS, this doesn't actually work right -
+                we'll get a nullptr in our implementation. So this is disabled
+                temporarily. See MSFT:24623699 for more details.
+
                 <desktop5:ItemType Type="Directory\Background">
-                  <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
+                    <desktop5:Verb Id="Command2" Clsid="9f156763-7844-4dc4-b2b1-901f640f5155" />
                 </desktop5:ItemType>
+                -->
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
 

src/cascadia/CommandlineArgs/AppCommandlineArgs.cpp

@@ -2,14 +2,12 @@
 // Licensed under the MIT license.
 
 #include "pch.h"
-#include "AppLogic.h"
 #include "AppCommandlineArgs.h"
 #include "../types/inc/utils.hpp"
 #include <LibraryResources.h>
 
-using namespace winrt::TerminalApp;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace TerminalApp;
+using namespace CommandlineArgs;
 
 // Either a ; at the start of a line, or a ; preceded by any non-\ char.
 const std::wregex AppCommandlineArgs::_commandDelimiterRegex{ LR"(^;|[^\\];)" };
@@ -189,7 +187,6 @@ void AppCommandlineArgs::_buildParser()
     _buildNewTabParser();
     _buildSplitPaneParser();
     _buildFocusTabParser();
-    _buildMoveFocusParser();
 }
 
 // Method Description:
@@ -248,10 +245,6 @@ void AppCommandlineArgs::_buildSplitPaneParser()
                                                                      _splitVertical,
                                                                      RS_A(L"CmdSplitPaneVerticalArgDesc"));
         subcommand._verticalOption->excludes(subcommand._horizontalOption);
-        auto* sizeOpt = subcommand.subcommand->add_option("-s,--size",
-                                                          _splitPaneSize,
-                                                          RS_A(L"CmdSplitPaneSizeArgDesc"));
-        sizeOpt->check(CLI::Range(0.01f, 0.99f));
 
         // When ParseCommand is called, if this subcommand was provided, this
         // callback function will be triggered on the same thread. We can be sure
@@ -279,7 +272,7 @@ void AppCommandlineArgs::_buildSplitPaneParser()
                     style = SplitState::Vertical;
                 }
             }
-            SplitPaneArgs args{ style, _splitPaneSize, terminalArgs };
+            SplitPaneArgs args{ style, terminalArgs };
             splitPaneActionAndArgs.Args(args);
             _startupActions.push_back(splitPaneActionAndArgs);
         });
@@ -342,54 +335,6 @@ void AppCommandlineArgs::_buildFocusTabParser()
     setupSubcommand(_focusTabShort);
 }
 
-// Method Description:
-// - Adds the `move-focus` subcommand and related options to the commandline parser.
-// - Additionally adds the `mf` subcommand, which is just a shortened version of `move-focus`
-// Arguments:
-// - <none>
-// Return Value:
-// - <none>
-void AppCommandlineArgs::_buildMoveFocusParser()
-{
-    _moveFocusCommand = _app.add_subcommand("move-focus", RS_A(L"CmdMoveFocusDesc"));
-    _moveFocusShort = _app.add_subcommand("mf", RS_A(L"CmdMFDesc"));
-
-    auto setupSubcommand = [this](auto* subcommand) {
-        std::map<std::string, FocusDirection> map = {
-            { "left", FocusDirection::Left },
-            { "right", FocusDirection::Right },
-            { "up", FocusDirection::Up },
-            { "down", FocusDirection::Down }
-        };
-
-        auto* directionOpt = subcommand->add_option("direction",
-                                                    _moveFocusDirection,
-                                                    RS_A(L"CmdMoveFocusDirectionArgDesc"));
-
-        directionOpt->transform(CLI::CheckedTransformer(map, CLI::ignore_case));
-        directionOpt->required();
-        // When ParseCommand is called, if this subcommand was provided, this
-        // callback function will be triggered on the same thread. We can be sure
-        // that `this` will still be safe - this function just lets us know this
-        // command was parsed.
-        subcommand->callback([&, this]() {
-            if (_moveFocusDirection != FocusDirection::None)
-            {
-                MoveFocusArgs args{ _moveFocusDirection };
-
-                ActionAndArgs actionAndArgs{};
-                actionAndArgs.Action(ShortcutAction::MoveFocus);
-                actionAndArgs.Args(args);
-
-                _startupActions.push_back(std::move(actionAndArgs));
-            }
-        });
-    };
-
-    setupSubcommand(_moveFocusCommand);
-    setupSubcommand(_moveFocusShort);
-}
-
 // Method Description:
 // - Add the `NewTerminalArgs` parameters to the given subcommand. This enables
 //   that subcommand to support all the properties in a NewTerminalArgs.
@@ -497,8 +442,6 @@ bool AppCommandlineArgs::_noCommandsProvided()
              *_newTabShort.subcommand ||
              *_focusTabCommand ||
              *_focusTabShort ||
-             *_moveFocusCommand ||
-             *_moveFocusShort ||
              *_newPaneShort.subcommand ||
              *_newPaneCommand.subcommand);
 }
@@ -521,13 +464,11 @@ void AppCommandlineArgs::_resetStateToDefault()
 
     _splitVertical = false;
     _splitHorizontal = false;
-    _splitPaneSize = 0.5f;
 
     _focusTabIndex = -1;
     _focusNextTab = false;
     _focusPrevTab = false;
 
-    _moveFocusDirection = FocusDirection::None;
     // DON'T clear _launchMode here! This will get called once for every
     // subcommand, so we don't want `wt -F new-tab ; split-pane` clearing out
     // the "global" fullscreen flag (-F).
@@ -744,7 +685,7 @@ std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> AppComman
 // - 0 if the commandline was successfully parsed
 int AppCommandlineArgs::ParseArgs(winrt::array_view<const winrt::hstring>& args)
 {
-    auto commands = ::TerminalApp::AppCommandlineArgs::BuildCommands(args);
+    auto commands = ::CommandlineArgs::AppCommandlineArgs::BuildCommands(args);
 
     for (auto& cmdBlob : commands)
     {

src/cascadia/CommandlineArgs/AppCommandlineArgs.h

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 #pragma once
 
+#include <CLI11/CLI11.hpp>
 #include "Commandline.h"
 
 #ifdef UNIT_TESTING
@@ -12,12 +13,12 @@ namespace TerminalAppLocalTests
 };
 #endif
 
-namespace TerminalApp
+namespace CommandlineArgs
 {
     class AppCommandlineArgs;
 };
 
-class TerminalApp::AppCommandlineArgs final
+class CommandlineArgs::AppCommandlineArgs final
 {
 public:
     static constexpr std::string_view NixHelpFlag{ "-?" };
@@ -74,9 +75,6 @@ private:
     NewPaneSubcommand _newPaneShort;
     CLI::App* _focusTabCommand;
     CLI::App* _focusTabShort;
-    CLI::App* _moveFocusCommand;
-    CLI::App* _moveFocusShort;
-
     // Are you adding a new sub-command? Make sure to update _noCommandsProvided!
 
     std::string _profileName;
@@ -84,14 +82,11 @@ private:
     std::string _startingTitle;
     std::string _startingTabColor;
 
-    winrt::Microsoft::Terminal::Settings::Model::FocusDirection _moveFocusDirection{ winrt::Microsoft::Terminal::Settings::Model::FocusDirection::None };
-
     // _commandline will contain the command line with which we'll be spawning a new terminal
     std::vector<std::string> _commandline;
 
     bool _splitVertical{ false };
     bool _splitHorizontal{ false };
-    float _splitPaneSize{ 0.5f };
 
     int _focusTabIndex{ -1 };
     bool _focusNextTab{ false };
@@ -111,7 +106,6 @@ private:
     void _buildNewTabParser();
     void _buildSplitPaneParser();
     void _buildFocusTabParser();
-    void _buildMoveFocusParser();
     bool _noCommandsProvided();
     void _resetStateToDefault();
     int _handleExit(const CLI::App& command, const CLI::Error& e);

src/cascadia/CommandlineArgs/Commandline.cpp

@@ -4,7 +4,7 @@
 #include "pch.h"
 #include "Commandline.h"
 
-using namespace TerminalApp;
+using namespace CommandlineArgs;
 
 size_t Commandline::Argc() const
 {

src/cascadia/CommandlineArgs/Commandline.h

@@ -23,12 +23,12 @@ namespace TerminalAppLocalTests
 {
     class CommandlineTest;
 };
-namespace TerminalApp
+namespace CommandlineArgs
 {
     class Commandline;
 };
 
-class TerminalApp::Commandline
+class CommandlineArgs::Commandline
 {
 public:
     static constexpr std::wstring_view Delimiter{ L";" };

src/cascadia/CommandlineArgs/CommandlineArgs.vcxproj

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2658e9b0-bd84-48b7-bb5e-3d18f4df07ba}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Microsoft.Terminal.CommandlineArgs</RootNamespace>
+    <ProjectName>CommandlineArgs</ProjectName>
+    <TargetName>CommandlineArgs</TargetName>
+    <WindowsTargetPlatformMinVersion>10.0.17763.0</WindowsTargetPlatformMinVersion>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <SubSystem>Console</SubSystem>
+    <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
+  </PropertyGroup>
+  <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
+  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
+  <ItemDefinitionGroup>
+
+    <ClCompile>
+      <!-- For CLI11: It uses dynamic_cast to cast types around, which depends
+      on being compiled with RTTI (/GR). -->
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
+  <!-- ========================= Headers ======================== -->
+  <ItemGroup>
+    <ClInclude Include="AppCommandlineArgs.h" />
+    <ClInclude Include="Commandline.h" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <!-- ========================= Cpp Files ======================== -->
+  <ItemGroup>
+    <ClCompile Include="AppCommandlineArgs.cpp" />
+    <ClCompile Include="Commandline.cpp" />
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <!-- ========================= idl Files ======================== -->
+  <ItemGroup>
+  </ItemGroup>
+  <!-- ========================= Misc Files ======================== -->
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <!-- ========================= Project References ======================== -->
+  <ItemGroup>
+    <!--
+      the packaging project won't recurse through our dependencies, you have to
+      make sure that if you add a cppwinrt dependency to any of these projects,
+      you also update all the consumers
+    -->
+    <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">
+      <Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <!-- For whatever reason, we can't include the TerminalControl and
+    TerminalSettings projects' winmds via project references. So we'll have to
+    manually include the winmds as References below -->
+  </ItemGroup>
+  <PropertyGroup>
+    <!-- This is a hack to get the ARM64 CI build working. See
+    https://github.com/Microsoft/msbuild/issues/3746 - it looks like MsBuild
+    just has a bug in it.-->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>Warning</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Manually add references to each of our dependent winmds. Mark them as
+    private=false and CopyLocalSatelliteAssemblies=false, so that we don't
+    propagate them upwards (which can make referencing this project result in
+    duplicate type definitions)-->
+
+    <!-- Despite this lib only _really_ depending on the settings model, we need
+    to reference Connection, Control, and MUX here, because they have types that
+    TSM depends on, and the midl compiler will be mad if it can't find them. -->
+
+    <Reference Include="Microsoft.Terminal.TerminalConnection">
+      <HintPath>$(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+    <Reference Include="Microsoft.Terminal.TerminalControl">
+      <HintPath>$(OpenConsoleCommonOutDir)TerminalControl\Microsoft.Terminal.TerminalControl.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+    <Reference Include="Microsoft.Terminal.Settings.Model">
+      <HintPath>$(OpenConsoleCommonOutDir)Microsoft.Terminal.Settings.Model\Microsoft.Terminal.Settings.Model.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+  </ItemGroup>
+  <!-- ====================== Compiler & Linker Flags ===================== -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalIncludeDirectories>..;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
+      <!-- Manually disable unreachable code warning, because jconcpp has a ton of that. -->
+      <DisableSpecificWarnings>4702;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <!-- ========================= Globals ======================== -->
+  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
+  <Import Project="..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('..\..\..\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(OpenConsoleDir)\packages\Microsoft.UI.Xaml.2.5.0-prerelease.201202003\build\native\Microsoft.UI.Xaml.targets'))" />
+  </Target>
+  <!-- <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" /> -->
+</Project>

src/cascadia/CommandlineArgs/pch.cpp

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

src/cascadia/CommandlineArgs/pch.h

@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+//
+// pch.h
+// Header for platform projection include files
+//
+
+#pragma once
+
+#define WIN32_LEAN_AND_MEAN
+#define NOMCX
+#define NOHELP
+#define NOCOMM
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#define BLOCK_TIL
+#include <LibraryIncludes.h>
+// This is inexplicable, but for whatever reason, cppwinrt conflicts with the
+//      SDK definition of this function, so the only fix is to undef it.
+// from WinBase.h
+// Windows::UI::Xaml::Media::Animation::IStoryboard::GetCurrentTime
+#ifdef GetCurrentTime
+#undef GetCurrentTime
+#endif
+
+#include <wil/cppwinrt.h>
+
+#include <unknwn.h>
+
+#include <hstring.h>
+
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+// You might think "we're not doing any UI in this lib", and you'd be right.
+// However, we need this for Windows.UI.Color
+#include <winrt/windows.ui.h>
+
+// Including TraceLogging essentials for the binary
+#include <TraceLoggingProvider.h>
+#include <winmeta.h>
+TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
+#include <telemetry/ProjectTelemetry.h>
+#include <TraceLoggingActivity.h>
+
+#include <shellapi.h>
+#include <shobjidl_core.h>
+
+#include <winrt/Microsoft.Terminal.Settings.Model.h>
+
+#include <CLI11/CLI11.hpp>
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#include "til.h"

src/cascadia/LocalTests_SettingsModel/CommandTests.cpp

@@ -37,7 +37,6 @@ namespace SettingsModelLocalTests
         TEST_METHOD(ManyCommandsSameAction);
         TEST_METHOD(LayerCommand);
         TEST_METHOD(TestSplitPaneArgs);
-        TEST_METHOD(TestSplitPaneBadSize);
         TEST_METHOD(TestResourceKeyName);
         TEST_METHOD(TestAutogeneratedName);
         TEST_METHOD(TestLayerOnAutogeneratedName);
@@ -148,8 +147,7 @@ namespace SettingsModelLocalTests
             { "name": "command1", "command": { "action": "splitPane", "split": "vertical" } },
             { "name": "command2", "command": { "action": "splitPane", "split": "horizontal" } },
             { "name": "command4", "command": { "action": "splitPane" } },
-            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } },
-            { "name": "command6", "command": { "action": "splitPane", "size": 0.25 } },
+            { "name": "command5", "command": { "action": "splitPane", "split": "auto" } }
         ])" };
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
@@ -158,7 +156,7 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(0u, commands.Size());
         auto warnings = implementation::Command::LayerJson(commands, commands0Json);
         VERIFY_ARE_EQUAL(0u, warnings.size());
-        VERIFY_ARE_EQUAL(5u, commands.Size());
+        VERIFY_ARE_EQUAL(4u, commands.Size());
 
         {
             auto command = commands.Lookup(L"command1");
@@ -169,7 +167,6 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
-            VERIFY_ARE_EQUAL(0.5, realArgs.SplitSize());
         }
         {
             auto command = commands.Lookup(L"command2");
@@ -180,7 +177,6 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
-            VERIFY_ARE_EQUAL(0.5, realArgs.SplitSize());
         }
         {
             auto command = commands.Lookup(L"command4");
@@ -191,7 +187,6 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
-            VERIFY_ARE_EQUAL(0.5, realArgs.SplitSize());
         }
         {
             auto command = commands.Lookup(L"command5");
@@ -202,51 +197,8 @@ namespace SettingsModelLocalTests
             VERIFY_IS_NOT_NULL(realArgs);
             // Verify the args have the expected value
             VERIFY_ARE_EQUAL(SplitState::Automatic, realArgs.SplitStyle());
-            VERIFY_ARE_EQUAL(0.5, realArgs.SplitSize());
-        }
-        {
-            auto command = commands.Lookup(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(SplitState::Automatic, realArgs.SplitStyle());
-            VERIFY_ARE_EQUAL(0.25, realArgs.SplitSize());
         }
     }
-
-    void CommandTests::TestSplitPaneBadSize()
-    {
-        const std::string commands0String{ R"([
-            { "name": "command1", "command": { "action": "splitPane", "size": 0.25 } },
-            { "name": "command2", "command": { "action": "splitPane", "size": 1.0 } },
-            { "name": "command3", "command": { "action": "splitPane", "size": 0 } },
-            { "name": "command4", "command": { "action": "splitPane", "size": 50 } },
-        ])" };
-
-        const auto commands0Json = VerifyParseSucceeded(commands0String);
-
-        IMap<winrt::hstring, Command> commands = winrt::single_threaded_map<winrt::hstring, Command>();
-        VERIFY_ARE_EQUAL(0u, commands.Size());
-        auto warnings = implementation::Command::LayerJson(commands, commands0Json);
-        VERIFY_ARE_EQUAL(3u, warnings.size());
-        VERIFY_ARE_EQUAL(1u, commands.Size());
-
-        {
-            auto command = commands.Lookup(L"command1");
-            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(SplitState::Automatic, realArgs.SplitStyle());
-            VERIFY_ARE_EQUAL(0.25, realArgs.SplitSize());
-        }
-    }
-
     void CommandTests::TestResourceKeyName()
     {
         // This test checks looking up a name from a resource key.

src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp

@@ -226,7 +226,6 @@ namespace SettingsModelLocalTests
         const std::string settingsString{ R"({
                                                 "$schema": "https://aka.ms/terminal-profiles-schema",
                                                 "defaultProfile": "{61c54bbd-1111-5271-96e7-009a87ff44bf}",
-                                                "disabledProfileSources": [ "Windows.Terminal.Wsl" ],
 
                                                 "profiles": {
                                                     "defaults": {

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -47,7 +47,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(ParseSplitPaneIntoArgs);
         TEST_METHOD(ParseComboCommandlineIntoArgs);
         TEST_METHOD(ParseFocusTabArgs);
-        TEST_METHOD(ParseMoveFocusArgs);
         TEST_METHOD(ParseArgumentsWithParsingTerminators);
 
         TEST_METHOD(ParseNoCommandIsNewTab);
@@ -62,8 +61,6 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TestLaunchMode);
         TEST_METHOD(TestLaunchModeWithNoCommand);
 
-        TEST_METHOD(TestMultipleSplitPaneSizes);
-
     private:
         void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
                                       const size_t expectedSubcommands,
@@ -79,23 +76,6 @@ namespace TerminalAppLocalTests
             appArgs.ValidateStartupCommands();
         }
 
-        void _buildCommandlinesExpectFailureHelper(AppCommandlineArgs& appArgs,
-                                                   const size_t expectedSubcommands,
-                                                   std::vector<const wchar_t*>& rawCommands)
-        {
-            auto commandlines = AppCommandlineArgs::BuildCommands(rawCommands);
-            VERIFY_ARE_EQUAL(expectedSubcommands, commandlines.size());
-            for (auto& cmdBlob : commandlines)
-            {
-                const auto result = appArgs.ParseCommand(cmdBlob);
-                VERIFY_ARE_NOT_EQUAL(0, result);
-                VERIFY_ARE_NOT_EQUAL("", appArgs._exitMessage);
-                Log::Comment(NoThrowString().Format(
-                    L"Exit Message:\n%hs",
-                    appArgs._exitMessage.c_str()));
-            }
-        }
-
         void _logCommandline(std::vector<const wchar_t*>& rawCommands)
         {
             std::wstring buffer;
@@ -1015,124 +995,6 @@ namespace TerminalAppLocalTests
         }
     }
 
-    void CommandlineTest::ParseMoveFocusArgs()
-    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Data:useShortForm", L"{false, true}")
-        END_TEST_METHOD_PROPERTIES()
-
-        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `mf` instead of `move-focus`");
-        const wchar_t* subcommand = useShortForm ? L"mf" : L"move-focus";
-
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand };
-            Log::Comment(NoThrowString().Format(
-                L"Just the subcommand, without a direction, should fail."));
-
-            _buildCommandlinesExpectFailureHelper(appArgs, 1u, rawCommands);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"left" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Left, myArgs.FocusDirection());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"right" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Right, myArgs.FocusDirection());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"up" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Up, myArgs.FocusDirection());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"down" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Down, myArgs.FocusDirection());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"badDirection" };
-            Log::Comment(NoThrowString().Format(
-                L"move-focus with an invalid direction should fail."));
-            _buildCommandlinesExpectFailureHelper(appArgs, 1u, rawCommands);
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"left", L";", subcommand, L"right" };
-            _buildCommandlinesHelper(appArgs, 2u, rawCommands);
-
-            VERIFY_ARE_EQUAL(3u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            auto actionAndArgs = appArgs._startupActions.at(1);
-            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            auto myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Left, myArgs.FocusDirection());
-
-            actionAndArgs = appArgs._startupActions.at(2);
-            VERIFY_ARE_EQUAL(ShortcutAction::MoveFocus, actionAndArgs.Action());
-            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
-            myArgs = actionAndArgs.Args().try_as<MoveFocusArgs>();
-            VERIFY_IS_NOT_NULL(myArgs);
-            VERIFY_ARE_EQUAL(FocusDirection::Right, myArgs.FocusDirection());
-        }
-    }
-
     void CommandlineTest::ValidateFirstCommandIsNewTab()
     {
         AppCommandlineArgs appArgs{};
@@ -1262,7 +1124,7 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestSimpleExecuteCommandlineAction()
     {
         ExecuteCommandlineArgs args{ L"new-tab" };
-        auto actions = winrt::TerminalApp::implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(1u, actions.size());
         auto actionAndArgs = actions.at(0);
         VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
@@ -1281,7 +1143,7 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestMultipleCommandExecuteCommandlineAction()
     {
         ExecuteCommandlineArgs args{ L"new-tab ; split-pane" };
-        auto actions = winrt::TerminalApp::implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(2u, actions.size());
         {
             auto actionAndArgs = actions.at(0);
@@ -1317,7 +1179,7 @@ namespace TerminalAppLocalTests
     {
         // -H and -V cannot be combined.
         ExecuteCommandlineArgs args{ L"split-pane -H -V" };
-        auto actions = winrt::TerminalApp::implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
+        auto actions = implementation::TerminalPage::ConvertExecuteCommandlineToActions(args);
         VERIFY_ARE_EQUAL(0u, actions.size());
     }
 
@@ -1463,119 +1325,4 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(L"powershell.exe", myArgs.TerminalArgs().Commandline());
         }
     }
-
-    void CommandlineTest::TestMultipleSplitPaneSizes()
-    {
-        BEGIN_TEST_METHOD_PROPERTIES()
-            TEST_METHOD_PROPERTY(L"Data:useShortForm", L"{false, true}")
-        END_TEST_METHOD_PROPERTIES()
-
-        INIT_TEST_PROPERTY(bool, useShortForm, L"If true, use `sp` instead of `split-pane`");
-        const wchar_t* subcommand = useShortForm ? L"sp" : L"split-pane";
-
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            // The one we actually want to test here is the SplitPane action we created
-            auto actionAndArgs = appArgs._startupActions.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_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
-            VERIFY_ARE_EQUAL(0.5f, myArgs.SplitSize());
-            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"-s", L".3" };
-            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
-
-            VERIFY_ARE_EQUAL(2u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            // The one we actually want to test here is the SplitPane action we created
-            auto actionAndArgs = appArgs._startupActions.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_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
-            VERIFY_ARE_EQUAL(0.3f, myArgs.SplitSize());
-            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"-s", L".3", L";", subcommand };
-            _buildCommandlinesHelper(appArgs, 2u, rawCommands);
-
-            VERIFY_ARE_EQUAL(3u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            {
-                // The one we actually want to test here is the SplitPane action we created
-                auto actionAndArgs = appArgs._startupActions.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_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
-                VERIFY_ARE_EQUAL(0.3f, myArgs.SplitSize());
-                VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-            }
-            {
-                auto actionAndArgs = appArgs._startupActions.at(2);
-                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_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
-                VERIFY_ARE_EQUAL(0.5f, myArgs.SplitSize());
-                VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-            }
-        }
-        {
-            AppCommandlineArgs appArgs{};
-            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"-s", L".3", L";", subcommand, L"-s", L".7" };
-            _buildCommandlinesHelper(appArgs, 2u, rawCommands);
-
-            VERIFY_ARE_EQUAL(3u, appArgs._startupActions.size());
-
-            // The first action is going to always be a new-tab action
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, appArgs._startupActions.at(0).Action());
-
-            {
-                // The one we actually want to test here is the SplitPane action we created
-                auto actionAndArgs = appArgs._startupActions.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_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
-                VERIFY_ARE_EQUAL(0.3f, myArgs.SplitSize());
-                VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-            }
-            {
-                auto actionAndArgs = appArgs._startupActions.at(2);
-                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_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
-                VERIFY_ARE_EQUAL(0.7f, myArgs.SplitSize());
-                VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
-            }
-        }
-    }
 }

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -486,7 +486,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(NoThrowString().Format(L"Duplicate the first pane"));
         result = RunOnUIThread([&page]() {
-            page->_SplitPane(SplitState::Automatic, SplitType::Duplicate, 0.5f, nullptr);
+            page->_SplitPane(SplitState::Automatic, SplitType::Duplicate, nullptr);
 
             VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
@@ -504,7 +504,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(NoThrowString().Format(L"Duplicate the pane, and don't crash"));
         result = RunOnUIThread([&page]() {
-            page->_SplitPane(SplitState::Automatic, SplitType::Duplicate, 0.5f, nullptr);
+            page->_SplitPane(SplitState::Automatic, SplitType::Duplicate, nullptr);
 
             VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
@@ -899,10 +899,10 @@ namespace TerminalAppLocalTests
             page->_SelectNextTab(true);
         });
 
-        const auto palette = winrt::get_self<winrt::TerminalApp::implementation::CommandPalette>(page->CommandPalette());
+        const auto palette = winrt::get_self<implementation::CommandPalette>(page->CommandPalette());
 
         VERIFY_ARE_EQUAL(1u, palette->_switcherStartIdx, L"Verify the index is 1 as we went right");
-        VERIFY_ARE_EQUAL(winrt::TerminalApp::implementation::CommandPaletteMode::TabSwitchMode, palette->_currentMode, L"Verify we are in the tab switcher mode");
+        VERIFY_ARE_EQUAL(implementation::CommandPaletteMode::TabSwitchMode, palette->_currentMode, L"Verify we are in the tab switcher mode");
 
         Log::Comment(L"Verify command palette preserves MRU order of tabs");
         VERIFY_ARE_EQUAL(4u, palette->_filteredActions.Size());

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

@@ -14,6 +14,16 @@
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
 
+  <ItemDefinitionGroup>
+
+    <ClCompile>
+      <!-- For CLI11: It uses dynamic_cast to cast types around, which depends
+      on being compiled with RTTI (/GR). We need this in this project, because
+      we're including the CLI11 header via the CommandlineArgs project. -->
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+    </ClCompile>
+  </ItemDefinitionGroup>
+
   <!-- ========================= Headers ======================== -->
   <ItemGroup>
     <ClInclude Include="Monarch.h">
@@ -74,9 +84,46 @@
       <Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\CommandlineArgs\CommandlineArgs.vcxproj" >
+      <Private>true</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <!-- Make sure to set ReferenceOutputAssembly=false, or we'll try and
+      MDMERGE with MUX from the CommandlineArgs output, and get duplicate type
+      errors everywhere. -->
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+
+      <!-- This is going to turn into a disaster. We still need to reference MUX
+      to get mdmerge happy, but we can't roll that up without rolling up the DLL
+      and now we'll get duplicate types in WT.vcxproj. GAH. We'll need to have
+      Remoting accept a callback to say "I encountered a commandline, someone,
+      deal with it?", then have apphost register for that callback. So the flow
+      is monarch->AppHost->AppLogic -->
+
+    </ProjectReference>
     <!-- For whatever reason, we can't include the TerminalControl and
     TerminalSettings projects' winmds via project references. So we'll have to
     manually include the winmds as References below -->
+
+
+    <Reference Include="Microsoft.Terminal.TerminalConnection">
+      <HintPath>$(OpenConsoleCommonOutDir)TerminalConnection\Microsoft.Terminal.TerminalConnection.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+    <Reference Include="Microsoft.Terminal.TerminalControl">
+      <HintPath>$(OpenConsoleCommonOutDir)TerminalControl\Microsoft.Terminal.TerminalControl.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
+    <Reference Include="Microsoft.Terminal.Settings.Model">
+      <HintPath>$(OpenConsoleCommonOutDir)Microsoft.Terminal.Settings.Model\Microsoft.Terminal.Settings.Model.winmd</HintPath>
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+    </Reference>
   </ItemGroup>
   <!-- ====================== Compiler & Linker Flags ===================== -->
   <ItemDefinitionGroup>

src/cascadia/Remoting/Monarch.cpp

@@ -1,9 +1,7 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #include "pch.h"
 #include "Monarch.h"
 #include "CommandlineArgs.h"
+#include "../CommandlineArgs/AppCommandlineArgs.h"
 
 #include "Monarch.g.cpp"
 #include "../../types/inc/utils.hpp"
@@ -46,7 +44,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     {
         // TODO:projects/5 This is terrible. There's gotta be a better way
         // of finding the first opening in a non-consecutive map of int->object
-        const auto providedID = peasant.GetID();
+        auto providedID = peasant.GetID();
 
         if (providedID == 0)
         {
@@ -66,10 +64,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         // Add an event listener to the peasant's WindowActivated event.
         peasant.WindowActivated({ this, &Monarch::_peasantWindowActivated });
 
-        // TODO:projects/5 Wait on the peasant's PID, and remove them from the
-        // map if they die. This won't work great in tests though, with fake
-        // PIDs.
-
         return newPeasantsId;
     }
 
@@ -102,8 +96,23 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     // - the peasant if it exists in our map, otherwise null
     Remoting::IPeasant Monarch::_getPeasant(uint64_t peasantID)
     {
-        auto peasantSearch = _peasants.find(peasantID);
-        return peasantSearch == _peasants.end() ? nullptr : peasantSearch->second;
+        try
+        {
+            auto peasantSearch = _peasants.find(peasantID);
+            auto maybeThePeasant = peasantSearch == _peasants.end() ? nullptr : peasantSearch->second;
+            if (maybeThePeasant)
+            {
+                maybeThePeasant.GetPID();
+            }
+            return maybeThePeasant;
+        }
+        catch (...)
+        {
+            LOG_CAUGHT_EXCEPTION();
+            // Remove the peasant from the list of peasants
+            _peasants.erase(peasantID);
+            return nullptr;
+        }
     }
 
     void Monarch::_setMostRecentPeasant(const uint64_t peasantID)
@@ -131,6 +140,9 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         // always want to create a new window, so we'll just return true. This
         // will tell the caller that we didn't handle the commandline, and they
         // should open a new window to deal with it themselves.
+
+        CommandlineArgs::AppCommandlineArgs argParser;
+
         return true;
     }
 

src/cascadia/Remoting/Monarch.h

@@ -1,33 +1,15 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #pragma once
 
 #include "Monarch.g.h"
 #include "Peasant.h"
 #include "../cascadia/inc/cppwinrt_utils.h"
 
-// We sure different GUIDs here depending on whether we're running a Release,
-// Preview, or Dev build. This ensures that different installs don't
-// accidentally talk to one another.
-//
-// * Release: {06171993-7eb1-4f3e-85f5-8bdd7386cce3}
-// * Preview: {04221993-7eb1-4f3e-85f5-8bdd7386cce3}
-// * Dev:     {08302020-7eb1-4f3e-85f5-8bdd7386cce3}
-constexpr GUID Monarch_clsid
-{
-#if defined(WT_BRANDING_RELEASE)
+// {06171993-7eb1-4f3e-85f5-8bdd7386cce3}
+constexpr GUID Monarch_clsid{
     0x06171993,
-#elif defined(WT_BRANDING_PREVIEW)
-    0x04221993,
-#else
-    0x08302020,
-#endif
-        0x7eb1,
-        0x4f3e,
-    {
-        0x85, 0xf5, 0x8b, 0xdd, 0x73, 0x86, 0xcc, 0xe3
-    }
+    0x7eb1,
+    0x4f3e,
+    { 0x85, 0xf5, 0x8b, 0xdd, 0x73, 0x86, 0xcc, 0xe3 }
 };
 
 enum class WindowingBehavior : uint64_t

src/cascadia/Remoting/Monarch.idl

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 import "Peasant.idl";
 
 namespace Microsoft.Terminal.Remoting

src/cascadia/Remoting/MonarchFactory.h

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #include "pch.h"
 
 #include "Monarch.h"
@@ -11,6 +8,11 @@
 // per-process. Once the first monarch is created, we'll stash it in g_weak.
 // Future callers who try to instantiate a Monarch will get the one that's
 // already been made.
+//
+// I'm sure there's a better way to do this with WRL, but I'm not familiar
+// enough with WRL to know for sure.
+
+winrt::weak_ref<winrt::Microsoft::Terminal::Remoting::implementation::Monarch> g_weak{ nullptr };
 
 struct MonarchFactory : winrt::implements<MonarchFactory, ::IClassFactory>
 {
@@ -18,26 +20,24 @@ struct MonarchFactory : winrt::implements<MonarchFactory, ::IClassFactory>
 
     HRESULT __stdcall CreateInstance(IUnknown* outer, GUID const& iid, void** result) noexcept
     {
-        static winrt::weak_ref<winrt::Microsoft::Terminal::Remoting::implementation::Monarch> g_weak{ nullptr };
-
         *result = nullptr;
         if (outer)
         {
             return CLASS_E_NOAGGREGATION;
         }
 
-        // Lock the ref immediately. We don't want it freed from out beneath us
-        auto strong = g_weak.get();
-        if (!strong)
+        if (!g_weak)
         {
             // Create a new Monarch instance
-            strong = winrt::make_self<winrt::Microsoft::Terminal::Remoting::implementation::Monarch>();
+            auto strong = winrt::make_self<winrt::Microsoft::Terminal::Remoting::implementation::Monarch>();
+
             g_weak = (*strong).get_weak();
             return strong.as(iid, result);
         }
         else
         {
             // We already instantiated one Monarch, let's just return that one!
+            auto strong = g_weak.get();
             return strong.as(iid, result);
         }
     }

src/cascadia/Remoting/Peasant.cpp

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #include "pch.h"
 #include "Peasant.h"
 #include "CommandlineArgs.h"

src/cascadia/Remoting/Peasant.h

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #pragma once
 
 #include "Peasant.g.h"

src/cascadia/Remoting/Peasant.idl

@@ -1,5 +1,4 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
+
 
 namespace Microsoft.Terminal.Remoting
 {

src/cascadia/Remoting/WindowManager.cpp

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #include "pch.h"
 #include "WindowManager.h"
 #include "MonarchFactory.h"
@@ -18,10 +15,12 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
 {
     WindowManager::WindowManager()
     {
+        _monarchWaitInterrupt.create();
+
         // Register with COM as a server for the Monarch class
         _registerAsMonarch();
         // Instantiate an instance of the Monarch. This may or may not be in-proc!
-        _createMonarch();
+        _createMonarchAndCallbacks();
     }
 
     WindowManager::~WindowManager()
@@ -32,6 +31,12 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         // monarch!
         CoRevokeClassObject(_registrationHostClass);
         _registrationHostClass = 0;
+        _monarchWaitInterrupt.SetEvent();
+
+        if (_electionThread.joinable())
+        {
+            _electionThread.join();
+        }
     }
 
     void WindowManager::ProposeCommandline(const Remoting::CommandlineArgs& args)
@@ -50,6 +55,12 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             // instance, and tell that peasant to handle that commandline.
             _createOurPeasant();
 
+            // TODO:MG Spawn a thread to wait on the monarch, and handle the election
+            if (!isKing)
+            {
+                _createPeasantThread();
+            }
+
             _peasant.ExecuteCommandline(args);
         }
         // Otherwise, we'll do _nothing_.
@@ -72,7 +83,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     void WindowManager::_createMonarch()
     {
         // Heads up! This only works because we're using
-        // "metadata-based-marshalling" for our WinRT types. That means the OS is
+        // "metadata-based-marshalling" for our WinRT types. THat means the OS is
         // using the .winmd file we generate to figure out the proxy/stub
         // definitions for our types automatically. This only works in the following
         // cases:
@@ -83,10 +94,25 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                                       CLSCTX_LOCAL_SERVER);
     }
 
+    void WindowManager::_createMonarchAndCallbacks()
+    {
+        _createMonarch();
+        const auto isKing = _areWeTheKing();
+        if (!isKing)
+        {
+            return;
+        }
+        // Here, we're the king!
+
+        // Wait, don't. Let's just have the monarch try/catch any accesses to
+        // peasants. If the peasant dies, then it can't get the peasant's
+        // anything. In that case, _remove it_.
+    }
+
     bool WindowManager::_areWeTheKing()
     {
-        const auto kingPID{ _monarch.GetPID() };
-        const auto ourPID{ GetCurrentProcessId() };
+        auto kingPID = _monarch.GetPID();
+        auto ourPID = GetCurrentProcessId();
         return (ourPID == kingPID);
     }
 
@@ -96,11 +122,89 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         _peasant = *p;
         _monarch.AddPeasant(_peasant);
 
-        // TODO:projects/5 Spawn a thread to wait on the monarch, and handle the election
-
         return _peasant;
     }
 
+    bool WindowManager::_electionNight2020()
+    {
+        _createMonarchAndCallbacks();
+
+        // Tell the new monarch who we are. We might be that monarch!
+        _monarch.AddPeasant(_peasant);
+
+        if (_areWeTheKing())
+        {
+            return true;
+        }
+        return false;
+    }
+
+    void WindowManager::_createPeasantThread()
+    {
+        // If we catch an exception trying to get at the monarch ever, we can
+        // set the _monarchWaitInterrupt, and use that to trigger a new
+        // election. Though, we wouldn't be able to retry the function that
+        // caused the exception in the first place...
+
+        _electionThread = std::thread([this] {
+            _waitOnMonarchThread();
+        });
+    }
+
+    void WindowManager::_waitOnMonarchThread()
+    {
+        HANDLE waits[2];
+        waits[1] = _monarchWaitInterrupt.get();
+
+        bool exitRequested = false;
+        while (!exitRequested)
+        {
+            wil::unique_handle hMonarch{ OpenProcess(PROCESS_ALL_ACCESS,
+                                                     FALSE,
+                                                     static_cast<DWORD>(_monarch.GetPID())) };
+            // TODO:MG If we fail to open the monarch, then they don't exist
+            //  anymore! Go straight to an election.
+            //
+            // TODO:MG At any point in all this, the current monarch might die.
+            // We go straight to a new election, right? Worst case, eventually,
+            // we'll become the new monarch.
+            //
+            // if (hMonarch.get() == nullptr)
+            // {
+            //     const auto gle = GetLastError();
+            //     return false;
+            // }
+            waits[0] = hMonarch.get();
+            auto waitResult = WaitForMultipleObjects(2, waits, FALSE, INFINITE);
+
+            switch (waitResult)
+            {
+            case WAIT_OBJECT_0 + 0: // waits[0] was signaled
+                // Connect to the new monarch, which might be us!
+                // If we become the monarch, then we'll return true and exit this thread.
+                exitRequested = _electionNight2020();
+                break;
+            case WAIT_OBJECT_0 + 1: // waits[1] was signaled
+                exitRequested = true;
+                break;
+
+            case WAIT_TIMEOUT:
+                printf("Wait timed out. This should be impossible.\n");
+                exitRequested = true;
+                break;
+
+            // Return value is invalid.
+            default:
+            {
+                auto gle = GetLastError();
+                printf("WaitForMultipleObjects returned: %d\n", waitResult);
+                printf("Wait error: %d\n", gle);
+                ExitProcess(0);
+            }
+            }
+        }
+    }
+
     Remoting::Peasant WindowManager::CurrentWindow()
     {
         return _peasant;

src/cascadia/Remoting/WindowManager.h

@@ -1,6 +1,3 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
 #pragma once
 
 #include "WindowManager.g.h"
@@ -26,10 +23,19 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         winrt::Microsoft::Terminal::Remoting::Monarch _monarch{ nullptr };
         winrt::Microsoft::Terminal::Remoting::Peasant _peasant{ nullptr };
 
+        wil::unique_event _monarchWaitInterrupt;
+
+        std::thread _electionThread;
+
         void _registerAsMonarch();
         void _createMonarch();
+        void _createMonarchAndCallbacks();
         bool _areWeTheKing();
         winrt::Microsoft::Terminal::Remoting::IPeasant _createOurPeasant();
+
+        bool _electionNight2020();
+        void _createPeasantThread();
+        void _waitOnMonarchThread();
     };
 }
 

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

@@ -61,7 +61,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>User32.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <!-- Our lib contains a DllMain that we need to force the use of. -->
+      <!-- TSM Lib contains a DllMain that we need to force the use of. -->
       <AdditionalOptions Condition="'$(Platform)'=='Win32'">/INCLUDE:_DllMain@12</AdditionalOptions>
       <AdditionalOptions Condition="'$(Platform)'!='Win32'">/INCLUDE:DllMain</AdditionalOptions>
     </Link>

src/cascadia/Remoting/pch.h

@@ -44,5 +44,7 @@ TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider);
 
 #include <shellapi.h>
 
+#include <winrt/Microsoft.Terminal.Settings.Model.h>
+
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"

src/cascadia/ShellExtension/OpenTerminalHere.cpp

@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "OpenTerminalHere.h"
-#include <ShlObj.h>
 
 // TODO GH#6112: Localize these strings
 static constexpr std::wstring_view VerbDisplayName{ L"Open in Windows Terminal" };
@@ -118,29 +117,14 @@ static std::wstring _getExePath()
 HRESULT OpenTerminalHere::Invoke(IShellItemArray* psiItemArray,
                                  IBindCtx* /*pBindContext*/)
 {
+    DWORD count;
+    psiItemArray->GetCount(&count);
+
+    winrt::com_ptr<IShellItem> psi;
+    RETURN_IF_FAILED(psiItemArray->GetItemAt(0, psi.put()));
+
     wil::unique_cotaskmem_string pszName;
-
-    if (psiItemArray == nullptr)
-    {
-        // get the current path from explorer.exe
-        const auto path = this->_GetPathFromExplorer();
-
-        // no go, unable to get a reasonable path
-        if (path.empty())
-        {
-            return S_FALSE;
-        }
-        pszName = wil::make_cotaskmem_string(path.c_str(), path.length());
-    }
-    else
-    {
-        DWORD count;
-        psiItemArray->GetCount(&count);
-
-        winrt::com_ptr<IShellItem> psi;
-        RETURN_IF_FAILED(psiItemArray->GetItemAt(0, psi.put()));
-        RETURN_IF_FAILED(psi->GetDisplayName(SIGDN_FILESYSPATH, &pszName));
-    }
+    RETURN_IF_FAILED(psi->GetDisplayName(SIGDN_FILESYSPATH, &pszName));
 
     {
         wil::unique_process_information _piClient;
@@ -230,103 +214,3 @@ HRESULT OpenTerminalHere::EnumSubCommands(IEnumExplorerCommand** ppEnum)
     *ppEnum = nullptr;
     return E_NOTIMPL;
 }
-
-std::wstring OpenTerminalHere::_GetPathFromExplorer() const
-{
-    using namespace std;
-    using namespace winrt;
-
-    wstring path;
-    HRESULT hr = NOERROR;
-
-    auto hwnd = ::GetForegroundWindow();
-    if (hwnd == nullptr)
-    {
-        return path;
-    }
-
-    TCHAR szName[MAX_PATH] = { 0 };
-    ::GetClassName(hwnd, szName, MAX_PATH);
-    if (0 == StrCmp(szName, L"WorkerW") ||
-        0 == StrCmp(szName, L"Progman"))
-    {
-        //special folder: desktop
-        hr = ::SHGetFolderPath(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, szName);
-        if (FAILED(hr))
-        {
-            return path;
-        }
-
-        path = szName;
-        return path;
-    }
-
-    if (0 != StrCmp(szName, L"CabinetWClass"))
-    {
-        return path;
-    }
-
-    com_ptr<IShellWindows> shell;
-    try
-    {
-        shell = create_instance<IShellWindows>(CLSID_ShellWindows, CLSCTX_ALL);
-    }
-    catch (...)
-    {
-        //look like try_create_instance is not available no more
-    }
-
-    if (shell == nullptr)
-    {
-        return path;
-    }
-
-    com_ptr<IDispatch> disp;
-    wil::unique_variant variant;
-    variant.vt = VT_I4;
-
-    com_ptr<IWebBrowserApp> browser;
-    // look for correct explorer window
-    for (variant.intVal = 0;
-         shell->Item(variant, disp.put()) == S_OK;
-         variant.intVal++)
-    {
-        com_ptr<IWebBrowserApp> tmp;
-        if (FAILED(disp->QueryInterface(tmp.put())))
-        {
-            disp = nullptr; // get rid of DEBUG non-nullptr warning
-            continue;
-        }
-
-        HWND tmpHWND = NULL;
-        hr = tmp->get_HWND(reinterpret_cast<SHANDLE_PTR*>(&tmpHWND));
-        if (hwnd == tmpHWND)
-        {
-            browser = tmp;
-            disp = nullptr; // get rid of DEBUG non-nullptr warning
-            break; //found
-        }
-
-        disp = nullptr; // get rid of DEBUG non-nullptr warning
-    }
-
-    if (browser != nullptr)
-    {
-        wil::unique_bstr url;
-        hr = browser->get_LocationURL(&url);
-        if (FAILED(hr))
-        {
-            return path;
-        }
-
-        wstring sUrl(url.get(), SysStringLen(url.get()));
-        DWORD size = MAX_PATH;
-        hr = ::PathCreateFromUrl(sUrl.c_str(), szName, &size, NULL);
-        if (SUCCEEDED(hr))
-        {
-            path = szName;
-        }
-    }
-
-    return path;
-}

src/cascadia/ShellExtension/OpenTerminalHere.h

@@ -46,9 +46,6 @@ struct __declspec(uuid("9f156763-7844-4dc4-b2b1-901f640f5155"))
     STDMETHODIMP GetCanonicalName(GUID* pguidCommandName);
     STDMETHODIMP EnumSubCommands(IEnumExplorerCommand** ppEnum);
 #pragma endregion
-
-private:
-    std::wstring _GetPathFromExplorer() const;
 };
 
 CoCreatableClass(OpenTerminalHere);

src/cascadia/ShellExtension/WindowsTerminalShellExt.vcxproj

@@ -11,13 +11,10 @@
     <!-- sets a bunch of Windows Universal properties -->
     <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
   </PropertyGroup>
+
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.pre.props" />
-  <ItemDefinitionGroup>
-    <Link>
-      <AdditionalDependencies>User32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
+
   <ItemGroup>
     <ClInclude Include="pch.h" />
     <ClInclude Include="OpenTerminalHere.h" />
@@ -43,6 +40,7 @@
     <None Include="packages.config" />
     <None Include="WindowsTerminalShellExt.def" />
   </ItemGroup>
+
   <!-- ========================= Project References ======================== -->
   <ItemGroup>
     <!--
@@ -58,5 +56,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+
+
   <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
 </Project>

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -17,7 +17,6 @@ using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
-using namespace ::TerminalApp;
 
 namespace winrt
 {
@@ -122,11 +121,7 @@ namespace winrt::TerminalApp::implementation
         }
         else if (const auto& realArgs = args.ActionArgs().try_as<SplitPaneArgs>())
         {
-            _SplitPane(realArgs.SplitStyle(),
-                       realArgs.SplitMode(),
-                       // This is safe, we're already filtering so the value is (0, 1)
-                       ::base::saturated_cast<float>(realArgs.SplitSize()),
-                       realArgs.TerminalArgs());
+            _SplitPane(realArgs.SplitStyle(), realArgs.SplitMode(), realArgs.TerminalArgs());
             args.Handled(true);
         }
     }
@@ -134,37 +129,29 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleTogglePaneZoom(const IInspectable& /*sender*/,
                                              const ActionEventArgs& args)
     {
-        if (const auto activeTab{ _GetFocusedTabImpl() })
+        if (auto focusedTab = _GetFocusedTab())
         {
-            // Don't do anything if there's only one pane. It's already zoomed.
-            if (activeTab->GetLeafPaneCount() > 1)
+            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
             {
-                // First thing's first, remove the current content from the UI
-                // tree. This is important, because we might be leaving zoom, and if
-                // a pane is zoomed, then it's currently in the UI tree, and should
-                // be removed before it's re-added in Pane::Restore
-                _tabContent.Children().Clear();
+                // Don't do anything if there's only one pane. It's already zoomed.
+                if (activeTab && activeTab->GetLeafPaneCount() > 1)
+                {
+                    // First thing's first, remove the current content from the UI
+                    // tree. This is important, because we might be leaving zoom, and if
+                    // a pane is zoomed, then it's currently in the UI tree, and should
+                    // be removed before it's re-added in Pane::Restore
+                    _tabContent.Children().Clear();
 
-                // Togging the zoom on the tab will cause the tab to inform us of
-                // the new root Content for this tab.
-                activeTab->ToggleZoom();
+                    // Togging the zoom on the tab will cause the tab to inform us of
+                    // the new root Content for this tab.
+                    activeTab->ToggleZoom();
+                }
             }
         }
 
         args.Handled(true);
     }
 
-    void TerminalPage::_HandleTogglePaneReadOnly(const IInspectable& /*sender*/,
-                                                 const ActionEventArgs& args)
-    {
-        if (const auto activeTab{ _GetFocusedTabImpl() })
-        {
-            activeTab->TogglePaneReadOnly();
-        }
-
-        args.Handled(true);
-    }
-
     void TerminalPage::_HandleScrollUpPage(const IInspectable& /*sender*/,
                                            const ActionEventArgs& args)
     {
@@ -355,16 +342,19 @@ namespace winrt::TerminalApp::implementation
         args.Handled(false);
         if (const auto& realArgs = args.ActionArgs().try_as<SetColorSchemeArgs>())
         {
-            if (const auto activeTab{ _GetFocusedTabImpl() })
+            if (auto focusedTab = _GetFocusedTab())
             {
-                if (auto activeControl = activeTab->GetActiveTerminalControl())
+                if (auto activeTab = _GetTerminalTabImpl(focusedTab))
                 {
-                    if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
+                    if (auto activeControl = activeTab->GetActiveTerminalControl())
                     {
-                        auto controlSettings = activeControl.Settings().as<TerminalSettings>();
-                        controlSettings->ApplyColorScheme(scheme);
-                        activeControl.UpdateSettings();
-                        args.Handled(true);
+                        if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
+                        {
+                            auto controlSettings = activeControl.Settings().as<TerminalSettings>();
+                            controlSettings->ApplyColorScheme(scheme);
+                            activeControl.UpdateSettings(*controlSettings);
+                            args.Handled(true);
+                        }
                     }
                 }
             }
@@ -381,15 +371,18 @@ namespace winrt::TerminalApp::implementation
             tabColor = realArgs.TabColor();
         }
 
-        if (const auto activeTab{ _GetFocusedTabImpl() })
+        if (auto focusedTab = _GetFocusedTab())
         {
-            if (tabColor)
+            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
             {
-                activeTab->SetRuntimeTabColor(tabColor.Value());
-            }
-            else
-            {
-                activeTab->ResetRuntimeTabColor();
+                if (tabColor)
+                {
+                    activeTab->SetRuntimeTabColor(tabColor.Value());
+                }
+                else
+                {
+                    activeTab->ResetRuntimeTabColor();
+                }
             }
         }
         args.Handled(true);
@@ -398,9 +391,12 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleOpenTabColorPicker(const IInspectable& /*sender*/,
                                                  const ActionEventArgs& args)
     {
-        if (const auto activeTab{ _GetFocusedTabImpl() })
+        if (auto focusedTab = _GetFocusedTab())
         {
-            activeTab->ActivateColorPicker();
+            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
+            {
+                activeTab->ActivateColorPicker();
+            }
         }
         args.Handled(true);
     }
@@ -415,15 +411,18 @@ namespace winrt::TerminalApp::implementation
             title = realArgs.Title();
         }
 
-        if (const auto activeTab{ _GetFocusedTabImpl() })
+        if (auto focusedTab = _GetFocusedTab())
         {
-            if (title.has_value())
+            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
             {
-                activeTab->SetTabText(title.value());
-            }
-            else
-            {
-                activeTab->ResetTabText();
+                if (title.has_value())
+                {
+                    activeTab->SetTabText(title.value());
+                }
+                else
+                {
+                    activeTab->ResetTabText();
+                }
             }
         }
         args.Handled(true);
@@ -432,9 +431,12 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleOpenTabRenamer(const IInspectable& /*sender*/,
                                              const ActionEventArgs& args)
     {
-        if (const auto activeTab{ _GetFocusedTabImpl() })
+        if (auto focusedTab = _GetFocusedTab())
         {
-            activeTab->ActivateTabRenamer();
+            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
+            {
+                activeTab->ActivateTabRenamer();
+            }
         }
         args.Handled(true);
     }
@@ -476,20 +478,18 @@ namespace winrt::TerminalApp::implementation
                 return;
             }
 
-            // Since _RemoveTab is asynchronous, create a snapshot of the  tabs we want to remove
-            std::vector<winrt::TerminalApp::TabBase> tabsToRemove;
-            if (index > 0)
+            // Remove tabs after the current one
+            while (_tabs.Size() > index + 1)
             {
-                std::copy(begin(_tabs), begin(_tabs) + index, std::back_inserter(tabsToRemove));
+                _RemoveTabViewItemByIndex(_tabs.Size() - 1);
             }
 
-            if (index + 1 < _tabs.Size())
+            // Remove all of them leading up to the selected tab
+            while (_tabs.Size() > 1)
             {
-                std::copy(begin(_tabs) + index + 1, end(_tabs), std::back_inserter(tabsToRemove));
+                _RemoveTabViewItemByIndex(0);
             }
 
-            _RemoveTabs(tabsToRemove);
-
             actionArgs.Handled(true);
         }
     }
@@ -515,10 +515,11 @@ namespace winrt::TerminalApp::implementation
                 return;
             }
 
-            // Since _RemoveTab is asynchronous, create a snapshot of the  tabs we want to remove
-            std::vector<winrt::TerminalApp::TabBase> tabsToRemove;
-            std::copy(begin(_tabs) + index + 1, end(_tabs), std::back_inserter(tabsToRemove));
-            _RemoveTabs(tabsToRemove);
+            // 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`
@@ -533,8 +534,13 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleOpenTabSearch(const IInspectable& /*sender*/,
                                             const ActionEventArgs& args)
     {
-        CommandPalette().SetTabs(_tabs, _mruTabs);
-        CommandPalette().EnableTabSearchMode();
+        // Tab search is always in-order.
+        CommandPalette().SetTabs(_tabs, true);
+
+        auto opt = _GetFocusedTabIndex();
+        uint32_t startIdx = opt.value_or(0);
+
+        CommandPalette().EnableTabSwitcherMode(true, startIdx);
         CommandPalette().Visibility(Visibility::Visible);
 
         args.Handled(true);

src/cascadia/TerminalApp/AppLogic.cpp

@@ -17,7 +17,7 @@ using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace ::TerminalApp;
+using namespace ::CommandlineArgs;
 
 namespace winrt
 {
@@ -42,9 +42,7 @@ static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadWar
     USES_RESOURCE(L"LegacyGlobalsProperty"),
     USES_RESOURCE(L"FailedToParseCommandJson"),
     USES_RESOURCE(L"FailedToWriteToSettings"),
-    USES_RESOURCE(L"InvalidColorSchemeInCmd"),
-    USES_RESOURCE(L"InvalidSplitSize"),
-    USES_RESOURCE(L"FailedToParseStartupActions")
+    USES_RESOURCE(L"InvalidColorSchemeInCmd")
 };
 static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
     USES_RESOURCE(L"NoProfilesText"),
@@ -264,14 +262,6 @@ namespace winrt::TerminalApp::implementation
             _settings.GlobalSettings().ShowTabsInTitlebar(false);
         }
 
-        // Pay attention, that even if some command line arguments were parsed (like launch mode),
-        // we will not use the startup actions from settings.
-        // While this simplifies the logic, we might want to reconsider this behavior in the future.
-        if (!_hasCommandLineArguments && _hasSettingsStartupActions)
-        {
-            _root->SetStartupActions(_settingsAppArgs.GetStartupActions());
-        }
-
         _root->SetSettings(_settings, false);
         _root->Loaded({ this, &AppLogic::_OnLoaded });
         _root->Initialized([this](auto&&, auto&&) {
@@ -435,7 +425,8 @@ namespace winrt::TerminalApp::implementation
         // Make sure the lines of text wrap
         warningsTextBlock.TextWrapping(TextWrapping::Wrap);
 
-        for (const auto& warning : _warnings)
+        const auto warnings = _settings.Warnings();
+        for (const auto& warning : warnings)
         {
             // Try looking up the warning message key for each warning.
             const auto warningText = _GetWarningText(warning);
@@ -724,34 +715,7 @@ namespace winrt::TerminalApp::implementation
                 return E_INVALIDARG;
             }
 
-            _warnings.clear();
-            for (uint32_t i = 0; i < _settings.Warnings().Size(); i++)
-            {
-                _warnings.push_back(_settings.Warnings().GetAt(i));
-            }
-
-            _hasSettingsStartupActions = false;
-            const auto startupActions = _settings.GlobalSettings().StartupActions();
-            if (!startupActions.empty())
-            {
-                _settingsAppArgs.FullResetState();
-
-                ExecuteCommandlineArgs args{ _settings.GlobalSettings().StartupActions() };
-                auto result = _settingsAppArgs.ParseArgs(args);
-                if (result == 0)
-                {
-                    _hasSettingsStartupActions = true;
-
-                    // Validation also injects new-tab command if implicit new-tab was provided.
-                    _settingsAppArgs.ValidateStartupCommands();
-                }
-                else
-                {
-                    _warnings.push_back(SettingsLoadWarnings::FailedToParseStartupActions);
-                }
-            }
-
-            hr = _warnings.empty() ? S_OK : S_FALSE;
+            hr = _settings.Warnings().Size() == 0 ? S_OK : S_FALSE;
         }
         catch (const winrt::hresult_error& e)
         {
@@ -841,8 +805,7 @@ namespace winrt::TerminalApp::implementation
                            // editors, who will write a temp file, then rename it to be the
                            // actual file you wrote. So listen for that too.
                            if (!(event == wil::FolderChangeEvent::Modified ||
-                                 event == wil::FolderChangeEvent::RenameNewName ||
-                                 event == wil::FolderChangeEvent::Removed))
+                                 event == wil::FolderChangeEvent::RenameNewName))
                            {
                                return;
                            }
@@ -1141,9 +1104,6 @@ namespace winrt::TerminalApp::implementation
         const auto result = _appArgs.ParseArgs(args);
         if (result == 0)
         {
-            // If the size of the arguments list is 1,
-            // then it contains only the executable name and no other arguments.
-            _hasCommandLineArguments = args.size() > 1;
             _appArgs.ValidateStartupCommands();
             _root->SetStartupActions(_appArgs.GetStartupActions());
         }
@@ -1153,7 +1113,7 @@ namespace winrt::TerminalApp::implementation
 
     int32_t AppLogic::ExecuteCommandline(array_view<const winrt::hstring> args)
     {
-        ::TerminalApp::AppCommandlineArgs appArgs;
+        ::CommandlineArgs::AppCommandlineArgs appArgs;
         auto result = appArgs.ParseArgs(args);
         if (result == 0)
         {

src/cascadia/TerminalApp/AppLogic.h

@@ -85,8 +85,7 @@ namespace winrt::TerminalApp::implementation
 
         std::atomic<bool> _settingsReloadQueued{ false };
 
-        ::TerminalApp::AppCommandlineArgs _appArgs;
-        ::TerminalApp::AppCommandlineArgs _settingsAppArgs;
+        ::CommandlineArgs::AppCommandlineArgs _appArgs;
         int _ParseArgs(winrt::array_view<const hstring>& args);
 
         void _ShowLoadErrorsDialog(const winrt::hstring& titleKey, const winrt::hstring& contentKey, HRESULT settingsLoadedResult);
@@ -108,10 +107,6 @@ namespace winrt::TerminalApp::implementation
 
         void _ApplyTheme(const Windows::UI::Xaml::ElementTheme& newTheme);
 
-        bool _hasCommandLineArguments{ false };
-        bool _hasSettingsStartupActions{ false };
-        std::vector<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings> _warnings;
-
         // These are events that are handled by the TerminalPage, but are
         // exposed through the AppLogic. This macro is used to forward the event
         // directly to them.

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -31,7 +31,6 @@ namespace winrt::TerminalApp::implementation
         _currentNestedCommands = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
         _allCommands = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
         _tabActions = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
-        _mruTabActions = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
         _commandLineHistory = winrt::single_threaded_vector<winrt::TerminalApp::FilteredCommand>();
 
         _switchToMode(CommandPaletteMode::ActionMode);
@@ -52,9 +51,6 @@ namespace winrt::TerminalApp::implementation
         RegisterPropertyChangedCallback(UIElement::VisibilityProperty(), [this](auto&&, auto&&) {
             if (Visibility() == Visibility::Visible)
             {
-                // Force immediate binding update so we can select an item
-                Bindings->Update();
-
                 if (_currentMode == CommandPaletteMode::TabSwitchMode)
                 {
                     _searchBox().Visibility(Visibility::Collapsed);
@@ -70,6 +66,7 @@ namespace winrt::TerminalApp::implementation
                 {
                     _filteredActionsView().SelectedIndex(0);
                     _searchBox().Focus(FocusState::Programmatic);
+                    _updateFilteredActions();
                 }
 
                 TraceLoggingWrite(
@@ -115,7 +112,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void CommandPalette::SelectNextItem(const bool moveDown)
     {
-        auto selected = _filteredActionsView().SelectedIndex();
+        const auto selected = _filteredActionsView().SelectedIndex();
         const int numItems = ::base::saturated_cast<int>(_filteredActionsView().Items().Size());
 
         // Do not try to select an item if
@@ -248,26 +245,18 @@ namespace winrt::TerminalApp::implementation
         // Only give anchored tab switcher the ability to cycle through tabs with the tab button.
         // For unanchored mode, accessibility becomes an issue when we try to hijack tab since it's
         // a really widely used keyboard navigation key.
-        if (_currentMode == CommandPaletteMode::TabSwitchMode && _keymap)
+        if (_currentMode == CommandPaletteMode::TabSwitchMode && key == VirtualKey::Tab)
         {
-            auto const ctrlDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Control), CoreVirtualKeyStates::Down);
-            auto const altDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Menu), CoreVirtualKeyStates::Down);
-            auto const shiftDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Shift), CoreVirtualKeyStates::Down);
-
-            winrt::Microsoft::Terminal::TerminalControl::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast<int32_t>(key) };
-            const auto action = _keymap.TryLookup(kc);
-            if (action)
+            auto const state = CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Shift);
+            if (WI_IsFlagSet(state, CoreVirtualKeyStates::Down))
             {
-                if (action.Action() == ShortcutAction::PrevTab)
-                {
-                    SelectNextItem(false);
-                    e.Handled(true);
-                }
-                else if (action.Action() == ShortcutAction::NextTab)
-                {
-                    SelectNextItem(true);
-                    e.Handled(true);
-                }
+                SelectNextItem(false);
+                e.Handled(true);
+            }
+            else
+            {
+                SelectNextItem(true);
+                e.Handled(true);
             }
         }
         else if (key == VirtualKey::Home)
@@ -302,6 +291,7 @@ namespace winrt::TerminalApp::implementation
                                          Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
     {
         auto key = e.OriginalKey();
+        auto const ctrlDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Control), CoreVirtualKeyStates::Down);
 
         if (key == VirtualKey::Up)
         {
@@ -361,6 +351,30 @@ namespace winrt::TerminalApp::implementation
 
             e.Handled(true);
         }
+        else
+        {
+            const auto vkey = ::gsl::narrow_cast<WORD>(e.OriginalKey());
+
+            // In the interest of not telling all modes to check for keybindings, limit to TabSwitch mode for now.
+            if (_currentMode == CommandPaletteMode::TabSwitchMode)
+            {
+                auto const ctrlDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Control), CoreVirtualKeyStates::Down);
+                auto const altDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Menu), CoreVirtualKeyStates::Down);
+                auto const shiftDown = WI_IsFlagSet(CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Shift), CoreVirtualKeyStates::Down);
+
+                auto success = _bindings.TryKeyChord({
+                    ctrlDown,
+                    altDown,
+                    shiftDown,
+                    vkey,
+                });
+
+                if (success)
+                {
+                    e.Handled(true);
+                }
+            }
+        }
     }
 
     // Method Description:
@@ -448,12 +462,6 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_lostFocusHandler(Windows::Foundation::IInspectable const& /*sender*/,
                                            Windows::UI::Xaml::RoutedEventArgs const& /*args*/)
     {
-        const auto flyout = _searchBox().ContextFlyout();
-        if (flyout && flyout.IsOpen())
-        {
-            return;
-        }
-
         auto focusedElementOrAncestor = Input::FocusManager::GetFocusedElement(this->XamlRoot()).try_as<DependencyObject>();
         while (focusedElementOrAncestor)
         {
@@ -570,7 +578,7 @@ namespace winrt::TerminalApp::implementation
         case CommandPaletteMode::TabSearchMode:
             return _tabActions;
         case CommandPaletteMode::TabSwitchMode:
-            return _tabSwitcherMode == TabSwitcherMode::MostRecentlyUsed ? _mruTabActions : _tabActions;
+            return _tabActions;
         case CommandPaletteMode::CommandlineMode:
             return _commandLineHistory;
         default:
@@ -683,10 +691,7 @@ namespace winrt::TerminalApp::implementation
         {
             if (const auto tabPaletteItem{ filteredCommand.Item().try_as<winrt::TerminalApp::TabPaletteItem>() })
             {
-                if (const auto tab{ tabPaletteItem.Tab() })
-                {
-                    _SwitchToTabRequestedHandlers(*this, tab);
-                }
+                _SwitchToTabRequestedHandlers(*this, tabPaletteItem.Tab());
             }
         }
     }
@@ -848,9 +853,9 @@ namespace winrt::TerminalApp::implementation
         return _filteredActions;
     }
 
-    void CommandPalette::SetKeyMap(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap)
+    void CommandPalette::SetKeyBindings(Microsoft::Terminal::TerminalControl::IKeyBindings bindings)
     {
-        _keymap = keymap;
+        _bindings = bindings;
     }
 
     void CommandPalette::SetCommands(Collections::IVector<Command> const& actions)
@@ -863,40 +868,31 @@ namespace winrt::TerminalApp::implementation
             _allCommands.Append(filteredCommand);
         }
 
-        if (Visibility() == Visibility::Visible && _currentMode == CommandPaletteMode::ActionMode)
-        {
-            _updateFilteredActions();
-        }
+        _updateFilteredActions();
     }
 
-    // Method Description:
-    // - Replaces a list of filtered commands in the target collection with new
-    //   commands based on the tabs in the source collection.
-    // Although the source observable we still don't register on it,
-    // so the palette user will need to reset the binding manually every time
-    // the source collection changes
-    // Arguments:
-    // - source: the tabs to use for creation filtered commands
-    // - target: the collection to store newly created filtered commands
-    // Return Value:
-    // - <none>
-    void CommandPalette::_bindTabs(
-        Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase> const& source,
-        Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> const& target)
+    void CommandPalette::SetTabs(Collections::IVector<TabBase> const& tabs, const bool clearList)
     {
-        target.Clear();
-        for (const auto& tab : source)
+        _tabActions.Clear();
+        for (const auto& tab : tabs)
         {
             auto tabPaletteItem{ winrt::make<winrt::TerminalApp::implementation::TabPaletteItem>(tab) };
             auto filteredCommand{ winrt::make<FilteredCommand>(tabPaletteItem) };
-            target.Append(filteredCommand);
+            _tabActions.Append(filteredCommand);
         }
-    }
 
-    void CommandPalette::SetTabs(Collections::IObservableVector<TabBase> const& tabs, Collections::IObservableVector<TabBase> const& mruTabs)
-    {
-        _bindTabs(tabs, _tabActions);
-        _bindTabs(mruTabs, _mruTabActions);
+        // The smooth remove/add animations that happen during
+        // UpdateFilteredActions don't work very well with changing the tab
+        // order, because of the sheer amount of remove/adds. So, let's just
+        // clear & rebuild the list when we change the set of tabs.
+        //
+        // Some callers might actually want smooth updating, like when the list
+        // of tabs changes.
+        if (clearList && _currentMode == CommandPaletteMode::TabSwitchMode)
+        {
+            _filteredActions.Clear();
+        }
+        _updateFilteredActions();
     }
 
     void CommandPalette::EnableCommandPaletteMode(CommandPaletteLaunchMode const launchMode)
@@ -906,11 +902,26 @@ namespace winrt::TerminalApp::implementation
                               CommandPaletteMode::ActionMode;
 
         _switchToMode(mode);
+        _updateFilteredActions();
     }
 
     void CommandPalette::_switchToMode(CommandPaletteMode mode)
     {
-        _currentMode = mode;
+        // The smooth remove/add animations that happen during
+        // UpdateFilteredActions don't work very well when switching between
+        // modes because of the sheer amount of remove/adds. So, let's just
+        // clear + append when switching between modes.
+        if (mode != _currentMode)
+        {
+            _currentMode = mode;
+            _filteredActions.Clear();
+            auto commandsToFilter = _commandsToFilter();
+
+            for (auto action : commandsToFilter)
+            {
+                _filteredActions.Append(action);
+            }
+        }
 
         ParsedCommandLineText(L"");
         _searchBox().Text(L"");
@@ -943,13 +954,6 @@ namespace winrt::TerminalApp::implementation
             PrefixCharacter(L">");
             break;
         }
-
-        // The smooth remove/add animations that happen during
-        // UpdateFilteredActions don't work very well when switching between
-        // modes because of the sheer amount of remove/adds. So, let's just
-        // clear + append when switching between modes.
-        _filteredActions.Clear();
-        _updateFilteredActions();
     }
 
     // Method Description:
@@ -966,34 +970,27 @@ namespace winrt::TerminalApp::implementation
         winrt::hstring searchText{ _getTrimmedInput() };
 
         auto commandsToFilter = _commandsToFilter();
+        for (const auto& action : commandsToFilter)
+        {
+            // Update filter for all commands
+            // This will modify the highlighting but will also lead to re-computation of weight (and consequently sorting).
+            // Pay attention that it already updates the highlighting in the UI
+            action.UpdateFilter(searchText);
 
-        if (_currentMode == CommandPaletteMode::TabSwitchMode)
-        {
-            std::copy(begin(commandsToFilter), end(commandsToFilter), std::back_inserter(actions));
-        }
-        else if (_currentMode == CommandPaletteMode::TabSearchMode || _currentMode == CommandPaletteMode::ActionMode || _currentMode == CommandPaletteMode::CommandlineMode)
-        {
-            for (const auto& action : commandsToFilter)
+            // if there is active search we skip commands with 0 weight
+            if (searchText.empty() || action.Weight() > 0)
             {
-                // Update filter for all commands
-                // This will modify the highlighting but will also lead to re-computation of weight (and consequently sorting).
-                // Pay attention that it already updates the highlighting in the UI
-                action.UpdateFilter(searchText);
-
-                // if there is active search we skip commands with 0 weight
-                if (searchText.empty() || action.Weight() > 0)
-                {
-                    actions.push_back(action);
-                }
+                actions.push_back(action);
             }
         }
 
-        // We want to present the commands sorted
-        if (_currentMode == CommandPaletteMode::ActionMode)
+        // We want to present the commands sorted,
+        // unless we are in the TabSwitcherMode and TabSearchMode,
+        // in which we want to preserve the original order (to be aligned with the tab view)
+        if (_currentMode != CommandPaletteMode::TabSearchMode && _currentMode != CommandPaletteMode::TabSwitchMode && _currentMode != CommandPaletteMode::CommandlineMode)
         {
             std::sort(actions.begin(), actions.end(), FilteredCommand::Compare);
         }
-
         return actions;
     }
 
@@ -1068,18 +1065,20 @@ namespace winrt::TerminalApp::implementation
         _currentNestedCommands.Clear();
     }
 
-    void CommandPalette::EnableTabSwitcherMode(const uint32_t startIdx, TabSwitcherMode tabSwitcherMode)
+    void CommandPalette::EnableTabSwitcherMode(const bool searchMode, const uint32_t startIdx)
     {
-        // The _switcherStartIdx field allows us to select the current tab
-        // We need to take it into account only in the in-order mode,
-        // as an MRU mode the current tab is on top by definition.
-        _switcherStartIdx = tabSwitcherMode == TabSwitcherMode::InOrder ? startIdx : 0;
-        _tabSwitcherMode = tabSwitcherMode;
-        _switchToMode(CommandPaletteMode::TabSwitchMode);
+        _switcherStartIdx = startIdx;
+
+        if (searchMode)
+        {
+            _switchToMode(CommandPaletteMode::TabSearchMode);
+        }
+        else
+        {
+            _switchToMode(CommandPaletteMode::TabSwitchMode);
+        }
+
+        _updateFilteredActions();
     }
 
-    void CommandPalette::EnableTabSearchMode()
-    {
-        _switchToMode(CommandPaletteMode::TabSearchMode);
-    }
 }

src/cascadia/TerminalApp/CommandPalette.h

@@ -5,7 +5,7 @@
 
 #include "FilteredCommand.h"
 #include "CommandPalette.g.h"
-#include "AppCommandlineArgs.h"
+#include "../CommandlineArgs/AppCommandlineArgs.h"
 #include "../../cascadia/inc/cppwinrt_utils.h"
 
 // fwdecl unittest classes
@@ -31,8 +31,10 @@ namespace winrt::TerminalApp::implementation
         Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::FilteredCommand> FilteredActions();
 
         void SetCommands(Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::Command> const& actions);
-        void SetTabs(Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase> const& tabs, Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase> const& mruTabs);
-        void SetKeyMap(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap);
+        void SetTabs(Windows::Foundation::Collections::IVector<winrt::TerminalApp::TabBase> const& tabs, const bool clearList);
+        void SetKeyBindings(Microsoft::Terminal::TerminalControl::IKeyBindings bindings);
+
+        void EnableCommandPaletteMode(Microsoft::Terminal::Settings::Model::CommandPaletteLaunchMode const launchMode);
 
         bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);
 
@@ -43,9 +45,9 @@ namespace winrt::TerminalApp::implementation
         void ScrollToTop();
         void ScrollToBottom();
 
-        void EnableCommandPaletteMode(Microsoft::Terminal::Settings::Model::CommandPaletteLaunchMode const launchMode);
-        void EnableTabSwitcherMode(const uint32_t startIdx, Microsoft::Terminal::Settings::Model::TabSwitcherMode tabSwitcherMode);
-        void EnableTabSearchMode();
+        // Tab Switcher
+        void EnableTabSwitcherMode(const bool searchMode, const uint32_t startIdx);
+        void SetTabSwitchOrder(const Microsoft::Terminal::Settings::Model::TabSwitcherMode order);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
@@ -107,15 +109,11 @@ namespace winrt::TerminalApp::implementation
         std::wstring _getTrimmedInput();
         void _evaluatePrefix();
 
-        Microsoft::Terminal::Settings::Model::KeyMapping _keymap{ nullptr };
+        Microsoft::Terminal::TerminalControl::IKeyBindings _bindings;
 
         // Tab Switcher
         Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> _tabActions{ nullptr };
-        Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> _mruTabActions{ nullptr };
-        Microsoft::Terminal::Settings::Model::TabSwitcherMode _tabSwitcherMode;
         uint32_t _switcherStartIdx;
-
-        void _bindTabs(Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::TabBase> const& source, Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> const& target);
         void _anchorKeyUpHandler();
 
         winrt::Windows::UI::Xaml::Controls::ListView::SizeChanged_revoker _sizeChangedRevoker;
@@ -132,7 +130,7 @@ namespace winrt::TerminalApp::implementation
 
         static constexpr int CommandLineHistoryLength = 10;
         Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> _commandLineHistory{ nullptr };
-        ::TerminalApp::AppCommandlineArgs _appArgs;
+        ::CommandlineArgs::AppCommandlineArgs _appArgs;
 
         friend class TerminalAppLocalTests::TabTests;
     };

src/cascadia/TerminalApp/CommandPalette.idl

@@ -22,16 +22,13 @@ namespace TerminalApp
         Windows.Foundation.Collections.IObservableVector<FilteredCommand> FilteredActions { get; };
 
         void SetCommands(Windows.Foundation.Collections.IVector<Microsoft.Terminal.Settings.Model.Command> actions);
-
-        void SetTabs(Windows.Foundation.Collections.IObservableVector<TabBase> tabs, Windows.Foundation.Collections.IObservableVector<TabBase> mruTabs);
-
-        void SetKeyMap(Microsoft.Terminal.Settings.Model.KeyMapping keymap);
+        void SetTabs(Windows.Foundation.Collections.IVector<TabBase> tabs, Boolean clearList);
+        void SetKeyBindings(Microsoft.Terminal.TerminalControl.IKeyBindings bindings);
+        void EnableCommandPaletteMode(Microsoft.Terminal.Settings.Model.CommandPaletteLaunchMode launchMode);
 
         void SelectNextItem(Boolean moveDown);
 
-        void EnableCommandPaletteMode(Microsoft.Terminal.Settings.Model.CommandPaletteLaunchMode launchMode);
-        void EnableTabSwitcherMode(UInt32 startIdx, Microsoft.Terminal.Settings.Model.TabSwitcherMode tabSwitcherMode);
-        void EnableTabSearchMode();
+        void EnableTabSwitcherMode(Boolean searchMode, UInt32 startIdx);
 
         event Windows.Foundation.TypedEventHandler<CommandPalette, TabBase> SwitchToTabRequested;
         event Windows.Foundation.TypedEventHandler<CommandPalette, Microsoft.Terminal.Settings.Model.Command> DispatchCommandRequested;

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -36,151 +36,6 @@ the MIT License. See LICENSE in the project root for license information. -->
             <local:HasNestedCommandsVisibilityConverter x:Key="HasNestedCommandsVisibilityConverter"/>
             <model:IconPathConverter x:Key="IconSourceConverter"/>
 
-            <DataTemplate x:Key="GeneralItemTemplate" x:DataType="local:FilteredCommand">
-
-                <!-- This HorizontalContentAlignment="Stretch" is important
-                        to make sure it takes the entire width of the line -->
-                <ListViewItem HorizontalContentAlignment="Stretch"
-                                  IsTabStop="False"
-                                  AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
-                                  AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}">
-
-                    <Grid HorizontalAlignment="Stretch" ColumnSpacing="8" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="16"/>
-                            <!-- icon -->
-                            <ColumnDefinition Width="Auto"/>
-                            <!-- command label -->
-                            <ColumnDefinition Width="*"/>
-                            <!-- key chord -->
-                            <ColumnDefinition Width="16"/>
-                            <!-- gutter for scrollbar -->
-                        </Grid.ColumnDefinitions>
-
-                        <IconSourceElement
-                                    Grid.Column="0"
-                                    Width="16"
-                                    Height="16"
-                                    IconSource="{x:Bind Item.Icon,
-                                                        Mode=OneWay,
-                                                        Converter={StaticResource IconSourceConverter}}"/>
-
-                        <local:HighlightedTextControl
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Left"
-                                    Text="{x:Bind HighlightedName, Mode=OneWay}"/>
-
-                        <!-- The block for the key chord is only visible
-                                when there's actual text set as the label. See
-                                CommandKeyChordVisibilityConverter for details. -->
-                        <Border
-                                    Grid.Column="2"
-                                    Visibility="{x:Bind Item.KeyChordText,
-                                                 Mode=OneWay,
-                                                 Converter={StaticResource CommandKeyChordVisibilityConverter}}"
-                                    Style="{ThemeResource KeyChordBorderStyle}"
-                                    Padding="2,0,2,0"
-                                    HorizontalAlignment="Right"
-                                    VerticalAlignment="Center">
-
-                            <TextBlock
-                                        Style="{ThemeResource KeyChordTextBlockStyle}"
-                                        FontSize="12"
-                                        Text="{x:Bind Item.KeyChordText, Mode=OneWay}" />
-                        </Border>
-
-                        <!-- xE70E is ChevronUp. Rotated 90 degrees, it's _ChevronRight_ -->
-                        <FontIcon
-                                    FontFamily="Segoe MDL2 Assets"
-                                    Glyph="&#xE70E;"
-                                    HorizontalAlignment="Right"
-                                    Visibility="{x:Bind Item,
-                                                 Mode=OneWay,
-                                                 Converter={StaticResource HasNestedCommandsVisibilityConverter}}"
-                                    Grid.Column="2">
-
-                            <FontIcon.RenderTransform>
-                                <RotateTransform CenterX="0.5" CenterY="0.5" Angle="90"/>
-                            </FontIcon.RenderTransform>
-                        </FontIcon>
-
-                    </Grid>
-                </ListViewItem>
-            </DataTemplate>
-
-            <DataTemplate x:Key="TabItemTemplate" x:DataType="local:FilteredCommand">
-
-                <!-- This HorizontalContentAlignment="Stretch" is important
-                        to make sure it takes the entire width of the line -->
-                <ListViewItem HorizontalContentAlignment="Stretch"
-                                  IsTabStop="False"
-                                  AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
-                                  AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}">
-
-                    <Grid HorizontalAlignment="Stretch" ColumnSpacing="8" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="16"/>
-                            <!-- icon / progress -->
-                            <ColumnDefinition Width="Auto"/>
-                            <!-- command label -->
-                            <ColumnDefinition Width="*"/>
-                            <!-- gutter for indicators -->
-                            <ColumnDefinition Width="Auto"/>
-                            <!-- Indicators -->
-                            <ColumnDefinition Width="16"/>
-                            <!-- gutter for scrollbar -->
-                        </Grid.ColumnDefinitions>
-
-                        <mux:ProgressRing
-                            Grid.Column="0"
-                            IsActive="{x:Bind Item.(local:TabPaletteItem.IsProgressRingActive), Mode=OneWay}"
-                            Visibility="{x:Bind Item.(local:TabPaletteItem.IsProgressRingActive), Mode=OneWay}"
-                            IsIndeterminate="{x:Bind Item.(local:TabPaletteItem.IsProgressRingIndeterminate), Mode=OneWay}"
-                            Value="{x:Bind Item.(local:TabPaletteItem.ProgressValue), Mode=OneWay}"
-                            MinHeight="0"
-                            MinWidth="0"
-                            Height="15"
-                            Width="15"/>
-
-                        <IconSourceElement
-                                    Grid.Column="0"
-                                    Width="16"
-                                    Height="16"
-                                    IconSource="{x:Bind Item.Icon,
-                                                        Mode=OneWay,
-                                                        Converter={StaticResource IconSourceConverter}}"/>
-
-                        <local:HighlightedTextControl
-                                    Grid.Column="1"
-                                    HorizontalAlignment="Left"
-                                    Text="{x:Bind HighlightedName, Mode=OneWay}"/>
-
-                        <StackPanel
-                            Grid.Column="2"
-                            VerticalAlignment="Center"
-                            HorizontalAlignment="Right"
-                            Orientation="Horizontal">
-
-                            <FontIcon
-                                FontFamily="Segoe MDL2 Assets"
-                                Visibility="{x:Bind Item.(local:TabPaletteItem.BellIndicator), Mode=OneWay}"
-                                Glyph="&#xEA8F;"
-                                FontSize="12"
-                                Margin="0,0,8,0"/>
-
-                            <FontIcon
-                                FontFamily="Segoe MDL2 Assets"
-                                Visibility="{x:Bind Item.(local:TabPaletteItem.IsPaneZoomed), Mode=OneWay}"
-                                Glyph="&#xE8A3;"
-                                FontSize="12"
-                                Margin="0,0,8,0"/>
-                        </StackPanel>
-                    </Grid>
-                </ListViewItem>
-            </DataTemplate>
-
-            <local:PaletteItemTemplateSelector x:Key="PaletteItemTemplateSelector" TabItemTemplate="{StaticResource TabItemTemplate}" GeneralItemTemplate="{StaticResource GeneralItemTemplate}"/>
-
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Dark">
                     <Style x:Key="CommandPaletteBackground" TargetType="Grid">
@@ -277,7 +132,7 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <Style x:Key="KeyChordTextBlockStyle" TargetType="TextBlock"/>
 
                     <!--  ParsedCommandLineText styles (use XAML defaults for High Contrast theme) -->
-                    <Style x:Key="ParsedCommandLineBorderStyle" TargetType="Border"/>
+                    <Style x:Key="ParsedCommandLineBoderStyle" TargetType="Border"/>
                     <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock"/>
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
@@ -424,8 +279,77 @@ the MIT License. See LICENSE in the project root for license information. -->
                 IsItemClickEnabled="True"
                 ItemClick="_listItemClicked"
                 PreviewKeyDown="_keyDownHandler"
-                ItemsSource="{x:Bind FilteredActions}"
-                ItemTemplateSelector="{StaticResource PaletteItemTemplateSelector}">
+                ItemsSource="{x:Bind FilteredActions}">
+
+                <ItemsControl.ItemTemplate >
+                    <DataTemplate x:DataType="local:FilteredCommand">
+
+                        <!-- This HorizontalContentAlignment="Stretch" is important
+                        to make sure it takes the entire width of the line -->
+                        <ListViewItem HorizontalContentAlignment="Stretch"
+                                  IsTabStop="False"
+                                  AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
+                                  AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}">
+
+                            <Grid HorizontalAlignment="Stretch" ColumnSpacing="8" >
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="16"/>   <!-- icon -->
+                                    <ColumnDefinition Width="Auto"/> <!-- command label -->
+                                    <ColumnDefinition Width="*"/>    <!-- key chord -->
+                                    <ColumnDefinition Width="16"/>   <!-- gutter for scrollbar -->
+                                </Grid.ColumnDefinitions>
+
+                                <IconSourceElement
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    IconSource="{x:Bind Item.Icon,
+                                                        Mode=OneWay,
+                                                        Converter={StaticResource IconSourceConverter}}"/>
+
+                                <local:HighlightedTextControl
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Left"
+                                    Text="{x:Bind HighlightedName, Mode=OneWay}"/>
+
+                                <!-- The block for the key chord is only visible
+                                when there's actual text set as the label. See
+                                CommandKeyChordVisibilityConverter for details. -->
+                                <Border
+                                    Grid.Column="2"
+                                    Visibility="{x:Bind Item.KeyChordText,
+                                                 Mode=OneWay,
+                                                 Converter={StaticResource CommandKeyChordVisibilityConverter}}"
+                                    Style="{ThemeResource KeyChordBorderStyle}"
+                                    Padding="2,0,2,0"
+                                    HorizontalAlignment="Right"
+                                    VerticalAlignment="Center">
+
+                                    <TextBlock
+                                        Style="{ThemeResource KeyChordTextBlockStyle}"
+                                        FontSize="12"
+                                        Text="{x:Bind Item.KeyChordText, Mode=OneWay}" />
+                                </Border>
+
+                                <!-- xE70E is ChevronUp. Rotated 90 degrees, it's _ChevronRight_ -->
+                                <FontIcon
+                                    FontFamily="Segoe MDL2 Assets"
+                                    Glyph="&#xE70E;"
+                                    HorizontalAlignment="Right"
+                                    Visibility="{x:Bind Item,
+                                                 Mode=OneWay,
+                                                 Converter={StaticResource HasNestedCommandsVisibilityConverter}}"
+                                    Grid.Column="2">
+
+                                    <FontIcon.RenderTransform>
+                                        <RotateTransform CenterX="0.5" CenterY="0.5" Angle="90"/>
+                                    </FontIcon.RenderTransform>
+                                </FontIcon>
+
+                            </Grid>
+                        </ListViewItem>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
             </ListView>
 
         </Grid>

src/cascadia/TerminalApp/MinMaxCloseControl.xaml

@@ -22,11 +22,9 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <StaticResource x:Key="CaptionButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush"/>
                     <StaticResource x:Key="CaptionButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush"/>
                     <StaticResource x:Key="CaptionButtonStroke" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-                    <StaticResource x:Key="CaptionButtonStrokeColor" ResourceKey="SystemBaseHighColor"/>
                     <StaticResource x:Key="CaptionButtonStrokePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush"/>
                     <StaticResource x:Key="CaptionButtonStrokePressed" ResourceKey="SystemControlForegroundBaseHighBrush"/>
                     <SolidColorBrush x:Key="CaptionButtonBackground" Color="Transparent" />
-                    <Color x:Key="CaptionButtonBackgroundColor">Transparent</Color>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver" Color="#e81123"/>
                     <SolidColorBrush x:Key="CloseButtonStrokePointerOver" Color="White"/>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPressed" Color="#f1707a"/>
@@ -37,11 +35,9 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <StaticResource x:Key="CaptionButtonBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowBrush"/>
                     <StaticResource x:Key="CaptionButtonBackgroundPressed" ResourceKey="SystemControlBackgroundBaseMediumLowBrush"/>
                     <StaticResource x:Key="CaptionButtonStroke" ResourceKey="SystemControlForegroundBaseHighBrush"/>
-                    <StaticResource x:Key="CaptionButtonStrokeColor" ResourceKey="SystemBaseHighColor"/>
                     <StaticResource x:Key="CaptionButtonStrokePointerOver" ResourceKey="SystemControlForegroundBaseHighBrush"/>
                     <StaticResource x:Key="CaptionButtonStrokePressed" ResourceKey="SystemControlForegroundBaseHighBrush"/>
                     <SolidColorBrush x:Key="CaptionButtonBackground" Color="Transparent" />
-                    <Color x:Key="CaptionButtonBackgroundColor">Transparent</Color>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver" Color="#e81123"/>
                     <SolidColorBrush x:Key="CloseButtonStrokePointerOver" Color="White"/>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPressed" Color="#f1707a"/>
@@ -50,11 +46,9 @@ the MIT License. See LICENSE in the project root for license information. -->
                 <ResourceDictionary x:Key="HighContrast">
                     <x:Double x:Key="CaptionButtonStrokeWidth">3.0</x:Double>
                     <SolidColorBrush x:Key="CaptionButtonBackground" Color="{ThemeResource SystemColorButtonFaceColor}"/>
-                    <StaticResource x:Key="CaptionButtonBackgroundColor" ResourceKey="SystemColorButtonFaceColor"/>
                     <SolidColorBrush x:Key="CaptionButtonBackgroundPointerOver" Color="{ThemeResource SystemColorHighlightColor}"/>
                     <SolidColorBrush x:Key="CaptionButtonBackgroundPressed" Color="{ThemeResource SystemColorHighlightColor}"/>
                     <SolidColorBrush x:Key="CaptionButtonStroke" Color="{ThemeResource SystemColorButtonTextColor}"/>
-                    <StaticResource x:Key="CaptionButtonStrokeColor" ResourceKey="SystemColorButtonTextColor"/>
                     <SolidColorBrush x:Key="CaptionButtonStrokePointerOver" Color="{ThemeResource SystemColorHighlightTextColor}"/>
                     <SolidColorBrush x:Key="CaptionButtonStrokePressed" Color="{ThemeResource SystemColorHighlightTextColor}"/>
                     <SolidColorBrush x:Key="CloseButtonBackgroundPointerOver" Color="{ThemeResource SystemColorHighlightColor}"/>
@@ -101,8 +95,8 @@ the MIT License. See LICENSE in the project root for license information. -->
                                         <VisualStateGroup.Transitions>
                                             <VisualTransition From="PointerOver" To="Normal">
                                                 <Storyboard>
-                                                    <ColorAnimation Storyboard.TargetName="ButtonBaseElement" Storyboard.TargetProperty="(UIElement.Background).(SolidColorBrush.Color)" To="{ThemeResource CaptionButtonBackgroundColor}" Duration="0:0:0.2"/>
-                                                    <ColorAnimation Storyboard.TargetName="Path" Storyboard.TargetProperty="(UIElement.Stroke).(SolidColorBrush.Color)" To="{ThemeResource CaptionButtonStrokeColor}" Duration="0:0:0.1"/>
+                                                    <ColorAnimation Storyboard.TargetName="ButtonBaseElement" Storyboard.TargetProperty="(UIElement.Background).(SolidColorBrush.Color)" To="{Binding Color, Source={ThemeResource CaptionButtonBackground}}" Duration="0:0:0.2"/>
+                                                    <ColorAnimation Storyboard.TargetName="Path" Storyboard.TargetProperty="(UIElement.Stroke).(SolidColorBrush.Color)" To="{Binding Color, Source={ThemeResource CaptionButtonStroke}}" Duration="0:0:0.1"/>
                                                 </Storyboard>
                                             </VisualTransition>
                                         </VisualStateGroup.Transitions>

src/cascadia/TerminalApp/PaletteItemTemplateSelector.cpp

@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "TabPaletteItem.h"
-#include "PaletteItemTemplateSelector.h"
-#include "PaletteItemTemplateSelector.g.cpp"
-
-namespace winrt::TerminalApp::implementation
-{
-    Windows::UI::Xaml::DataTemplate PaletteItemTemplateSelector::SelectTemplateCore(winrt::Windows::Foundation::IInspectable const& item, winrt::Windows::UI::Xaml::DependencyObject const& /*container*/)
-    {
-        return SelectTemplateCore(item);
-    }
-
-    // Method Description:
-    // - This method is called once command palette decides how to render a filtered command.
-    //   Currently we support two ways to render command, that depend on its palette item type:
-    //   - For TabPalette item we render an icon, a title, and some tab-related indicators like progress bar (as defined by TabItemTemplate)
-    //   - All other items are currently rendered with icon, title and optional key-chord (as defined by GeneralItemTemplate)
-    // Arguments:
-    // - item - an instance of filtered command to render
-    // Return Value:
-    // - data template to use for rendering
-    Windows::UI::Xaml::DataTemplate PaletteItemTemplateSelector::SelectTemplateCore(winrt::Windows::Foundation::IInspectable const& item)
-    {
-        if (const auto filteredCommand{ item.try_as<winrt::TerminalApp::FilteredCommand>() })
-        {
-            if (filteredCommand.Item().try_as<winrt::TerminalApp::TabPaletteItem>())
-            {
-                return TabItemTemplate();
-            }
-        }
-
-        return GeneralItemTemplate();
-    }
-}

src/cascadia/TerminalApp/PaletteItemTemplateSelector.h

@@ -1,26 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "PaletteItemTemplateSelector.g.h"
-#include "inc/cppwinrt_utils.h"
-
-namespace winrt::TerminalApp::implementation
-{
-    struct PaletteItemTemplateSelector : PaletteItemTemplateSelectorT<PaletteItemTemplateSelector>
-    {
-        PaletteItemTemplateSelector() = default;
-
-        Windows::UI::Xaml::DataTemplate SelectTemplateCore(winrt::Windows::Foundation::IInspectable const&, winrt::Windows::UI::Xaml::DependencyObject const&);
-        Windows::UI::Xaml::DataTemplate SelectTemplateCore(winrt::Windows::Foundation::IInspectable const&);
-
-        GETSET_PROPERTY(winrt::Windows::UI::Xaml::DataTemplate, TabItemTemplate);
-        GETSET_PROPERTY(winrt::Windows::UI::Xaml::DataTemplate, GeneralItemTemplate);
-    };
-}
-
-namespace winrt::TerminalApp::factory_implementation
-{
-    BASIC_FACTORY(PaletteItemTemplateSelector);
-}

src/cascadia/TerminalApp/PaletteItemTemplateSelector.idl

@@ -1,13 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace TerminalApp
-{
-    [default_interface] runtimeclass PaletteItemTemplateSelector : Windows.UI.Xaml.Controls.DataTemplateSelector
-    {
-        PaletteItemTemplateSelector();
-
-        Windows.UI.Xaml.DataTemplate TabItemTemplate;
-        Windows.UI.Xaml.DataTemplate GeneralItemTemplate;
-    }
-}

src/cascadia/TerminalApp/Pane.cpp

@@ -17,10 +17,11 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::Terminal::TerminalControl;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace winrt::TerminalApp;
-using namespace TerminalApp;
+
 
 static const int PaneBorderSize = 2;
 static const int CombinedPaneBorderSize = 2 * PaneBorderSize;
+static const float Half = 0.50f;
 
 // WARNING: Don't do this! This won't work
 //   Duration duration{ std::chrono::milliseconds{ 200 } };
@@ -59,7 +60,6 @@ Pane::Pane(const GUID& profile, const TermControl& control, const bool lastFocus
 
     // Register an event with the control to have it inform us when it gains focus.
     _gotFocusRevoker = control.GotFocus(winrt::auto_revoke, { this, &Pane::_ControlGotFocusHandler });
-    _lostFocusRevoker = control.LostFocus(winrt::auto_revoke, { this, &Pane::_ControlLostFocusHandler });
 
     // When our border is tapped, make sure to transfer focus to our control.
     // LOAD-BEARING: This will NOT work if the border's BorderBrush is set to
@@ -368,18 +368,15 @@ void Pane::_ControlWarningBellHandler(const winrt::Windows::Foundation::IInspect
     auto paneProfile = settings.FindProfile(_profile.value());
     if (paneProfile)
     {
-        // We don't want to do anything if nothing is set, so check for that first
-        if (static_cast<int>(paneProfile.BellStyle()) != 0)
+        if (WI_IsFlagSet(paneProfile.BellStyle(), winrt::Microsoft::Terminal::Settings::Model::BellStyle::Audible))
         {
-            if (WI_IsFlagSet(paneProfile.BellStyle(), winrt::Microsoft::Terminal::Settings::Model::BellStyle::Audible))
-            {
-                // Audible is set, play the sound
-                const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
-                PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
-            }
-
-            // raise the event with the bool value corresponding to the visual flag
-            _PaneRaiseBellHandlers(nullptr, WI_IsFlagSet(paneProfile.BellStyle(), winrt::Microsoft::Terminal::Settings::Model::BellStyle::Visual));
+            const auto soundAlias = reinterpret_cast<LPCTSTR>(SND_ALIAS_SYSTEMHAND);
+            PlaySound(soundAlias, NULL, SND_ALIAS_ID | SND_ASYNC | SND_SENTRY);
+        }
+        if (WI_IsFlagSet(paneProfile.BellStyle(), winrt::Microsoft::Terminal::Settings::Model::BellStyle::Visual))
+        {
+            // Bubble this event up to app host, starting with bubbling to the hosting tab
+            _PaneRaiseVisualBellHandlers(nullptr);
         }
     }
 }
@@ -398,16 +395,6 @@ void Pane::_ControlGotFocusHandler(winrt::Windows::Foundation::IInspectable cons
     _GotFocusHandlers(shared_from_this());
 }
 
-// Event Description:
-// - Called when our control loses focus. We'll use this to trigger our LostFocus
-//   callback. The tab that's hosting us should have registered a callback which
-//   can be used to update its own internal focus state
-void Pane::_ControlLostFocusHandler(winrt::Windows::Foundation::IInspectable const& /* sender */,
-                                    RoutedEventArgs const& /* args */)
-{
-    _LostFocusHandlers(shared_from_this());
-}
-
 // Method Description:
 // - Fire our Closed event to tell our parent that we should be removed.
 // Arguments:
@@ -416,11 +403,8 @@ void Pane::_ControlLostFocusHandler(winrt::Windows::Foundation::IInspectable con
 // - <none>
 void Pane::Close()
 {
-    if (!_isClosing.exchange(true))
-    {
-        // Fire our Closed event to tell our parent that we should be removed.
-        _ClosedHandlers(nullptr, nullptr);
-    }
+    // Fire our Closed event to tell our parent that we should be removed.
+    _ClosedHandlers(nullptr, nullptr);
 }
 
 // Method Description:
@@ -600,19 +584,6 @@ void Pane::_FocusFirstChild()
 {
     if (_IsLeaf())
     {
-        if (_root.ActualWidth() == 0 && _root.ActualHeight() == 0)
-        {
-            // When these sizes are 0, then the pane might still be in startup,
-            // and doesn't yet have a real size. In that case, the control.Focus
-            // event won't be handled until _after_ the startup events are all
-            // processed. This will lead to the Tab not being notified that the
-            // focus moved to a different Pane.
-            //
-            // In that scenario, trigger the event manually here, to correctly
-            // inform the Tab that we're now focused.
-            _GotFocusHandlers(shared_from_this());
-        }
-
         _control.Focus(FocusState::Programmatic);
     }
     else
@@ -642,13 +613,7 @@ void Pane::UpdateSettings(const TerminalSettings& settings, const GUID& profile)
     {
         if (profile == _profile)
         {
-            // Update the parent of the control's settings object (and not the object itself) so
-            // that any overrides made by the control don't get affected by the reload
-            auto child = winrt::get_self<winrt::TerminalApp::implementation::TerminalSettings>(_control.Settings());
-            auto parent = winrt::get_self<winrt::TerminalApp::implementation::TerminalSettings>(settings);
-            child->ClearParents();
-            child->InsertParent(0, parent->get_strong());
-            _control.UpdateSettings();
+            _control.UpdateSettings(settings);
         }
     }
 }
@@ -739,7 +704,6 @@ void Pane::_CloseChild(const bool closeFirst)
 
         // re-attach our handler for the control's GotFocus event.
         _gotFocusRevoker = _control.GotFocus(winrt::auto_revoke, { this, &Pane::_ControlGotFocusHandler });
-        _lostFocusRevoker = _control.LostFocus(winrt::auto_revoke, { this, &Pane::_ControlLostFocusHandler });
 
         // If we're inheriting the "last active" state from one of our children,
         // focus our control now. This should trigger our own GotFocus event.
@@ -1252,6 +1216,32 @@ void Pane::_SetupEntranceAnimation()
     setupAnimation(secondSize, false);
 }
 
+// Method Description:
+// - Determines whether the pane can be split
+// Arguments:
+// - splitType: what type of split we want to create.
+// Return Value:
+// - True if the pane can be split. False otherwise.
+bool Pane::CanSplit(SplitState splitType)
+{
+    if (_IsLeaf())
+    {
+        return _CanSplit(splitType);
+    }
+
+    if (_firstChild->_HasFocusedChild())
+    {
+        return _firstChild->CanSplit(splitType);
+    }
+
+    if (_secondChild->_HasFocusedChild())
+    {
+        return _secondChild->CanSplit(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
@@ -1282,15 +1272,12 @@ void Pane::_SetupEntranceAnimation()
 // - This method is highly similar to Pane::PreCalculateAutoSplit
 std::optional<bool> Pane::PreCalculateCanSplit(const std::shared_ptr<Pane> target,
                                                SplitState splitType,
-                                               const float splitSize,
                                                const winrt::Windows::Foundation::Size availableSpace) const
 {
     if (_IsLeaf())
     {
         if (target.get() == this)
         {
-            const auto firstPrecent = 1.0f - splitSize;
-            const auto secondPercent = splitSize;
             // 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();
@@ -1303,19 +1290,17 @@ std::optional<bool> Pane::PreCalculateCanSplit(const std::shared_ptr<Pane> targe
             else if (splitType == SplitState::Vertical)
             {
                 const auto widthMinusSeparator = availableSpace.Width - CombinedPaneBorderSize;
-                const auto newFirstWidth = widthMinusSeparator * firstPrecent;
-                const auto newSecondWidth = widthMinusSeparator * secondPercent;
+                const auto newWidth = widthMinusSeparator * Half;
 
-                return { newFirstWidth > minSize.Width && newSecondWidth > minSize.Width };
+                return { newWidth > minSize.Width };
             }
 
             else if (splitType == SplitState::Horizontal)
             {
                 const auto heightMinusSeparator = availableSpace.Height - CombinedPaneBorderSize;
-                const auto newFirstHeight = heightMinusSeparator * firstPrecent;
-                const auto newSecondHeight = heightMinusSeparator * secondPercent;
+                const auto newHeight = heightMinusSeparator * Half;
 
-                return { newFirstHeight > minSize.Height && newSecondHeight > minSize.Height };
+                return { newHeight > minSize.Height };
             }
         }
         else
@@ -1344,8 +1329,8 @@ std::optional<bool> Pane::PreCalculateCanSplit(const std::shared_ptr<Pane> targe
                                        (availableSpace.Height - firstHeight) - PaneBorderSize :
                                        availableSpace.Height;
 
-        const auto firstResult = _firstChild->PreCalculateCanSplit(target, splitType, splitSize, { firstWidth, firstHeight });
-        return firstResult.has_value() ? firstResult : _secondChild->PreCalculateCanSplit(target, splitType, splitSize, { secondWidth, secondHeight });
+        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
@@ -1363,26 +1348,23 @@ std::optional<bool> Pane::PreCalculateCanSplit(const std::shared_ptr<Pane> targe
 // - control: A TermControl to use in the new pane.
 // Return Value:
 // - The two newly created Panes
-std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::Split(SplitState splitType,
-                                                                    const float splitSize,
-                                                                    const GUID& profile,
-                                                                    const TermControl& control)
+std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::Split(SplitState splitType, const GUID& profile, const TermControl& control)
 {
     if (!_IsLeaf())
     {
         if (_firstChild->_HasFocusedChild())
         {
-            return _firstChild->Split(splitType, splitSize, profile, control);
+            return _firstChild->Split(splitType, profile, control);
         }
         else if (_secondChild->_HasFocusedChild())
         {
-            return _secondChild->Split(splitType, splitSize, profile, control);
+            return _secondChild->Split(splitType, profile, control);
         }
 
         return { nullptr, nullptr };
     }
 
-    return _Split(splitType, splitSize, profile, control);
+    return _Split(splitType, profile, control);
 }
 
 // Method Description:
@@ -1410,6 +1392,45 @@ SplitState Pane::_convertAutomaticSplitState(const SplitState& splitType) const
     return splitType;
 }
 
+// Method Description:
+// - Determines whether the pane can be split.
+// Arguments:
+// - splitType: what type of split we want to create.
+// Return Value:
+// - True if the pane can be split. False otherwise.
+bool Pane::_CanSplit(SplitState splitType)
+{
+    const Size actualSize{ gsl::narrow_cast<float>(_root.ActualWidth()),
+                           gsl::narrow_cast<float>(_root.ActualHeight()) };
+
+    const Size minSize = _GetMinSize();
+
+    auto actualSplitType = _convertAutomaticSplitState(splitType);
+
+    if (actualSplitType == SplitState::None)
+    {
+        return false;
+    }
+
+    if (actualSplitType == SplitState::Vertical)
+    {
+        const auto widthMinusSeparator = actualSize.Width - CombinedPaneBorderSize;
+        const auto newWidth = widthMinusSeparator * Half;
+
+        return newWidth > minSize.Width;
+    }
+
+    if (actualSplitType == SplitState::Horizontal)
+    {
+        const auto heightMinusSeparator = actualSize.Height - CombinedPaneBorderSize;
+        const auto newHeight = heightMinusSeparator * Half;
+
+        return newHeight > minSize.Height;
+    }
+
+    return false;
+}
+
 // Method Description:
 // - Does the bulk of the work of creating a new split. Initializes our UI,
 //   creates a new Pane to host the control, registers event handlers.
@@ -1419,10 +1440,7 @@ SplitState Pane::_convertAutomaticSplitState(const SplitState& splitType) const
 // - control: A TermControl to use in the new pane.
 // Return Value:
 // - The two newly created Panes
-std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitState splitType,
-                                                                     const float splitSize,
-                                                                     const GUID& profile,
-                                                                     const TermControl& control)
+std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitState splitType, const GUID& profile, const TermControl& control)
 {
     if (splitType == SplitState::None)
     {
@@ -1445,10 +1463,9 @@ std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitState
     // control telling us that it's now focused, we want it telling its new
     // parent.
     _gotFocusRevoker.revoke();
-    _lostFocusRevoker.revoke();
 
     _splitState = actualSplitType;
-    _desiredSplitPosition = 1.0f - splitSize;
+    _desiredSplitPosition = Half;
 
     // Remove any children we currently have. We can't add the existing
     // TermControl to a new grid until we do this.
@@ -1559,9 +1576,9 @@ void Pane::Restore(std::shared_ptr<Pane> zoomedPane)
 //   otherwise the ID value will not make sense (leaves have IDs, parents do not)
 // Return Value:
 // - The ID of this pane
-std::optional<uint16_t> Pane::Id() noexcept
+uint16_t Pane::Id() noexcept
 {
-    return _id;
+    return _id.value();
 }
 
 // Method Description:
@@ -2094,13 +2111,5 @@ std::optional<SplitState> Pane::PreCalculateAutoSplit(const std::shared_ptr<Pane
     FAIL_FAST();
 }
 
-// Method Description:
-// - Returns true if the pane or one of its descendants is read-only
-bool Pane::ContainsReadOnly() const
-{
-    return _IsLeaf() ? _control.ReadOnly() : (_firstChild->ContainsReadOnly() || _secondChild->ContainsReadOnly());
-}
-
 DEFINE_EVENT(Pane, GotFocus, _GotFocusHandlers, winrt::delegate<std::shared_ptr<Pane>>);
-DEFINE_EVENT(Pane, LostFocus, _LostFocusHandlers, winrt::delegate<std::shared_ptr<Pane>>);
-DEFINE_EVENT(Pane, PaneRaiseBell, _PaneRaiseBellHandlers, winrt::Windows::Foundation::EventHandler<bool>);
+DEFINE_EVENT(Pane, PaneRaiseVisualBell, _PaneRaiseVisualBellHandlers, winrt::delegate<std::shared_ptr<Pane>>);