Migrate spelling-0.0.21 changes from main

A part of the #8415.
Includes:
* Moving `TabSwitcherMode` related decisions into `CommandPalette`
(simplifying the logic of `TerminalPage::SelectNextTab`)
* Fix a bug where the index of first tab switch is incorrect
(since bindings are not updated)
* Removing redundant `CommandPalette` updates
* Preparations for tabs binding

build/Helix/runtests.cmd

@@ -18,7 +18,7 @@ FOR %%A IN (TestHostApp.exe,te.exe,te.processhost.exe,conhost.exe,OpenConsole.ex
 
 echo %TIME%
 
-:: kill dhandler, which is a tool designed to handle unexpected windows appearing. But since our tests are 
+:: kill dhandler, which is a tool designed to handle unexpected windows appearing. But since our tests are
 :: expected to show UI we don't want it running.
 taskkill -f -im dhandler.exe
 
@@ -28,7 +28,7 @@ echo %TIME%
 powershell -ExecutionPolicy Bypass .\InstallTestAppDependencies.ps1
 echo %TIME%
 
-set testBinaryCandidates=TerminalApp.LocalTests.dll Conhost.UIA.Tests.dll
+set testBinaryCandidates=TerminalApp.LocalTests.dll SettingsModel.LocalTests.dll Conhost.UIA.Tests.dll
 set testBinaries=
 for %%B in (%testBinaryCandidates%) do (
     if exist %%B (
@@ -103,4 +103,4 @@ copy /y *_subresults.json %HELIX_WORKITEM_UPLOAD_ROOT%
 
 type testResults.xml
 
-echo %TIME%
+echo %TIME%

build/pipelines/templates/helix-runtests-job.yml

@@ -5,14 +5,14 @@ parameters:
   testSuite: ''
   # If a Pipeline runs this template more than once, this parameter should be unique per build flavor to differentiate the
   # the different test runs:
-  helixType: 'test/devtest' 
+  helixType: 'test/devtest'
   artifactName: 'drop'
   maxParallel: 4
   rerunPassesRequiredToAvoidFailure: 5
   taefQuery: ''
   # if 'useBuildOutputFromBuildId' is set, we will default to using a build from this pipeline:
   useBuildOutputFromPipeline: $(System.DefinitionId)
-  matrix: 
+  matrix:
     # Release_x86:
     #   buildPlatform: 'x86'
     #   buildConfiguration: 'release'
@@ -39,13 +39,13 @@ jobs:
     taefPath: $(Build.SourcesDirectory)\build\Helix\packages\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$(buildPlatform)
     helixCommonArgs: '/binaryLogger:$(Build.SourcesDirectory)/${{parameters.name}}.$(buildPlatform).$(buildConfiguration).binlog /p:HelixBuild=$(Build.BuildId).$(buildPlatform).$(buildConfiguration) /p:Platform=$(buildPlatform) /p:Configuration=$(buildConfiguration) /p:HelixType=${{parameters.helixType}} /p:TestSuite=${{parameters.testSuite}} /p:ProjFilesPath=$(Build.ArtifactStagingDirectory) /p:rerunPassesRequiredToAvoidFailure=${{parameters.rerunPassesRequiredToAvoidFailure}}'
 
-      
+
   steps:
   - task: CmdLine@1
     displayName: 'Display build machine environment variables'
     inputs:
       filename: 'set'
-      
+
   - task: NuGetToolInstaller@0
     displayName: 'Use NuGet 5.2.0'
     inputs:
@@ -59,23 +59,23 @@ jobs:
       nugetConfigPath: nuget.config
       restoreDirectory: packages
 
-  - task: DownloadBuildArtifacts@0 
+  - task: DownloadBuildArtifacts@0
     condition:
       and(succeeded(),eq(variables['useBuildOutputFromBuildId'],''))
-    inputs: 
-      artifactName: ${{ parameters.artifactName }} 
+    inputs:
+      artifactName: ${{ parameters.artifactName }}
       downloadPath: '$(artifactsDir)'
 
-  - task: DownloadBuildArtifacts@0 
+  - task: DownloadBuildArtifacts@0
     condition:
       and(succeeded(),ne(variables['useBuildOutputFromBuildId'],''))
-    inputs: 
+    inputs:
       buildType: specific
       buildVersionToDownload: specific
       project: $(System.TeamProjectId)
       pipeline: ${{ parameters.useBuildOutputFromPipeline }}
       buildId: $(useBuildOutputFromBuildId)
-      artifactName: ${{ parameters.artifactName }} 
+      artifactName: ${{ parameters.artifactName }}
       downloadPath: '$(artifactsDir)'
 
   - task: CmdLine@1
@@ -90,7 +90,7 @@ jobs:
       targetType: filePath
       filePath: build\Helix\PrepareHelixPayload.ps1
       arguments: -Platform '$(buildPlatform)' -Configuration '$(buildConfiguration)' -ArtifactName '${{ parameters.artifactName }}'
-      
+
   - task: CmdLine@1
     displayName: 'Display Helix payload contents'
     inputs:
@@ -104,7 +104,16 @@ jobs:
       outputProjFileName: 'RunTestsInHelix-TerminalAppLocalTests.proj'
       testSuite: '${{ parameters.testSuite }}'
       taefQuery: ${{ parameters.taefQuery }}
-      
+
+  - template: helix-createprojfile-steps.yml
+    parameters:
+      condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
+      testFilePath: '$(artifactsDir)\${{ parameters.artifactName }}\$(buildConfiguration)\$(buildPlatform)\Test\SettingsModel.LocalTests.dll'
+      outputProjFileName: 'RunTestsInHelix-SettingsModelLocalTests.proj'
+      testSuite: '${{ parameters.testSuite }}'
+      taefQuery: ${{ parameters.taefQuery }}
+
+
   - template: helix-createprojfile-steps.yml
     parameters:
       condition: and(succeeded(),ne('${{ parameters.testSuite }}','NugetTestSuite'))
@@ -118,7 +127,7 @@ jobs:
     inputs:
       PathtoPublish: $(Build.ArtifactStagingDirectory)
       artifactName: ${{ parameters.artifactName }}
-      
+
   - task: DotNetCoreCLI@2
     displayName: 'Run tests in Helix (open queues)'
     env:

consolegit2gitfilters.json

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

doc/cascadia/AddASetting.md

@@ -0,0 +1,395 @@
+# 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
+
+#### 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

@@ -369,6 +369,13 @@
             "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"
             }
           }
         }
@@ -649,6 +656,10 @@
           "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": {

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

@@ -0,0 +1,302 @@
+---
+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
+
+

src/buffer/out/AttrRow.cpp

@@ -184,7 +184,7 @@ 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:
-// - An unordered set containing the hyperlink IDs present in this row
+// - The hyperlink IDs present in this row
 std::vector<uint16_t> ATTR_ROW::GetHyperlinks()
 {
     std::vector<uint16_t> ids;

src/buffer/out/CharRow.hpp

@@ -81,9 +81,11 @@ 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;

src/buffer/out/ut_textbuffer/ReflowTests.cpp

@@ -0,0 +1,856 @@
+// 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() };
+            charRow.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, charRow.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,6 +10,7 @@
   </PropertyGroup>
   <Import Project="$(SolutionDir)src\common.build.pre.props" />
   <ItemGroup>
+    <ClCompile Include="ReflowTests.cpp" />
     <ClCompile Include="TextColorTests.cpp" />
     <ClCompile Include="TextAttributeTests.cpp" />
     <ClCompile Include="UnicodeStorageTests.cpp" />
@@ -18,6 +19,9 @@
     </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,6 +14,7 @@ DLLDEF                  =
 
 SOURCES = \
     $(SOURCES) \
+    ReflowTests.cpp \
     TextColorTests.cpp \
     TextAttributeTests.cpp \
     DefaultResource.rc \

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -82,14 +82,9 @@
                 <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,15 +82,9 @@
                 <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,14 +83,9 @@
                 <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 Microsoft::Terminal::CommandlineArgs;
 
 // Either a ; at the start of a line, or a ; preceded by any non-\ char.
 const std::wregex AppCommandlineArgs::_commandDelimiterRegex{ LR"(^;|[^\\];)" };
@@ -189,6 +187,7 @@ void AppCommandlineArgs::_buildParser()
     _buildNewTabParser();
     _buildSplitPaneParser();
     _buildFocusTabParser();
+    _buildMoveFocusParser();
 }
 
 // Method Description:
@@ -247,6 +246,10 @@ 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
@@ -274,7 +277,7 @@ void AppCommandlineArgs::_buildSplitPaneParser()
                     style = SplitState::Vertical;
                 }
             }
-            SplitPaneArgs args{ style, terminalArgs };
+            SplitPaneArgs args{ style, _splitPaneSize, terminalArgs };
             splitPaneActionAndArgs.Args(args);
             _startupActions.push_back(splitPaneActionAndArgs);
         });
@@ -337,6 +340,54 @@ 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.
@@ -444,6 +495,8 @@ bool AppCommandlineArgs::_noCommandsProvided()
              *_newTabShort.subcommand ||
              *_focusTabCommand ||
              *_focusTabShort ||
+             *_moveFocusCommand ||
+             *_moveFocusShort ||
              *_newPaneShort.subcommand ||
              *_newPaneCommand.subcommand);
 }
@@ -466,11 +519,13 @@ 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).
@@ -687,7 +742,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 = ::Microsoft::Terminal::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 Microsoft::Terminal::CommandlineArgs
 {
     class AppCommandlineArgs;
 };
 
-class TerminalApp::AppCommandlineArgs final
+class Microsoft::Terminal::CommandlineArgs::AppCommandlineArgs final
 {
 public:
     static constexpr std::string_view NixHelpFlag{ "-?" };
@@ -74,6 +75,9 @@ 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;
@@ -81,11 +85,14 @@ 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 };
@@ -105,6 +112,7 @@ 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 Microsoft::Terminal::CommandlineArgs;
 
 size_t Commandline::Argc() const
 {

src/cascadia/CommandlineArgs/Commandline.h

@@ -23,12 +23,12 @@ namespace TerminalAppLocalTests
 {
     class CommandlineTest;
 };
-namespace TerminalApp
+namespace Microsoft::Terminal::CommandlineArgs
 {
     class Commandline;
 };
 
-class TerminalApp::Commandline
+class Microsoft::Terminal::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>
+    <OCResourceDirectory Include="Resources" />
+    <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>
+</Project>

src/cascadia/CommandlineArgs/Resources/en-us/Resources.resw

@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CmdCommandArgDesc" xml:space="preserve">
+    <value>An optional command, with arguments, to be spawned in the new tab or pane</value>
+  </data>
+  <data name="CmdFocusTabDesc" xml:space="preserve">
+    <value>Move focus to another tab</value>
+  </data>
+  <data name="CmdFocusTabNextArgDesc" xml:space="preserve">
+    <value>Move focus to the next tab</value>
+  </data>
+  <data name="CmdFTDesc" xml:space="preserve">
+    <value>An alias for the "focus-tab" subcommand.</value>
+    <comment>{Locked="\"focus-tab\""}</comment>
+  </data>
+  <data name="CmdFocusTabPrevArgDesc" xml:space="preserve">
+    <value>Move focus to the previous tab</value>
+  </data>
+  <data name="CmdFocusTabTargetArgDesc" xml:space="preserve">
+    <value>Move focus the tab at the given index</value>
+  </data>
+  <data name="CmdSplitPaneSizeArgDesc" xml:space="preserve">
+    <value>Specify the size as a percentage of the parent pane. Valid values are between (0,1), exclusive.</value>
+  </data>
+  <data name="CmdNewTabDesc" xml:space="preserve">
+    <value>Create a new tab</value>
+  </data>
+  <data name="CmdNTDesc" xml:space="preserve">
+    <value>An alias for the "new-tab" subcommand.</value>
+    <comment>{Locked="\"new-tab\""}</comment>
+  </data>
+  <data name="CmdProfileArgDesc" xml:space="preserve">
+    <value>Open with the given profile. Accepts either the name or GUID of a profile</value>
+  </data>
+  <data name="CmdSplitPaneDesc" xml:space="preserve">
+    <value>Create a new split pane</value>
+  </data>
+  <data name="CmdSPDesc" xml:space="preserve">
+    <value>An alias for the "split-pane" subcommand.</value>
+    <comment>{Locked="\"split-pane\""}</comment>
+  </data>
+  <data name="CmdSplitPaneHorizontalArgDesc" xml:space="preserve">
+    <value>Create the new pane as a horizontal split (think [-])</value>
+  </data>
+  <data name="CmdSplitPaneVerticalArgDesc" xml:space="preserve">
+    <value>Create the new pane as a vertical split (think [|])</value>
+  </data>
+  <data name="CmdStartingDirArgDesc" xml:space="preserve">
+    <value>Open in the given directory instead of the profile's set "startingDirectory"</value>
+    <comment>{Locked="\"startingDirectory\""}</comment>
+  </data>
+  <data name="CmdTitleArgDesc" xml:space="preserve">
+    <value>Open the terminal with the provided title instead of the profile's set "title"</value>
+    <comment>{Locked="\"title\""}</comment>
+  </data>
+  <data name="CmdTabColorArgDesc" xml:space="preserve">
+    <value>Open the tab with the specified color, in #rrggbb format</value>
+  </data>
+  <data name="CmdVersionDesc" xml:space="preserve">
+    <value>Display the application version</value>
+  </data>
+  <data name="CmdMaximizedDesc" xml:space="preserve">
+    <value>Launch the window maximized</value>
+  </data>
+  <data name="CmdFullscreenDesc" xml:space="preserve">
+    <value>Launch the window in fullscreen mode</value>
+  </data>
+  <data name="CmdMoveFocusDesc" xml:space="preserve">
+    <value>Move focus to the adjacent pane in the specified direction</value>
+  </data>
+  <data name="CmdMFDesc" xml:space="preserve">
+    <value>An alias for the "move-focus" subcommand.</value>
+    <comment>{Locked="\"move-focus\""}</comment>
+  </data>
+  <data name="CmdMoveFocusDirectionArgDesc" xml:space="preserve">
+    <value>The direction to move focus in</value>
+  </data>
+  <data name="CmdFocusDesc" xml:space="preserve">
+    <value>Launch the window in focus mode</value>
+  </data>
+</root>

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,51 @@
+// 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>
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#include "til.h"

src/cascadia/LocalTests_SettingsModel/CommandTests.cpp

@@ -37,6 +37,7 @@ namespace SettingsModelLocalTests
         TEST_METHOD(ManyCommandsSameAction);
         TEST_METHOD(LayerCommand);
         TEST_METHOD(TestSplitPaneArgs);
+        TEST_METHOD(TestSplitPaneBadSize);
         TEST_METHOD(TestResourceKeyName);
         TEST_METHOD(TestAutogeneratedName);
         TEST_METHOD(TestLayerOnAutogeneratedName);
@@ -147,7 +148,8 @@ 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": "command5", "command": { "action": "splitPane", "split": "auto" } },
+            { "name": "command6", "command": { "action": "splitPane", "size": 0.25 } },
         ])" };
 
         const auto commands0Json = VerifyParseSucceeded(commands0String);
@@ -156,7 +158,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(4u, commands.Size());
+        VERIFY_ARE_EQUAL(5u, commands.Size());
 
         {
             auto command = commands.Lookup(L"command1");
@@ -167,6 +169,7 @@ 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");
@@ -177,6 +180,7 @@ 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");
@@ -187,6 +191,7 @@ 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");
@@ -197,8 +202,51 @@ 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_TerminalApp/CommandlineTest.cpp

@@ -6,7 +6,7 @@
 
 #include "../types/inc/utils.hpp"
 #include "../TerminalApp/TerminalPage.h"
-#include "../TerminalApp/AppCommandlineArgs.h"
+#include "../CommandlineArgs/AppCommandlineArgs.h"
 
 using namespace WEX::Logging;
 using namespace WEX::Common;
@@ -14,7 +14,7 @@ using namespace WEX::TestExecution;
 
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::TerminalApp;
-using namespace ::TerminalApp;
+using namespace ::Microsoft::Terminal::CommandlineArgs;
 
 namespace TerminalAppLocalTests
 {
@@ -47,6 +47,7 @@ namespace TerminalAppLocalTests
         TEST_METHOD(ParseSplitPaneIntoArgs);
         TEST_METHOD(ParseComboCommandlineIntoArgs);
         TEST_METHOD(ParseFocusTabArgs);
+        TEST_METHOD(ParseMoveFocusArgs);
         TEST_METHOD(ParseArgumentsWithParsingTerminators);
 
         TEST_METHOD(ParseNoCommandIsNewTab);
@@ -61,6 +62,8 @@ namespace TerminalAppLocalTests
         TEST_METHOD(TestLaunchMode);
         TEST_METHOD(TestLaunchModeWithNoCommand);
 
+        TEST_METHOD(TestMultipleSplitPaneSizes);
+
     private:
         void _buildCommandlinesHelper(AppCommandlineArgs& appArgs,
                                       const size_t expectedSubcommands,
@@ -76,6 +79,23 @@ 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;
@@ -995,6 +1015,124 @@ 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{};
@@ -1325,4 +1463,119 @@ 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

@@ -12,7 +12,7 @@
 #include "../CppWinrtTailored.h"
 
 using namespace Microsoft::Console;
-using namespace TerminalApp;
+using namespace Microsoft::Terminal::CommandlineArgs;
 using namespace winrt::TerminalApp;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 
@@ -486,7 +486,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(NoThrowString().Format(L"Duplicate the first pane"));
         result = RunOnUIThread([&page]() {
-            page->_SplitPane(SplitState::Automatic, SplitType::Duplicate, nullptr);
+            page->_SplitPane(SplitState::Automatic, SplitType::Duplicate, 0.5f, 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, nullptr);
+            page->_SplitPane(SplitState::Automatic, SplitType::Duplicate, 0.5f, nullptr);
 
             VERIFY_ARE_EQUAL(1u, page->_tabs.Size());
             auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));

src/cascadia/Remoting/CommandlineArgs.cpp

@@ -0,0 +1,25 @@
+#include "pch.h"
+
+#include "CommandlineArgs.h"
+#include "CommandlineArgs.g.cpp"
+using namespace winrt;
+using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Windows::Foundation;
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    // LOAD BEARING CODE
+    // If you try to move this into the header, you will experience P A I N
+    // It must be defined after CommandlineArgs.g.cpp, otherwise the compiler
+    // will give you just the most impossible template errors to try and
+    // decipher.
+    void CommandlineArgs::Args(winrt::array_view<const winrt::hstring> const& value)
+    {
+        _args = { value.begin(), value.end() };
+    }
+
+    winrt::com_array<winrt::hstring> CommandlineArgs::Args()
+    {
+        return winrt::com_array<winrt::hstring>{ _args.begin(), _args.end() };
+    }
+}

src/cascadia/Remoting/CommandlineArgs.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include "CommandlineArgs.g.h"
+#include "../cascadia/inc/cppwinrt_utils.h"
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    struct CommandlineArgs : public CommandlineArgsT<CommandlineArgs>
+    {
+    public:
+        CommandlineArgs() :
+            _args{},
+            _cwd{ L"" }
+        {
+        }
+
+        CommandlineArgs(const winrt::array_view<const winrt::hstring>& args,
+                        winrt::hstring currentDirectory) :
+            _args{ args.begin(), args.end() },
+            _cwd{ currentDirectory }
+        {
+        }
+
+        winrt::hstring CurrentDirectory() { return _cwd; };
+
+        void Args(winrt::array_view<const winrt::hstring> const& value);
+        winrt::com_array<winrt::hstring> Args();
+
+    private:
+        winrt::com_array<winrt::hstring> _args;
+        winrt::hstring _cwd;
+    };
+
+}
+
+namespace winrt::Microsoft::Terminal::Remoting::factory_implementation
+{
+    BASIC_FACTORY(CommandlineArgs);
+}

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

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{43ce4ce5-0010-4b99-9569-672670d26e26}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectName>Microsoft.Terminal.Remoting.Lib</ProjectName>
+    <RootNamespace>Microsoft.Terminal.Remoting</RootNamespace>
+    <TargetName>Microsoft.Terminal.Remoting.Lib</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" />
+
+  <!-- ========================= Headers ======================== -->
+  <ItemGroup>
+    <ClInclude Include="Monarch.h">
+      <DependentUpon>Monarch.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="pch.h" />
+    <ClInclude Include="MonarchFactory.h" />
+    <ClInclude Include="Peasant.h">
+      <DependentUpon>Peasant.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="WindowManager.h">
+      <DependentUpon>WindowManager.idl</DependentUpon>
+    </ClInclude>
+    <ClInclude Include="CommandlineArgs.h">
+      <DependentUpon>Peasant.idl</DependentUpon>
+    </ClInclude>
+  </ItemGroup>
+  <!-- ========================= Cpp Files ======================== -->
+  <ItemGroup>
+    <ClCompile Include="Monarch.cpp">
+      <DependentUpon>Monarch.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="Peasant.cpp">
+      <DependentUpon>Peasant.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="WindowManager.cpp">
+      <DependentUpon>WindowManager.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="CommandlineArgs.cpp">
+      <DependentUpon>Peasant.idl</DependentUpon>
+    </ClCompile>
+    <ClCompile Include="$(GeneratedFilesDir)module.g.cpp" />
+  </ItemGroup>
+  <!-- ========================= idl Files ======================== -->
+  <ItemGroup>
+    <Midl Include="Monarch.idl" />
+    <Midl Include="Peasant.idl" />
+    <Midl Include="WindowManager.idl" />
+  </ItemGroup>
+  <!-- ========================= Misc Files ======================== -->
+  <ItemGroup>
+    <PRIResource Include="Resources\en-US\Resources.resw" />
+    <OCResourceDirectory Include="Resources" />
+    <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>
+  <!-- ====================== Compiler & Linker Flags ===================== -->
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>WindowsApp.lib;user32.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Reference>
+      <Private>false</Private>
+    </Reference>
+  </ItemDefinitionGroup>
+  <!-- ========================= Globals ======================== -->
+  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
+
+  <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
+</Project>

src/cascadia/Remoting/Monarch.cpp

@@ -0,0 +1,137 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "Monarch.h"
+#include "CommandlineArgs.h"
+
+#include "Monarch.g.cpp"
+#include "../../types/inc/utils.hpp"
+
+using namespace winrt;
+using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Windows::Foundation;
+using namespace ::Microsoft::Console;
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    Monarch::Monarch() :
+        _ourPID{ GetCurrentProcessId() }
+    {
+    }
+
+    // This is a private constructor to be used in unit tests, where we don't
+    // want each Monarch to necessarily use the current PID.
+    Monarch::Monarch(const uint64_t testPID) :
+        _ourPID{ testPID }
+    {
+    }
+
+    Monarch::~Monarch()
+    {
+    }
+
+    uint64_t Monarch::GetPID()
+    {
+        return _ourPID;
+    }
+
+    // Method Description:
+    // - Add the given peasant to the list of peasants we're tracking. This Peasant may have already been assigned an ID. If it hasn't, then give it an ID.
+    // Arguments:
+    // - peasant: the new Peasant to track.
+    // Return Value:
+    // - the ID assigned to the peasant.
+    uint64_t Monarch::AddPeasant(Remoting::IPeasant peasant)
+    {
+        // 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();
+
+        if (providedID == 0)
+        {
+            // Peasant doesn't currently have an ID. Assign it a new one.
+            peasant.AssignID(_nextPeasantID++);
+        }
+        else
+        {
+            // Peasant already had an ID (from an older monarch). Leave that one
+            // be. Make sure that the next peasant's ID is higher than it.
+            _nextPeasantID = providedID >= _nextPeasantID ? providedID + 1 : _nextPeasantID;
+        }
+
+        auto newPeasantsId = peasant.GetID();
+        _peasants[newPeasantsId] = peasant;
+
+        // 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;
+    }
+
+    // Method Description:
+    // - Event handler for the Peasant::WindowActivated event. Used as an
+    //   opportunity for us to update our internal stack of the "most recent
+    //   window".
+    // Arguments:
+    // - sender: the Peasant that raised this event. This might be out-of-proc!
+    // Return Value:
+    // - <none>
+    void Monarch::_peasantWindowActivated(const winrt::Windows::Foundation::IInspectable& sender,
+                                          const winrt::Windows::Foundation::IInspectable& /*args*/)
+    {
+        // TODO:projects/5 Pass the desktop and timestamp of when the window was
+        // activated in `args`.
+
+        if (auto peasant{ sender.try_as<Remoting::Peasant>() })
+        {
+            auto theirID = peasant.GetID();
+            _setMostRecentPeasant(theirID);
+        }
+    }
+
+    // Method Description:
+    // - Lookup a peasant by its ID.
+    // Arguments:
+    // - peasantID: The ID Of the peasant to find
+    // Return Value:
+    // - 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;
+    }
+
+    void Monarch::_setMostRecentPeasant(const uint64_t peasantID)
+    {
+        // TODO:projects/5 Use a heap/priority queue per-desktop to track which
+        // peasant was the most recent per-desktop. When we want to get the most
+        // recent of all desktops (WindowingBehavior::UseExisting), then use the
+        // most recent of all desktops.
+        _mostRecentPeasant = peasantID;
+    }
+
+    // Method Description:
+    // - Try to handle a commandline from a new WT invocation. We might need to
+    //   hand the commandline to an existing window, or we might need to tell
+    //   the caller that they need to become a new window to handle it themselves.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    bool Monarch::ProposeCommandline(const Remoting::CommandlineArgs& /*args*/)
+    {
+        // TODO:projects/5
+        // The branch dev/migrie/f/remote-commandlines has a more complete
+        // version of this function, with a naive implementation. For now, we
+        // 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.
+        return true;
+    }
+
+}

src/cascadia/Remoting/Monarch.h

@@ -0,0 +1,80 @@
+// 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)
+    0x06171993,
+#elif defined(WT_BRANDING_PREVIEW)
+    0x04221993,
+#else
+    0x08302020,
+#endif
+        0x7eb1,
+        0x4f3e,
+    {
+        0x85, 0xf5, 0x8b, 0xdd, 0x73, 0x86, 0xcc, 0xe3
+    }
+};
+
+enum class WindowingBehavior : uint64_t
+{
+    UseNew = 0,
+    UseExisting = 1,
+};
+
+namespace RemotingUnitTests
+{
+    class RemotingTests;
+};
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    struct Monarch : public MonarchT<Monarch>
+    {
+        Monarch();
+        ~Monarch();
+
+        uint64_t GetPID();
+
+        uint64_t AddPeasant(winrt::Microsoft::Terminal::Remoting::IPeasant peasant);
+
+        bool ProposeCommandline(const winrt::Microsoft::Terminal::Remoting::CommandlineArgs& args);
+
+    private:
+        Monarch(const uint64_t testPID);
+        uint64_t _ourPID;
+
+        uint64_t _nextPeasantID{ 1 };
+        uint64_t _thisPeasantID{ 0 };
+        uint64_t _mostRecentPeasant{ 0 };
+        WindowingBehavior _windowingBehavior{ WindowingBehavior::UseNew };
+        std::unordered_map<uint64_t, winrt::Microsoft::Terminal::Remoting::IPeasant> _peasants;
+
+        winrt::Microsoft::Terminal::Remoting::IPeasant _getPeasant(uint64_t peasantID);
+        void _setMostRecentPeasant(const uint64_t peasantID);
+
+        void _peasantWindowActivated(const winrt::Windows::Foundation::IInspectable& sender,
+                                     const winrt::Windows::Foundation::IInspectable& args);
+
+        friend class RemotingUnitTests::RemotingTests;
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Remoting::factory_implementation
+{
+    BASIC_FACTORY(Monarch);
+}

src/cascadia/Remoting/Monarch.idl

@@ -0,0 +1,15 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+import "Peasant.idl";
+
+namespace Microsoft.Terminal.Remoting
+{
+    [default_interface] runtimeclass Monarch {
+        Monarch();
+
+        UInt64 GetPID();
+        UInt64 AddPeasant(IPeasant peasant);
+        Boolean ProposeCommandline(CommandlineArgs args);
+    };
+}

src/cascadia/Remoting/MonarchFactory.h

@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+
+#include "Monarch.h"
+
+// This seems like a hack, but it works.
+//
+// This class factory works so that there's only ever one instance of a Monarch
+// 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.
+
+struct MonarchFactory : winrt::implements<MonarchFactory, ::IClassFactory>
+{
+    MonarchFactory() = default;
+
+    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)
+        {
+            // Create a new Monarch instance
+            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!
+            return strong.as(iid, result);
+        }
+    }
+
+    HRESULT __stdcall LockServer(BOOL) noexcept
+    {
+        return S_OK;
+    }
+};

src/cascadia/Remoting/Peasant.cpp

@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "Peasant.h"
+#include "CommandlineArgs.h"
+#include "Peasant.g.cpp"
+#include "../../types/inc/utils.hpp"
+
+using namespace winrt;
+using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Windows::Foundation;
+using namespace ::Microsoft::Console;
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    Peasant::Peasant() :
+        _ourPID{ GetCurrentProcessId() }
+    {
+    }
+
+    // This is a private constructor to be used in unit tests, where we don't
+    // want each Peasant to necessarily use the current PID.
+    Peasant::Peasant(const uint64_t testPID) :
+        _ourPID{ testPID }
+    {
+    }
+
+    void Peasant::AssignID(uint64_t id)
+    {
+        _id = id;
+    }
+    uint64_t Peasant::GetID()
+    {
+        return _id;
+    }
+
+    uint64_t Peasant::GetPID()
+    {
+        return _ourPID;
+    }
+
+    bool Peasant::ExecuteCommandline(const Remoting::CommandlineArgs& args)
+    {
+        // If this is the first set of args we were ever told about, stash them
+        // away. We'll need to get at them later, when we setup the startup
+        // actions for the window.
+        if (_initialArgs == nullptr)
+        {
+            _initialArgs = args;
+        }
+
+        // Raise an event with these args. The AppHost will listen for this
+        // event to know when to take these args and dispatch them to a
+        // currently-running window.
+        _ExecuteCommandlineRequestedHandlers(*this, args);
+
+        return true;
+    }
+
+    Remoting::CommandlineArgs Peasant::InitialArgs()
+    {
+        return _initialArgs;
+    }
+
+}

src/cascadia/Remoting/Peasant.h

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "Peasant.g.h"
+#include "../cascadia/inc/cppwinrt_utils.h"
+
+namespace RemotingUnitTests
+{
+    class RemotingTests;
+};
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    struct Peasant : public PeasantT<Peasant>
+    {
+        Peasant();
+
+        void AssignID(uint64_t id);
+        uint64_t GetID();
+        uint64_t GetPID();
+
+        bool ExecuteCommandline(const winrt::Microsoft::Terminal::Remoting::CommandlineArgs& args);
+
+        winrt::Microsoft::Terminal::Remoting::CommandlineArgs InitialArgs();
+        TYPED_EVENT(WindowActivated, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+        TYPED_EVENT(ExecuteCommandlineRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::CommandlineArgs);
+
+    private:
+        Peasant(const uint64_t testPID);
+        uint64_t _ourPID;
+
+        uint64_t _id{ 0 };
+
+        winrt::Microsoft::Terminal::Remoting::CommandlineArgs _initialArgs{ nullptr };
+
+        friend class RemotingUnitTests::RemotingTests;
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Remoting::factory_implementation
+{
+    BASIC_FACTORY(Peasant);
+}

src/cascadia/Remoting/Peasant.idl

@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Remoting
+{
+
+    runtimeclass CommandlineArgs
+    {
+        CommandlineArgs();
+        CommandlineArgs(String[] args, String cwd);
+
+        String[] Args { get; set; };
+        String CurrentDirectory();
+    };
+
+    interface IPeasant
+    {
+        CommandlineArgs InitialArgs { get; };
+
+        void AssignID(UInt64 id);
+        UInt64 GetID();
+        UInt64 GetPID();
+        Boolean ExecuteCommandline(CommandlineArgs args);
+        event Windows.Foundation.TypedEventHandler<Object, Object> WindowActivated;
+        event Windows.Foundation.TypedEventHandler<Object, CommandlineArgs> ExecuteCommandlineRequested;
+    };
+
+    [default_interface] runtimeclass Peasant : IPeasant
+    {
+        Peasant();
+    };
+}

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

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

src/cascadia/Remoting/WindowManager.cpp

@@ -0,0 +1,109 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "WindowManager.h"
+#include "MonarchFactory.h"
+#include "CommandlineArgs.h"
+
+#include "WindowManager.g.cpp"
+#include "../../types/inc/utils.hpp"
+
+using namespace winrt;
+using namespace winrt::Microsoft::Terminal;
+using namespace winrt::Windows::Foundation;
+using namespace ::Microsoft::Console;
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    WindowManager::WindowManager()
+    {
+        // 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();
+    }
+
+    WindowManager::~WindowManager()
+    {
+        // IMPORTANT! Tear down the registration as soon as we exit. If we're not a
+        // real peasant window (the monarch passed our commandline to someone else),
+        // then the monarch dies, we don't want our registration becoming the active
+        // monarch!
+        CoRevokeClassObject(_registrationHostClass);
+        _registrationHostClass = 0;
+    }
+
+    void WindowManager::ProposeCommandline(const Remoting::CommandlineArgs& args)
+    {
+        const bool isKing = _areWeTheKing();
+        // If we're the king, we _definitely_ want to process the arguments, we were
+        // launched with them!
+        //
+        // Otherwise, the King will tell us if we should make a new window
+        _shouldCreateWindow = isKing ||
+                              _monarch.ProposeCommandline(args);
+
+        if (_shouldCreateWindow)
+        {
+            // If we should create a new window, then instantiate our Peasant
+            // instance, and tell that peasant to handle that commandline.
+            _createOurPeasant();
+
+            _peasant.ExecuteCommandline(args);
+        }
+        // Otherwise, we'll do _nothing_.
+    }
+
+    bool WindowManager::ShouldCreateWindow()
+    {
+        return _shouldCreateWindow;
+    }
+
+    void WindowManager::_registerAsMonarch()
+    {
+        winrt::check_hresult(CoRegisterClassObject(Monarch_clsid,
+                                                   winrt::make<::MonarchFactory>().get(),
+                                                   CLSCTX_LOCAL_SERVER,
+                                                   REGCLS_MULTIPLEUSE,
+                                                   &_registrationHostClass));
+    }
+
+    void WindowManager::_createMonarch()
+    {
+        // Heads up! This only works because we're using
+        // "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:
+        //
+        // * If we're running unpackaged: the .winmd must be a sibling of the .exe
+        // * If we're running packaged: the .winmd must be in the package root
+        _monarch = create_instance<Remoting::Monarch>(Monarch_clsid,
+                                                      CLSCTX_LOCAL_SERVER);
+    }
+
+    bool WindowManager::_areWeTheKing()
+    {
+        const auto kingPID{ _monarch.GetPID() };
+        const auto ourPID{ GetCurrentProcessId() };
+        return (ourPID == kingPID);
+    }
+
+    Remoting::IPeasant WindowManager::_createOurPeasant()
+    {
+        auto p = winrt::make_self<Remoting::implementation::Peasant>();
+        _peasant = *p;
+        _monarch.AddPeasant(_peasant);
+
+        // TODO:projects/5 Spawn a thread to wait on the monarch, and handle the election
+
+        return _peasant;
+    }
+
+    Remoting::Peasant WindowManager::CurrentWindow()
+    {
+        return _peasant;
+    }
+
+}

src/cascadia/Remoting/WindowManager.h

@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "WindowManager.g.h"
+#include "Peasant.h"
+#include "Monarch.h"
+#include "../cascadia/inc/cppwinrt_utils.h"
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    struct WindowManager final : public WindowManagerT<WindowManager>
+    {
+        WindowManager();
+        ~WindowManager();
+
+        void ProposeCommandline(const winrt::Microsoft::Terminal::Remoting::CommandlineArgs& args);
+        bool ShouldCreateWindow();
+
+        winrt::Microsoft::Terminal::Remoting::Peasant CurrentWindow();
+
+    private:
+        bool _shouldCreateWindow{ false };
+        DWORD _registrationHostClass{ 0 };
+        winrt::Microsoft::Terminal::Remoting::Monarch _monarch{ nullptr };
+        winrt::Microsoft::Terminal::Remoting::Peasant _peasant{ nullptr };
+
+        void _registerAsMonarch();
+        void _createMonarch();
+        bool _areWeTheKing();
+        winrt::Microsoft::Terminal::Remoting::IPeasant _createOurPeasant();
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Remoting::factory_implementation
+{
+    BASIC_FACTORY(WindowManager);
+}

src/cascadia/Remoting/WindowManager.idl

@@ -0,0 +1,13 @@
+import "Peasant.idl";
+
+
+namespace Microsoft.Terminal.Remoting
+{
+    [default_interface] runtimeclass WindowManager
+    {
+        WindowManager();
+        void ProposeCommandline(CommandlineArgs args);
+        Boolean ShouldCreateWindow { get; };
+        IPeasant CurrentWindow();
+    };
+}

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

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

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

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{27b5aaeb-a548-44cf-9777-f8baa32af7ae}</ProjectGuid>
+    <ProjectName>Microsoft.Terminal.Remoting</ProjectName>
+    <RootNamespace>Microsoft.Terminal.Remoting</RootNamespace>
+    <!-- cppwinrt.build.pre.props depends on these settings: -->
+    <!-- build a dll, not exe (Application) -->
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <SubSystem>Console</SubSystem>
+    <!-- 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" />
+  <!-- ========================= XAML files ======================== -->
+  <ItemGroup>
+    <!-- DON'T PUT XAML FILES HERE! Put them in TerminalAppLib.vcxproj -->
+  </ItemGroup>
+  <!-- ========================= Headers ======================== -->
+  <ItemGroup>
+    <!-- Only put headers for winrt types in here. Don't put other header files
+    in here - put them in the lib's vcxproj instead! -->
+    <ClInclude Include="../Monarch.h" />
+    <ClInclude Include="../Peasant.h" />
+  </ItemGroup>
+  <!-- ========================= Cpp Files ======================== -->
+  <!-- Don't put source files in here - put them in the lib's vcxproj instead! -->
+  <!-- ========================= idl Files ======================== -->
+  <ItemGroup>
+    <!-- DON'T PUT IDL FILES HERE! Put them in the lib's vcxproj -->
+  </ItemGroup>
+  <!-- ========================= Misc Files ======================== -->
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Microsoft.Terminal.Remoting.def" />
+  </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">
+      <Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
+    </ProjectReference>
+    <!-- Reference Microsoft.Terminal.RemotingLib here, so we can use it's winmd as
+    our winmd. This didn't work correctly in VS2017, you'd need to
+    manually reference the lib -->
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\Remoting\Microsoft.Terminal.RemotingLib.vcxproj">
+      <Private>true</Private>
+      <CopyLocalSatelliteAssemblies>true</CopyLocalSatelliteAssemblies>
+    </ProjectReference>
+  </ItemGroup>
+
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(OpenConsoleDir)\dep\jsoncpp\json;%(AdditionalIncludeDirectories);</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>User32.lib;WindowsApp.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <!-- Our 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>
+    <Reference>
+      <!-- Do not propagate microsoft.ui.xaml upwards as a private dependency. -->
+      <Private>false</Private>
+    </Reference>
+  </ItemDefinitionGroup>
+  <Import Project="$(OpenConsoleDir)src\cppwinrt.build.post.props" />
+</Project>

src/cascadia/Remoting/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.Windows.CppWinRT" version="2.0.201017.1" targetFramework="native" />
+</packages>

src/cascadia/Remoting/pch.cpp

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

src/cascadia/Remoting/pch.h

@@ -0,0 +1,48 @@
+// 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.ApplicationModel.h>
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+
+#include <winrt/Windows.System.h>
+
+// Including TraceLogging essentials for the binary
+#include <TraceLoggingProvider.h>
+#include <winmeta.h>
+TRACELOGGING_DECLARE_PROVIDER(g_hSettingsModelProvider);
+#include <telemetry/ProjectTelemetry.h>
+#include <TraceLoggingActivity.h>
+
+#include <shellapi.h>
+
+// Manually include til after we include Windows.Foundation to give it winrt superpowers
+#include "til.h"

src/cascadia/ShellExtension/OpenTerminalHere.cpp

@@ -3,6 +3,7 @@
 
 #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" };
@@ -117,14 +118,29 @@ 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;
-    RETURN_IF_FAILED(psi->GetDisplayName(SIGDN_FILESYSPATH, &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));
+    }
 
     {
         wil::unique_process_information _piClient;
@@ -214,3 +230,90 @@ 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;
+    }
+
+    auto shell = create_instance<IShellWindows>(CLSID_ShellWindows);
+    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())))
+        {
+            continue;
+        }
+
+        HWND tmpHWND = NULL;
+        hr = tmp->get_HWND(reinterpret_cast<SHANDLE_PTR*>(&tmpHWND));
+        if (hwnd == tmpHWND)
+        {
+            browser = tmp;
+            break; //found
+        }
+    }
+
+    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,6 +46,9 @@ 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,10 +11,13 @@
     <!-- 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" />
@@ -40,7 +43,6 @@
     <None Include="packages.config" />
     <None Include="WindowsTerminalShellExt.def" />
   </ItemGroup>
-
   <!-- ========================= Project References ======================== -->
   <ItemGroup>
     <!--
@@ -56,7 +58,5 @@
       <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,7 +121,11 @@ namespace winrt::TerminalApp::implementation
         }
         else if (const auto& realArgs = args.ActionArgs().try_as<SplitPaneArgs>())
         {
-            _SplitPane(realArgs.SplitStyle(), realArgs.SplitMode(), realArgs.TerminalArgs());
+            _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());
             args.Handled(true);
         }
     }
@@ -130,23 +133,20 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleTogglePaneZoom(const IInspectable& /*sender*/,
                                              const ActionEventArgs& args)
     {
-        if (auto focusedTab = _GetFocusedTab())
+        if (const auto activeTab{ _GetFocusedTabImpl() })
         {
-            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
+            // Don't do anything if there's only one pane. It's already zoomed.
+            if (activeTab->GetLeafPaneCount() > 1)
             {
-                // 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();
+                // 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();
             }
         }
 
@@ -343,19 +343,16 @@ namespace winrt::TerminalApp::implementation
         args.Handled(false);
         if (const auto& realArgs = args.ActionArgs().try_as<SetColorSchemeArgs>())
         {
-            if (auto focusedTab = _GetFocusedTab())
+            if (const auto activeTab{ _GetFocusedTabImpl() })
             {
-                if (auto activeTab = _GetTerminalTabImpl(focusedTab))
+                if (auto activeControl = activeTab->GetActiveTerminalControl())
                 {
-                    if (auto activeControl = activeTab->GetActiveTerminalControl())
+                    if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
                     {
-                        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);
-                        }
+                        auto controlSettings = activeControl.Settings().as<TerminalSettings>();
+                        controlSettings->ApplyColorScheme(scheme);
+                        activeControl.UpdateSettings(*controlSettings);
+                        args.Handled(true);
                     }
                 }
             }
@@ -372,18 +369,15 @@ namespace winrt::TerminalApp::implementation
             tabColor = realArgs.TabColor();
         }
 
-        if (auto focusedTab = _GetFocusedTab())
+        if (const auto activeTab{ _GetFocusedTabImpl() })
         {
-            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
+            if (tabColor)
             {
-                if (tabColor)
-                {
-                    activeTab->SetRuntimeTabColor(tabColor.Value());
-                }
-                else
-                {
-                    activeTab->ResetRuntimeTabColor();
-                }
+                activeTab->SetRuntimeTabColor(tabColor.Value());
+            }
+            else
+            {
+                activeTab->ResetRuntimeTabColor();
             }
         }
         args.Handled(true);
@@ -392,12 +386,9 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleOpenTabColorPicker(const IInspectable& /*sender*/,
                                                  const ActionEventArgs& args)
     {
-        if (auto focusedTab = _GetFocusedTab())
+        if (const auto activeTab{ _GetFocusedTabImpl() })
         {
-            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
-            {
-                activeTab->ActivateColorPicker();
-            }
+            activeTab->ActivateColorPicker();
         }
         args.Handled(true);
     }
@@ -412,18 +403,15 @@ namespace winrt::TerminalApp::implementation
             title = realArgs.Title();
         }
 
-        if (auto focusedTab = _GetFocusedTab())
+        if (const auto activeTab{ _GetFocusedTabImpl() })
         {
-            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
+            if (title.has_value())
             {
-                if (title.has_value())
-                {
-                    activeTab->SetTabText(title.value());
-                }
-                else
-                {
-                    activeTab->ResetTabText();
-                }
+                activeTab->SetTabText(title.value());
+            }
+            else
+            {
+                activeTab->ResetTabText();
             }
         }
         args.Handled(true);
@@ -432,12 +420,9 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleOpenTabRenamer(const IInspectable& /*sender*/,
                                              const ActionEventArgs& args)
     {
-        if (auto focusedTab = _GetFocusedTab())
+        if (const auto activeTab{ _GetFocusedTabImpl() })
         {
-            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
-            {
-                activeTab->ActivateTabRenamer();
-            }
+            activeTab->ActivateTabRenamer();
         }
         args.Handled(true);
     }
@@ -453,7 +438,7 @@ namespace winrt::TerminalApp::implementation
             if (_startupActions.Size() != 0)
             {
                 actionArgs.Handled(true);
-                _ProcessStartupActions(actions, false);
+                ProcessStartupActions(actions, false);
             }
         }
     }
@@ -535,13 +520,8 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleOpenTabSearch(const IInspectable& /*sender*/,
                                             const ActionEventArgs& args)
     {
-        // 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().SetTabs(_tabs, _mruTabs);
+        CommandPalette().EnableTabSearchMode();
         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 ::Microsoft::Terminal::CommandlineArgs;
 
 namespace winrt
 {
@@ -42,7 +42,9 @@ 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"InvalidColorSchemeInCmd"),
+    USES_RESOURCE(L"InvalidSplitSize"),
+    USES_RESOURCE(L"FailedToParseStartupActions")
 };
 static const std::array<std::wstring_view, static_cast<uint32_t>(SettingsLoadErrors::ERRORS_SIZE)> settingsLoadErrorsLabels {
     USES_RESOURCE(L"NoProfilesText"),
@@ -262,6 +264,14 @@ 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&&) {
@@ -425,8 +435,7 @@ namespace winrt::TerminalApp::implementation
         // Make sure the lines of text wrap
         warningsTextBlock.TextWrapping(TextWrapping::Wrap);
 
-        const auto warnings = _settings.Warnings();
-        for (const auto& warning : warnings)
+        for (const auto& warning : _warnings)
         {
             // Try looking up the warning message key for each warning.
             const auto warningText = _GetWarningText(warning);
@@ -715,7 +724,34 @@ namespace winrt::TerminalApp::implementation
                 return E_INVALIDARG;
             }
 
-            hr = _settings.Warnings().Size() == 0 ? S_OK : S_FALSE;
+            _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;
         }
         catch (const winrt::hresult_error& e)
         {
@@ -1104,6 +1140,9 @@ 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());
         }
@@ -1111,6 +1150,19 @@ namespace winrt::TerminalApp::implementation
         return result;
     }
 
+    int32_t AppLogic::ExecuteCommandline(array_view<const winrt::hstring> args)
+    {
+        ::Microsoft::Terminal::CommandlineArgs::AppCommandlineArgs appArgs;
+        auto result = appArgs.ParseArgs(args);
+        if (result == 0)
+        {
+            auto actions = winrt::single_threaded_vector<ActionAndArgs>(std::move(appArgs.GetStartupActions()));
+            _root->ProcessStartupActions(actions, false);
+        }
+
+        return result; // TODO:MG does a return value make sense
+    }
+
     // Method Description:
     // - If there were any errors parsing the commandline that was used to
     //   initialize the terminal, this will return a string containing that

src/cascadia/TerminalApp/AppLogic.h

@@ -29,6 +29,7 @@ namespace winrt::TerminalApp::implementation
         [[nodiscard]] Microsoft::Terminal::Settings::Model::CascadiaSettings GetSettings() const noexcept;
 
         int32_t SetStartupCommandline(array_view<const winrt::hstring> actions);
+        int32_t ExecuteCommandline(array_view<const winrt::hstring> actions);
         winrt::hstring ParseCommandlineMessage();
         bool ShouldExitEarly();
 
@@ -84,7 +85,8 @@ namespace winrt::TerminalApp::implementation
 
         std::atomic<bool> _settingsReloadQueued{ false };
 
-        ::TerminalApp::AppCommandlineArgs _appArgs;
+        ::Microsoft::Terminal::CommandlineArgs::AppCommandlineArgs _appArgs;
+        ::Microsoft::Terminal::CommandlineArgs::AppCommandlineArgs _settingsAppArgs;
         int _ParseArgs(winrt::array_view<const hstring>& args);
 
         void _ShowLoadErrorsDialog(const winrt::hstring& titleKey, const winrt::hstring& contentKey, HRESULT settingsLoadedResult);
@@ -106,6 +108,10 @@ 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/AppLogic.idl

@@ -29,6 +29,7 @@ namespace TerminalApp
         Boolean IsElevated();
 
         Int32 SetStartupCommandline(String[] commands);
+        Int32 ExecuteCommandline(String[] commands);
         String ParseCommandlineMessage { get; };
         Boolean ShouldExitEarly { get; };
 

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -31,6 +31,7 @@ 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);
@@ -51,6 +52,12 @@ namespace winrt::TerminalApp::implementation
         RegisterPropertyChangedCallback(UIElement::VisibilityProperty(), [this](auto&&, auto&&) {
             if (Visibility() == Visibility::Visible)
             {
+                if (_filteredActionsView().Items().Size() == 0 && _filteredActions.Size() > 0)
+                {
+                    // Force immediate binding update so we can select an item
+                    Bindings->Update();
+                }
+
                 if (_currentMode == CommandPaletteMode::TabSwitchMode)
                 {
                     _searchBox().Visibility(Visibility::Collapsed);
@@ -66,7 +73,6 @@ namespace winrt::TerminalApp::implementation
                 {
                     _filteredActionsView().SelectedIndex(0);
                     _searchBox().Focus(FocusState::Programmatic);
-                    _updateFilteredActions();
                 }
 
                 TraceLoggingWrite(
@@ -112,7 +118,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void CommandPalette::SelectNextItem(const bool moveDown)
     {
-        const auto selected = _filteredActionsView().SelectedIndex();
+        auto selected = _filteredActionsView().SelectedIndex();
         const int numItems = ::base::saturated_cast<int>(_filteredActionsView().Items().Size());
 
         // Do not try to select an item if
@@ -245,18 +251,26 @@ 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 && key == VirtualKey::Tab)
+        if (_currentMode == CommandPaletteMode::TabSwitchMode && _keymap)
         {
-            auto const state = CoreWindow::GetForCurrentThread().GetKeyState(winrt::Windows::System::VirtualKey::Shift);
-            if (WI_IsFlagSet(state, CoreVirtualKeyStates::Down))
+            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)
             {
-                SelectNextItem(false);
-                e.Handled(true);
-            }
-            else
-            {
-                SelectNextItem(true);
-                e.Handled(true);
+                if (action.Action() == ShortcutAction::PrevTab)
+                {
+                    SelectNextItem(false);
+                    e.Handled(true);
+                }
+                else if (action.Action() == ShortcutAction::NextTab)
+                {
+                    SelectNextItem(true);
+                    e.Handled(true);
+                }
             }
         }
         else if (key == VirtualKey::Home)
@@ -350,30 +364,6 @@ 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:
@@ -577,7 +567,7 @@ namespace winrt::TerminalApp::implementation
         case CommandPaletteMode::TabSearchMode:
             return _tabActions;
         case CommandPaletteMode::TabSwitchMode:
-            return _tabActions;
+            return _tabSwitcherMode == TabSwitcherMode::MostRecentlyUsed ? _mruTabActions : _tabActions;
         case CommandPaletteMode::CommandlineMode:
             return _commandLineHistory;
         default:
@@ -690,7 +680,10 @@ namespace winrt::TerminalApp::implementation
         {
             if (const auto tabPaletteItem{ filteredCommand.Item().try_as<winrt::TerminalApp::TabPaletteItem>() })
             {
-                _SwitchToTabRequestedHandlers(*this, tabPaletteItem.Tab());
+                if (const auto tab{ tabPaletteItem.Tab() })
+                {
+                    _SwitchToTabRequestedHandlers(*this, tab);
+                }
             }
         }
     }
@@ -852,9 +845,9 @@ namespace winrt::TerminalApp::implementation
         return _filteredActions;
     }
 
-    void CommandPalette::SetKeyBindings(Microsoft::Terminal::TerminalControl::IKeyBindings bindings)
+    void CommandPalette::SetKeyMap(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap)
     {
-        _bindings = bindings;
+        _keymap = keymap;
     }
 
     void CommandPalette::SetCommands(Collections::IVector<Command> const& actions)
@@ -867,31 +860,40 @@ namespace winrt::TerminalApp::implementation
             _allCommands.Append(filteredCommand);
         }
 
-        _updateFilteredActions();
+        if (Visibility() == Visibility::Visible && _currentMode == CommandPaletteMode::ActionMode)
+        {
+            _updateFilteredActions();
+        }
     }
 
-    void CommandPalette::SetTabs(Collections::IVector<TabBase> const& tabs, const bool clearList)
+    // 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)
     {
-        _tabActions.Clear();
-        for (const auto& tab : tabs)
+        target.Clear();
+        for (const auto& tab : source)
         {
             auto tabPaletteItem{ winrt::make<winrt::TerminalApp::implementation::TabPaletteItem>(tab) };
             auto filteredCommand{ winrt::make<FilteredCommand>(tabPaletteItem) };
-            _tabActions.Append(filteredCommand);
+            target.Append(filteredCommand);
         }
+    }
 
-        // 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::SetTabs(Collections::IObservableVector<TabBase> const& tabs, Collections::IObservableVector<TabBase> const& mruTabs)
+    {
+        _bindTabs(tabs, _tabActions);
+        _bindTabs(mruTabs, _mruTabActions);
     }
 
     void CommandPalette::EnableCommandPaletteMode(CommandPaletteLaunchMode const launchMode)
@@ -901,26 +903,11 @@ namespace winrt::TerminalApp::implementation
                               CommandPaletteMode::ActionMode;
 
         _switchToMode(mode);
-        _updateFilteredActions();
     }
 
     void CommandPalette::_switchToMode(CommandPaletteMode 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);
-            }
-        }
+        _currentMode = mode;
 
         ParsedCommandLineText(L"");
         _searchBox().Text(L"");
@@ -953,6 +940,13 @@ 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:
@@ -969,27 +963,34 @@ 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 there is active search we skip commands with 0 weight
-            if (searchText.empty() || action.Weight() > 0)
+        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)
             {
-                actions.push_back(action);
+                // 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);
+                }
             }
         }
 
-        // 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)
+        // We want to present the commands sorted
+        if (_currentMode == CommandPaletteMode::ActionMode)
         {
             std::sort(actions.begin(), actions.end(), FilteredCommand::Compare);
         }
+
         return actions;
     }
 
@@ -1064,20 +1065,18 @@ namespace winrt::TerminalApp::implementation
         _currentNestedCommands.Clear();
     }
 
-    void CommandPalette::EnableTabSwitcherMode(const bool searchMode, const uint32_t startIdx)
+    void CommandPalette::EnableTabSwitcherMode(const uint32_t startIdx, TabSwitcherMode tabSwitcherMode)
     {
-        _switcherStartIdx = startIdx;
-
-        if (searchMode)
-        {
-            _switchToMode(CommandPaletteMode::TabSearchMode);
-        }
-        else
-        {
-            _switchToMode(CommandPaletteMode::TabSwitchMode);
-        }
-
-        _updateFilteredActions();
+        // 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);
     }
 
+    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,10 +31,8 @@ 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::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);
+        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);
 
         bool OnDirectKeyEvent(const uint32_t vkey, const uint8_t scanCode, const bool down);
 
@@ -45,9 +43,9 @@ namespace winrt::TerminalApp::implementation
         void ScrollToTop();
         void ScrollToBottom();
 
-        // Tab Switcher
-        void EnableTabSwitcherMode(const bool searchMode, const uint32_t startIdx);
-        void SetTabSwitchOrder(const Microsoft::Terminal::Settings::Model::TabSwitcherMode order);
+        void EnableCommandPaletteMode(Microsoft::Terminal::Settings::Model::CommandPaletteLaunchMode const launchMode);
+        void EnableTabSwitcherMode(const uint32_t startIdx, Microsoft::Terminal::Settings::Model::TabSwitcherMode tabSwitcherMode);
+        void EnableTabSearchMode();
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
@@ -109,11 +107,15 @@ namespace winrt::TerminalApp::implementation
         std::wstring _getTrimmedInput();
         void _evaluatePrefix();
 
-        Microsoft::Terminal::TerminalControl::IKeyBindings _bindings;
+        Microsoft::Terminal::Settings::Model::KeyMapping _keymap{ nullptr };
 
         // 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;
@@ -130,7 +132,7 @@ namespace winrt::TerminalApp::implementation
 
         static constexpr int CommandLineHistoryLength = 10;
         Windows::Foundation::Collections::IVector<winrt::TerminalApp::FilteredCommand> _commandLineHistory{ nullptr };
-        ::TerminalApp::AppCommandlineArgs _appArgs;
+        ::Microsoft::Terminal::CommandlineArgs::AppCommandlineArgs _appArgs;
 
         friend class TerminalAppLocalTests::TabTests;
     };

src/cascadia/TerminalApp/CommandPalette.idl

@@ -22,13 +22,16 @@ 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.IVector<TabBase> tabs, Boolean clearList);
-        void SetKeyBindings(Microsoft.Terminal.TerminalControl.IKeyBindings bindings);
-        void EnableCommandPaletteMode(Microsoft.Terminal.Settings.Model.CommandPaletteLaunchMode launchMode);
+
+        void SetTabs(Windows.Foundation.Collections.IObservableVector<TabBase> tabs, Windows.Foundation.Collections.IObservableVector<TabBase> mruTabs);
+
+        void SetKeyMap(Microsoft.Terminal.Settings.Model.KeyMapping keymap);
 
         void SelectNextItem(Boolean moveDown);
 
-        void EnableTabSwitcherMode(Boolean searchMode, UInt32 startIdx);
+        void EnableCommandPaletteMode(Microsoft.Terminal.Settings.Model.CommandPaletteLaunchMode launchMode);
+        void EnableTabSwitcherMode(UInt32 startIdx, Microsoft.Terminal.Settings.Model.TabSwitcherMode tabSwitcherMode);
+        void EnableTabSearchMode();
 
         event Windows.Foundation.TypedEventHandler<CommandPalette, TabBase> SwitchToTabRequested;
         event Windows.Foundation.TypedEventHandler<CommandPalette, Microsoft.Terminal.Settings.Model.Command> DispatchCommandRequested;

src/cascadia/TerminalApp/MinMaxCloseControl.xaml

@@ -22,9 +22,11 @@ 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"/>
@@ -35,9 +37,11 @@ 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"/>
@@ -46,9 +50,11 @@ 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}"/>
@@ -95,8 +101,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="{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"/>
+                                                    <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"/>
                                                 </Storyboard>
                                             </VisualTransition>
                                         </VisualStateGroup.Transitions>

src/cascadia/TerminalApp/Pane.cpp

@@ -17,11 +17,9 @@ 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 } };
@@ -584,6 +582,19 @@ 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
@@ -1216,32 +1227,6 @@ 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
@@ -1272,12 +1257,15 @@ bool Pane::CanSplit(SplitState splitType)
 // - 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();
@@ -1290,17 +1278,19 @@ std::optional<bool> Pane::PreCalculateCanSplit(const std::shared_ptr<Pane> targe
             else if (splitType == SplitState::Vertical)
             {
                 const auto widthMinusSeparator = availableSpace.Width - CombinedPaneBorderSize;
-                const auto newWidth = widthMinusSeparator * Half;
+                const auto newFirstWidth = widthMinusSeparator * firstPrecent;
+                const auto newSecondWidth = widthMinusSeparator * secondPercent;
 
-                return { newWidth > minSize.Width };
+                return { newFirstWidth > minSize.Width && newSecondWidth > minSize.Width };
             }
 
             else if (splitType == SplitState::Horizontal)
             {
                 const auto heightMinusSeparator = availableSpace.Height - CombinedPaneBorderSize;
-                const auto newHeight = heightMinusSeparator * Half;
+                const auto newFirstHeight = heightMinusSeparator * firstPrecent;
+                const auto newSecondHeight = heightMinusSeparator * secondPercent;
 
-                return { newHeight > minSize.Height };
+                return { newFirstHeight > minSize.Height && newSecondHeight > minSize.Height };
             }
         }
         else
@@ -1329,8 +1319,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, { firstWidth, firstHeight });
-        return firstResult.has_value() ? firstResult : _secondChild->PreCalculateCanSplit(target, splitType, { secondWidth, secondHeight });
+        const auto firstResult = _firstChild->PreCalculateCanSplit(target, splitType, splitSize, { firstWidth, firstHeight });
+        return firstResult.has_value() ? firstResult : _secondChild->PreCalculateCanSplit(target, splitType, splitSize, { secondWidth, secondHeight });
     }
 
     // We should not possibly be getting here - both the above branches should
@@ -1348,23 +1338,26 @@ 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 GUID& profile, const TermControl& control)
+std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::Split(SplitState splitType,
+                                                                    const float splitSize,
+                                                                    const GUID& profile,
+                                                                    const TermControl& control)
 {
     if (!_IsLeaf())
     {
         if (_firstChild->_HasFocusedChild())
         {
-            return _firstChild->Split(splitType, profile, control);
+            return _firstChild->Split(splitType, splitSize, profile, control);
         }
         else if (_secondChild->_HasFocusedChild())
         {
-            return _secondChild->Split(splitType, profile, control);
+            return _secondChild->Split(splitType, splitSize, profile, control);
         }
 
         return { nullptr, nullptr };
     }
 
-    return _Split(splitType, profile, control);
+    return _Split(splitType, splitSize, profile, control);
 }
 
 // Method Description:
@@ -1392,45 +1385,6 @@ 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.
@@ -1440,7 +1394,10 @@ bool Pane::_CanSplit(SplitState splitType)
 // - 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 GUID& profile, const TermControl& control)
+std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitState splitType,
+                                                                     const float splitSize,
+                                                                     const GUID& profile,
+                                                                     const TermControl& control)
 {
     if (splitType == SplitState::None)
     {
@@ -1465,7 +1422,7 @@ std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitState
     _gotFocusRevoker.revoke();
 
     _splitState = actualSplitType;
-    _desiredSplitPosition = Half;
+    _desiredSplitPosition = 1.0f - splitSize;
 
     // Remove any children we currently have. We can't add the existing
     // TermControl to a new grid until we do this.

src/cascadia/TerminalApp/Pane.h

@@ -58,14 +58,16 @@ public:
     bool ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
     bool NavigateFocus(const winrt::Microsoft::Terminal::Settings::Model::FocusDirection& direction);
 
-    bool CanSplit(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType);
     std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Split(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
+                                                                  const float splitSize,
                                                                   const GUID& profile,
                                                                   const winrt::Microsoft::Terminal::TerminalControl::TermControl& control);
     float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
-    std::optional<winrt::Microsoft::Terminal::Settings::Model::SplitState> PreCalculateAutoSplit(const std::shared_ptr<Pane> target, const winrt::Windows::Foundation::Size parentSize) const;
+    std::optional<winrt::Microsoft::Terminal::Settings::Model::SplitState> PreCalculateAutoSplit(const std::shared_ptr<Pane> target,
+                                                                                                 const winrt::Windows::Foundation::Size parentSize) const;
     std::optional<bool> PreCalculateCanSplit(const std::shared_ptr<Pane> target,
                                              winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
+                                             const float splitSize,
                                              const winrt::Windows::Foundation::Size availableSpace) const;
     void Shutdown();
     void Close();
@@ -120,8 +122,8 @@ private:
     bool _HasFocusedChild() const noexcept;
     void _SetupChildCloseHandlers();
 
-    bool _CanSplit(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType);
     std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> _Split(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
+                                                                   const float splitSize,
                                                                    const GUID& profile,
                                                                    const winrt::Microsoft::Terminal::TerminalControl::TermControl& control);
 

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

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -249,70 +249,13 @@
     <value>Found a command with an invalid "colorScheme". This command will be ignored. Make sure that when setting a "colorScheme", the value matches the "name" of a color scheme in the "schemes" list.</value>
     <comment>{Locked="\"colorScheme\"","\"name\"","\"schemes\""}</comment>
   </data>
-  <data name="CmdCommandArgDesc" xml:space="preserve">
-    <value>An optional command, with arguments, to be spawned in the new tab or pane</value>
+  <data name="InvalidSplitSize" xml:space="preserve">
+    <value>Found a "splitPane" command with an invalid "size". This command will be ignored. Make sure the size is between 0 and 1, exclusive.</value>
+    <comment>{Locked="\"splitPane\"","\"size\""}</comment>
   </data>
-  <data name="CmdFocusTabDesc" xml:space="preserve">
-    <value>Move focus to another tab</value>
-  </data>
-  <data name="CmdFocusTabNextArgDesc" xml:space="preserve">
-    <value>Move focus to the next tab</value>
-  </data>
-  <data name="CmdFTDesc" xml:space="preserve">
-    <value>An alias for the "focus-tab" subcommand.</value>
-    <comment>{Locked="\"focus-tab\""}</comment>
-  </data>
-  <data name="CmdFocusTabPrevArgDesc" xml:space="preserve">
-    <value>Move focus to the previous tab</value>
-  </data>
-  <data name="CmdFocusTabTargetArgDesc" xml:space="preserve">
-    <value>Move focus the tab at the given index</value>
-  </data>
-  <data name="CmdNewTabDesc" xml:space="preserve">
-    <value>Create a new tab</value>
-  </data>
-  <data name="CmdNTDesc" xml:space="preserve">
-    <value>An alias for the "new-tab" subcommand.</value>
-    <comment>{Locked="\"new-tab\""}</comment>
-  </data>
-  <data name="CmdProfileArgDesc" xml:space="preserve">
-    <value>Open with the given profile. Accepts either the name or GUID of a profile</value>
-  </data>
-  <data name="CmdSplitPaneDesc" xml:space="preserve">
-    <value>Create a new split pane</value>
-  </data>
-  <data name="CmdSPDesc" xml:space="preserve">
-    <value>An alias for the "split-pane" subcommand.</value>
-    <comment>{Locked="\"split-pane\""}</comment>
-  </data>
-  <data name="CmdSplitPaneHorizontalArgDesc" xml:space="preserve">
-    <value>Create the new pane as a horizontal split (think [-])</value>
-  </data>
-  <data name="CmdSplitPaneVerticalArgDesc" xml:space="preserve">
-    <value>Create the new pane as a vertical split (think [|])</value>
-  </data>
-  <data name="CmdStartingDirArgDesc" xml:space="preserve">
-    <value>Open in the given directory instead of the profile's set "startingDirectory"</value>
-    <comment>{Locked="\"startingDirectory\""}</comment>
-  </data>
-  <data name="CmdTitleArgDesc" xml:space="preserve">
-    <value>Open the terminal with the provided title instead of the profile's set "title"</value>
-    <comment>{Locked="\"title\""}</comment>
-  </data>
-  <data name="CmdTabColorArgDesc" xml:space="preserve">
-    <value>Open the tab with the specified color, in #rrggbb format</value>
-  </data>
-  <data name="CmdVersionDesc" xml:space="preserve">
-    <value>Display the application version</value>
-  </data>
-  <data name="CmdMaximizedDesc" xml:space="preserve">
-    <value>Launch the window maximized</value>
-  </data>
-  <data name="CmdFullscreenDesc" xml:space="preserve">
-    <value>Launch the window in fullscreen mode</value>
-  </data>
-  <data name="CmdFocusDesc" xml:space="preserve">
-    <value>Launch the window in focus mode</value>
+  <data name="FailedToParseStartupActions" xml:space="preserve">
+    <value>Failed to parse "startupActions".</value>
+    <comment>{Locked="\"startupActions\""}</comment>
   </data>
   <data name="NewTabSplitButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.HelpText" xml:space="preserve">
     <value>Press the button to open a new terminal tab with your default profile. Open the flyout to select which profile you want to open.</value>
@@ -398,7 +341,7 @@
   <data name="MultiLinePasteDialog.CloseButtonText" xml:space="preserve">
     <value>Cancel</value>
   </data>
-  <data name="MultiLinePasteDialog.Content" xml:space="preserve">
+  <data name="MultiLineWarningText.Text" xml:space="preserve">
     <value>You are about to paste text that contains multiple lines. If you paste this text into your shell, it may result in the unexpected execution of commands. Do you wish to continue?</value>
   </data>
   <data name="MultiLinePasteDialog.PrimaryButtonText" xml:space="preserve">
@@ -520,4 +463,7 @@
   <data name="NoticeWarning" xml:space="preserve">
     <value>Warning</value>
   </data>
+  <data name="ClipboardTextHeader.Text" xml:space="preserve">
+    <value>Clipboard contents (preview):</value>
+  </data>
 </root>

src/cascadia/TerminalApp/TabBase.cpp

@@ -138,10 +138,77 @@ namespace winrt::TerminalApp::implementation
         TabViewIndex(idx);
         TabViewNumTabs(numTabs);
         _EnableCloseMenuItems();
+        _UpdateSwitchToTabKeyChord();
     }
 
     void TabBase::SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch)
     {
         _dispatch = dispatch;
     }
+
+    void TabBase::SetKeyMap(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap)
+    {
+        _keymap = keymap;
+        _UpdateSwitchToTabKeyChord();
+    }
+
+    // Method Description:
+    // - Sets the key chord resulting in switch to the current tab.
+    // Updates tool tip if required
+    // Arguments:
+    // - keyChord - string representation of the key chord that switches to the current tab
+    // Return Value:
+    // - <none>
+    winrt::fire_and_forget TabBase::_UpdateSwitchToTabKeyChord()
+    {
+        SwitchToTabArgs args{ _TabViewIndex };
+        ActionAndArgs switchToTab{ ShortcutAction::SwitchToTab, args };
+        const auto keyChord = _keymap ? _keymap.GetKeyBindingForActionWithArgs(switchToTab) : nullptr;
+        const auto keyChordText = keyChord ? KeyChordSerialization::ToString(keyChord) : L"";
+
+        if (_keyChord == keyChordText)
+        {
+            return;
+        }
+
+        _keyChord = keyChordText;
+
+        auto weakThis{ get_weak() };
+
+        co_await winrt::resume_foreground(TabViewItem().Dispatcher());
+
+        if (auto tab{ weakThis.get() })
+        {
+            _UpdateToolTip();
+        }
+    }
+
+    // Method Description:
+    // - Sets tab tool tip to a concatenation of title and key chord
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void TabBase::_UpdateToolTip()
+    {
+        auto titleRun = WUX::Documents::Run();
+        titleRun.Text(_Title);
+
+        auto textBlock = WUX::Controls::TextBlock{};
+        textBlock.TextAlignment(WUX::TextAlignment::Center);
+        textBlock.Inlines().Append(titleRun);
+
+        if (!_keyChord.empty())
+        {
+            auto keyChordRun = WUX::Documents::Run();
+            keyChordRun.Text(_keyChord);
+            keyChordRun.FontStyle(winrt::Windows::UI::Text::FontStyle::Italic);
+            textBlock.Inlines().Append(WUX::Documents::LineBreak{});
+            textBlock.Inlines().Append(keyChordRun);
+        }
+
+        WUX::Controls::ToolTip toolTip{};
+        toolTip.Content(textBlock);
+        WUX::Controls::ToolTipService::SetToolTip(TabViewItem(), toolTip);
+    }
 }

src/cascadia/TerminalApp/TabBase.h

@@ -23,6 +23,7 @@ namespace winrt::TerminalApp::implementation
         void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
 
         void UpdateTabViewIndex(const uint32_t idx, const uint32_t numTabs);
+        void SetKeyMap(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap);
 
         WINRT_CALLBACK(Closed, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
@@ -43,12 +44,16 @@ namespace winrt::TerminalApp::implementation
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeOtherTabsMenuItem{};
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeTabsAfterMenuItem{};
         winrt::TerminalApp::ShortcutActionDispatch _dispatch;
+        Microsoft::Terminal::Settings::Model::KeyMapping _keymap{ nullptr };
+        winrt::hstring _keyChord{};
 
         virtual void _CreateContextMenu();
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutSubItem _CreateCloseSubMenu();
         void _EnableCloseMenuItems();
         void _CloseTabsAfter();
         void _CloseOtherTabs();
+        winrt::fire_and_forget _UpdateSwitchToTabKeyChord();
+        void _UpdateToolTip();
 
         friend class ::TerminalAppLocalTests::TabTests;
     };

src/cascadia/TerminalApp/TabHeaderControl.h

@@ -23,6 +23,7 @@ namespace winrt::TerminalApp::implementation
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
         OBSERVABLE_GETSET_PROPERTY(winrt::hstring, Title, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(bool, IsPaneZoomed, _PropertyChangedHandlers);
+        OBSERVABLE_GETSET_PROPERTY(double, RenamerMaxWidth, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(bool, IsProgressRingActive, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(bool, IsProgressRingIndeterminate, _PropertyChangedHandlers);
         OBSERVABLE_GETSET_PROPERTY(uint32_t, ProgressValue, _PropertyChangedHandlers);

src/cascadia/TerminalApp/TabHeaderControl.idl

@@ -9,6 +9,7 @@ namespace TerminalApp
     {
         String Title { get; set; };
         Boolean IsPaneZoomed { get; set; };
+        Double RenamerMaxWidth { get; set; };
         Boolean IsProgressRingActive { get; set; };
         Boolean IsProgressRingIndeterminate { get; set; };
         UInt32 ProgressValue { get; set; };

src/cascadia/TerminalApp/TabHeaderControl.xaml

@@ -9,8 +9,25 @@ the MIT License. See LICENSE in the project root for license information. -->
     xmlns:mux="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+    mc:Ignorable="d"
+    MinHeight="16">
 
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <Thickness x:Key="TextControlBorderThemeThicknessFocused">0,0,0,1</Thickness>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <Thickness x:Key="TextControlBorderThemeThicknessFocused">0,0,0,1</Thickness>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+                    <Thickness x:Key="TextControlBorderThemeThicknessFocused">0,0,0,1</Thickness>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    
     <StackPanel x:Name="HeaderStackPanel"
                 Orientation="Horizontal">
         <mux:ProgressRing x:Name="HeaderProgressRing"
@@ -39,8 +56,11 @@ the MIT License. See LICENSE in the project root for license information. -->
                  Visibility="Collapsed"
                  MinHeight="0"
                  Padding="4,0,4,0"
-                 Margin="0,-8,0,-8"
                  MaxLength="1024"
-                 LostFocus="RenameBoxLostFocusHandler"/>
+                 LostFocus="RenameBoxLostFocusHandler"
+                 Height="16"
+                 FontSize="12"
+                 IsSpellCheckEnabled="False"
+                 MaxWidth="{x:Bind RenamerMaxWidth, Mode=OneWay}"/>
     </StackPanel>
 </UserControl>

src/cascadia/TerminalApp/TabPaletteItem.cpp

@@ -19,7 +19,7 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;
 namespace winrt::TerminalApp::implementation
 {
     TabPaletteItem::TabPaletteItem(winrt::TerminalApp::TabBase const& tab) :
-        _Tab(tab)
+        _tab(tab)
     {
         Name(tab.Title());
         Icon(tab.Icon());

src/cascadia/TerminalApp/TabPaletteItem.h

@@ -14,9 +14,13 @@ namespace winrt::TerminalApp::implementation
         TabPaletteItem() = default;
         TabPaletteItem(winrt::TerminalApp::TabBase const& tab);
 
-        GETSET_PROPERTY(winrt::TerminalApp::TabBase, Tab, nullptr);
+        winrt::TerminalApp::TabBase Tab() const noexcept
+        {
+            return _tab.get();
+        }
 
     private:
+        winrt::weak_ref<winrt::TerminalApp::TabBase> _tab;
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _tabChangedRevoker;
     };
 }

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -25,7 +25,8 @@
 
     <ClCompile>
       <!-- For CLI11: It uses dynamic_cast to cast types around, which depends
-      on being compiled with RTTI (/GR). -->
+      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>
@@ -71,8 +72,6 @@
   <ItemGroup>
     <ClInclude Include="ActionPaletteItem.h" />
     <ClInclude Include="App.base.h" />
-    <ClInclude Include="AppCommandlineArgs.h" />
-    <ClInclude Include="Commandline.h" />
     <ClInclude Include="CommandLinePaletteItem.h" />
     <ClInclude Include="Jumplist.h" />
     <ClInclude Include="MinMaxCloseControl.h">
@@ -144,8 +143,6 @@
     <ClCompile Include="ActionPaletteItem.cpp" />
     <ClCompile Include="CommandLinePaletteItem.cpp" />
     <ClCompile Include="init.cpp" />
-    <ClCompile Include="AppCommandlineArgs.cpp" />
-    <ClCompile Include="Commandline.cpp" />
     <ClCompile Include="Jumplist.cpp" />
     <ClCompile Include="MinMaxCloseControl.cpp">
       <DependentUpon>MinMaxCloseControl.xaml</DependentUpon>
@@ -276,7 +273,13 @@
   </ItemGroup>
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
-    <PRIResource Include="Resources\en-US\Resources.resw" />
+    <PRIResource Include="Resources\en-US\Resources.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
+    <!-- Make sure to include the CommandlineArgs resources here, so they show up in our scope -->
+    <PRIResource Include="$(OpenConsoleDir)src\cascadia\CommandlineArgs\Resources\en-US\Resources.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
     <OCResourceDirectory Include="Resources" />
     <None Include="packages.config" />
   </ItemGroup>
@@ -288,6 +291,14 @@
       you also update all the consumers
     -->
     <ProjectReference Include="$(OpenConsoleDir)src\types\lib\types.vcxproj" />
+    <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>
+    </ProjectReference>
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\WinRTUtils\WinRTUtils.vcxproj">
       <Project>{CA5CAD1A-039A-4929-BA2A-8BEB2E4106FE}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "TerminalPage.h"
 #include "Utils.h"
-#include "AppLogic.h"
 #include "../../types/inc/utils.hpp"
 
 #include <LibraryResources.h>
@@ -44,7 +43,7 @@ namespace winrt::TerminalApp::implementation
 {
     TerminalPage::TerminalPage() :
         _tabs{ winrt::single_threaded_observable_vector<TerminalApp::TabBase>() },
-        _mruTabs{ winrt::single_threaded_vector<TerminalApp::TabBase>() },
+        _mruTabs{ winrt::single_threaded_observable_vector<TerminalApp::TabBase>() },
         _startupActions{ winrt::single_threaded_vector<ActionAndArgs>() },
         _hostingHwnd{}
     {
@@ -108,7 +107,7 @@ namespace winrt::TerminalApp::implementation
         if (auto page{ weakThis.get() })
         {
             _UpdateCommandsForPalette();
-            CommandPalette().SetKeyBindings(*_bindings);
+            CommandPalette().SetKeyMap(_settings.KeyMap());
         }
     }
 
@@ -209,6 +208,7 @@ namespace winrt::TerminalApp::implementation
                 {
                     page->_SplitPane(SplitState::Automatic,
                                      SplitType::Manual,
+                                     0.5f,
                                      nullptr);
                 }
                 else
@@ -331,7 +331,7 @@ namespace winrt::TerminalApp::implementation
             }
             else
             {
-                _ProcessStartupActions(_startupActions, true);
+                ProcessStartupActions(_startupActions, true);
             }
         }
     }
@@ -347,8 +347,8 @@ namespace winrt::TerminalApp::implementation
     //   should fire an Initialized event.
     // Return Value:
     // - <none>
-    winrt::fire_and_forget TerminalPage::_ProcessStartupActions(Windows::Foundation::Collections::IVector<ActionAndArgs> actions,
-                                                                const bool initial)
+    winrt::fire_and_forget TerminalPage::ProcessStartupActions(Windows::Foundation::Collections::IVector<ActionAndArgs> actions,
+                                                               const bool initial)
     {
         // If there are no actions left, do nothing.
         if (actions.Size() == 0)
@@ -560,6 +560,7 @@ namespace winrt::TerminalApp::implementation
                     {
                         page->_SplitPane(SplitState::Automatic,
                                          SplitType::Manual,
+                                         0.5f,
                                          newTerminalArgs);
                     }
                     else
@@ -600,7 +601,9 @@ namespace winrt::TerminalApp::implementation
                 settingsItem.Click({ this, &TerminalPage::_SettingsButtonOnClick });
                 newTabFlyout.Items().Append(settingsItem);
 
-                auto settingsKeyChord = keyBindings.GetKeyBindingForAction(ShortcutAction::OpenSettings);
+                Microsoft::Terminal::Settings::Model::OpenSettingsArgs args{ SettingsTarget::SettingsFile };
+                Microsoft::Terminal::Settings::Model::ActionAndArgs settingsAction{ ShortcutAction::OpenSettings, args };
+                const auto settingsKeyChord{ keyBindings.GetKeyBindingForActionWithArgs(settingsAction) };
                 if (settingsKeyChord)
                 {
                     _SetAcceleratorForMenuItem(settingsItem, settingsKeyChord);
@@ -746,6 +749,7 @@ namespace winrt::TerminalApp::implementation
         _mruTabs.Append(*newTabImpl);
 
         newTabImpl->SetDispatch(*_actionDispatch);
+        newTabImpl->SetKeyMap(_settings.KeyMap());
 
         // Give the tab its index in the _tabs vector so it can manage its own SwitchToTab command.
         _UpdateTabIndices();
@@ -809,7 +813,7 @@ namespace winrt::TerminalApp::implementation
             TermControl newControl{ settings, debugConnection };
             _RegisterTerminalEvents(newControl, *newTabImpl);
             // Split (auto) with the debug tap.
-            newTabImpl->SplitPane(SplitState::Automatic, profileGuid, newControl);
+            newTabImpl->SplitPane(SplitState::Automatic, 0.5f, profileGuid, newControl);
         }
 
         // This kicks off TabView::SelectionChanged, in response to which
@@ -927,6 +931,32 @@ namespace winrt::TerminalApp::implementation
         _ShowAboutDialog();
     }
 
+    // Method Description:
+    // Called when the users pressed keyBindings while CommandPalette is open.
+    // Arguments:
+    // - e: the KeyRoutedEventArgs containing info about the keystroke.
+    // Return Value:
+    // - <none>
+    void TerminalPage::_KeyDownHandler(Windows::Foundation::IInspectable const& /*sender*/, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e)
+    {
+        auto key = e.OriginalKey();
+        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 actionAndArgs = _settings.KeyMap().TryLookup(kc);
+        if (actionAndArgs)
+        {
+            if (CommandPalette().Visibility() == Visibility::Visible && actionAndArgs.Action() != ShortcutAction::ToggleCommandPalette)
+            {
+                CommandPalette().Visibility(Visibility::Collapsed);
+            }
+            _actionDispatch->DoAction(actionAndArgs);
+            e.Handled(true);
+        }
+    }
+
     // Method Description:
     // - Configure the AppKeyBindings to use our ShortcutActionDispatch and the updated KeyMapping
     // as the object to handle dispatching ShortcutAction events.
@@ -1065,34 +1095,38 @@ namespace winrt::TerminalApp::implementation
     // - Duplicates the current focused tab
     void TerminalPage::_DuplicateTabViewItem()
     {
-        if (auto index{ _GetFocusedTabIndex() })
+        if (const auto terminalTab{ _GetFocusedTabImpl() })
         {
-            if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*index)))
+            try
             {
-                try
-                {
-                    // TODO: GH#5047 - In the future, we should get the Profile of
-                    // the focused pane, and use that to build a new instance of the
-                    // settings so we can duplicate this tab/pane.
-                    //
-                    // Currently, if the profile doesn't exist anymore in our
-                    // settings, we'll silently do nothing.
-                    //
-                    // In the future, it will be preferable to just duplicate the
-                    // current control's settings, but we can't do that currently,
-                    // because we won't be able to create a new instance of the
-                    // connection without keeping an instance of the original Profile
-                    // object around.
+                // TODO: GH#5047 - In the future, we should get the Profile of
+                // the focused pane, and use that to build a new instance of the
+                // settings so we can duplicate this tab/pane.
+                //
+                // Currently, if the profile doesn't exist anymore in our
+                // settings, we'll silently do nothing.
+                //
+                // In the future, it will be preferable to just duplicate the
+                // current control's settings, but we can't do that currently,
+                // because we won't be able to create a new instance of the
+                // connection without keeping an instance of the original Profile
+                // object around.
 
-                    const auto& profileGuid = terminalTab->GetFocusedProfile();
-                    if (profileGuid.has_value())
+                const auto& profileGuid = terminalTab->GetFocusedProfile();
+                if (profileGuid.has_value())
+                {
+                    const auto settings{ winrt::make<TerminalSettings>(_settings, profileGuid.value(), *_bindings) };
+                    const auto workingDirectory = terminalTab->GetActiveTerminalControl().WorkingDirectory();
+                    const auto validWorkingDirectory = !workingDirectory.empty();
+                    if (validWorkingDirectory)
                     {
-                        const auto settings{ winrt::make<TerminalSettings>(_settings, profileGuid.value(), *_bindings) };
-                        _CreateNewTabFromSettings(profileGuid.value(), settings);
+                        settings.StartingDirectory(workingDirectory);
                     }
+
+                    _CreateNewTabFromSettings(profileGuid.value(), settings);
                 }
-                CATCH_LOG();
             }
+            CATCH_LOG();
         }
     }
 
@@ -1117,6 +1151,13 @@ namespace winrt::TerminalApp::implementation
     // - tabIndex: the index of the tab to be removed
     void TerminalPage::_RemoveTabViewItemByIndex(uint32_t tabIndex)
     {
+        // We use _removing flag to suppress _OnTabSelectionChanged events
+        // that might get triggered while removing
+        _removing = true;
+        auto unsetRemoving = wil::scope_exit([&]() noexcept { _removing = false; });
+
+        const auto focusedTabIndex{ _GetFocusedTabIndex() };
+
         // Removing the tab from the collection should destroy its control and disconnect its connection,
         // but it doesn't always do so. The UI tree may still be holding the control and preventing its destruction.
         auto tab{ _tabs.GetAt(tabIndex) };
@@ -1137,43 +1178,51 @@ namespace winrt::TerminalApp::implementation
         {
             _lastTabClosedHandlers(*this, nullptr);
         }
-        else if (_isFullscreen || _rearranging || _isInFocusMode)
+        else if (focusedTabIndex.has_value() && focusedTabIndex.value() == gsl::narrow_cast<uint32_t>(tabIndex))
         {
-            // GH#5799 - If we're fullscreen, the TabView isn't visible. If it's
-            // not Visible, it's _not_ going to raise a SelectionChanged event,
-            // which is what we usually use to focus another tab. Instead, we'll
-            // have to do it manually here.
-            //
-            // GH#7916 - Similarly, TabView isn't visible in focus mode.
-            // We need to focus another tab manually from the same considerations as above.
-            //
-            // GH#5559 Similarly, we suppress _OnTabItemsChanged events during a
-            // rearrange, so if a tab is closed while we're rearranging tabs, do
-            // this manually.
-            //
-            // We can't use
-            //   auto selectedIndex = _tabView.SelectedIndex();
-            // Because this will always return -1 in this scenario unfortunately.
-            //
-            // So, what we're going to try to do is move the focus to the tab
-            // to the left, within the bounds of how many tabs we have.
-            //
-            // EX: we have 4 tabs: [A, B, C, D]. If we close:
-            // * A (tabIndex=0): We'll want to focus tab B (now in index 0)
-            // * B (tabIndex=1): We'll want to focus tab A (now in index 0)
-            // * C (tabIndex=2): We'll want to focus tab B (now in index 1)
-            // * D (tabIndex=3): We'll want to focus tab C (now in index 2)
-            const auto newSelectedIndex = std::clamp<int32_t>(tabIndex - 1, 0, _tabs.Size());
-            // _UpdatedSelectedTab will do the work of setting up the new tab as
-            // the focused one, and unfocusing all the others.
-            _UpdatedSelectedTab(newSelectedIndex);
+            // Manually select the new tab to get focus, rather than relying on TabView since:
+            // 1. We want to customize this behavior (e.g., use MRU logic)
+            // 2. In fullscreen (GH#5799) and focus (GH#7916) modes the _OnTabItemsChanged is not fired
+            // 3. When rearranging tabs (GH#7916) _OnTabItemsChanged is suppressed
+            const auto tabSwitchMode = _settings.GlobalSettings().TabSwitcherMode();
 
-            // Also, we need to _manually_ set the SelectedItem of the tabView
-            // here. If we don't, then the TabView will technically not have a
-            // selected item at all, which can make things like ClosePane not
-            // work correctly.
-            auto newSelectedTab{ _tabs.GetAt(newSelectedIndex) };
-            _tabView.SelectedItem(newSelectedTab.TabViewItem());
+            if (tabSwitchMode == TabSwitcherMode::MostRecentlyUsed)
+            {
+                const auto newSelectedTab = _mruTabs.GetAt(0);
+
+                uint32_t newSelectedIndex;
+                if (_tabs.IndexOf(newSelectedTab, newSelectedIndex))
+                {
+                    _UpdatedSelectedTab(newSelectedIndex);
+                    _tabView.SelectedItem(newSelectedTab.TabViewItem());
+                }
+            }
+            else
+            {
+                // We can't use
+                //   auto selectedIndex = _tabView.SelectedIndex();
+                // Because this will always return -1 in this scenario unfortunately.
+                //
+                // So, what we're going to try to do is move the focus to the tab
+                // to the left, within the bounds of how many tabs we have.
+                //
+                // EX: we have 4 tabs: [A, B, C, D]. If we close:
+                // * A (tabIndex=0): We'll want to focus tab B (now in index 0)
+                // * B (tabIndex=1): We'll want to focus tab A (now in index 0)
+                // * C (tabIndex=2): We'll want to focus tab B (now in index 1)
+                // * D (tabIndex=3): We'll want to focus tab C (now in index 2)
+                const auto newSelectedIndex = std::clamp<int32_t>(tabIndex - 1, 0, _tabs.Size());
+                // _UpdatedSelectedTab will do the work of setting up the new tab as
+                // the focused one, and unfocusing all the others.
+                _UpdatedSelectedTab(newSelectedIndex);
+
+                // Also, we need to _manually_ set the SelectedItem of the tabView
+                // here. If we don't, then the TabView will technically not have a
+                // selected item at all, which can make things like ClosePane not
+                // work correctly.
+                auto newSelectedTab{ _tabs.GetAt(newSelectedIndex) };
+                _tabView.SelectedItem(newSelectedTab.TabViewItem());
+            }
         }
 
         // GH#5559 - If we were in the middle of a drag/drop, end it by clearing
@@ -1274,57 +1323,27 @@ namespace winrt::TerminalApp::implementation
     // - Sets focus to the tab to the right or left the currently selected tab.
     void TerminalPage::_SelectNextTab(const bool bMoveRight)
     {
-        if (CommandPalette().Visibility() == Visibility::Visible)
-        {
-            // If the tab switcher is currently open, don't change its mode.
-            // Just select the new tab.
-            CommandPalette().SelectNextItem(bMoveRight);
-            return;
-        }
-
+        const auto index{ _GetFocusedTabIndex().value_or(0) };
         const auto tabSwitchMode = _settings.GlobalSettings().TabSwitcherMode();
-        const bool useInOrderTabIndex = tabSwitchMode != TabSwitcherMode::MostRecentlyUsed;
-
-        // First, determine what the index of the newly selected tab should be.
-        // This changes if we're doing an in-order traversal vs a MRU traversal.
-        auto newTabIndex = 0;
-        if (useInOrderTabIndex)
+        if (tabSwitchMode == TabSwitcherMode::Disabled)
         {
-            // Determine what the next in-order tab index is
-            if (auto index{ _GetFocusedTabIndex() })
-            {
-                uint32_t tabCount = _tabs.Size();
-                // Wraparound math. By adding tabCount and then calculating
-                // modulo tabCount, we clamp the values to the range [0,
-                // tabCount) while still supporting moving leftward from 0 to
-                // tabCount - 1.
-                newTabIndex = ((tabCount + *index + (bMoveRight ? 1 : -1)) % tabCount);
-            }
+            uint32_t tabCount = _tabs.Size();
+            // Wraparound math. By adding tabCount and then calculating
+            // modulo tabCount, we clamp the values to the range [0,
+            // tabCount) while still supporting moving leftward from 0 to
+            // tabCount - 1.
+            const auto newTabIndex = ((tabCount + index + (bMoveRight ? 1 : -1)) % tabCount);
+            _SelectTab(newTabIndex);
         }
         else
         {
-            // Determine what the next "most recently used" index is.
-            // In this case, our focused tab index (in the MRU ordering) is
-            // always 0. So, going next should go to index 1, and going prev
-            // should wrap to the end.
-            uint32_t tabCount = _mruTabs.Size();
-            newTabIndex = ((tabCount + (bMoveRight ? 1 : -1)) % tabCount);
-        }
-
-        const bool useTabSwitcher = tabSwitchMode != TabSwitcherMode::Disabled;
-
-        if (useTabSwitcher)
-        {
-            CommandPalette().SetTabs(useInOrderTabIndex ? _tabs : _mruTabs, true);
+            CommandPalette().SetTabs(_tabs, _mruTabs);
 
             // Otherwise, set up the tab switcher in the selected mode, with
             // the given ordering, and make it visible.
-            CommandPalette().EnableTabSwitcherMode(false, newTabIndex);
+            CommandPalette().EnableTabSwitcherMode(index, tabSwitchMode);
             CommandPalette().Visibility(Visibility::Visible);
-        }
-        else if (auto index{ _GetFocusedTabIndex() })
-        {
-            _SelectTab(newTabIndex);
+            CommandPalette().SelectNextItem(bMoveRight);
         }
     }
 
@@ -1373,20 +1392,17 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_UnZoomIfNeeded()
     {
-        if (auto focusedTab = _GetFocusedTab())
+        if (const auto activeTab{ _GetFocusedTabImpl() })
         {
-            if (auto activeTab = _GetTerminalTabImpl(focusedTab))
+            if (activeTab->IsZoomed())
             {
-                if (activeTab->IsZoomed())
-                {
-                    // Remove the content from the tab first, so Pane::UnZoom can
-                    // re-attach the content to the tree w/in the pane
-                    _tabContent.Children().Clear();
-                    // In ExitZoom, we'll change the Tab's Content(), triggering the
-                    // content changed event, which will re-attach the tab's new content
-                    // root to the tree.
-                    activeTab->ExitZoom();
-                }
+                // Remove the content from the tab first, so Pane::UnZoom can
+                // re-attach the content to the tree w/in the pane
+                _tabContent.Children().Clear();
+                // In ExitZoom, we'll change the Tab's Content(), triggering the
+                // content changed event, which will re-attach the tab's new content
+                // root to the tree.
+                activeTab->ExitZoom();
             }
         }
     }
@@ -1401,24 +1417,18 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_MoveFocus(const FocusDirection& direction)
     {
-        if (auto index{ _GetFocusedTabIndex() })
+        if (const auto terminalTab{ _GetFocusedTabImpl() })
         {
-            if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*index)))
-            {
-                _UnZoomIfNeeded();
-                terminalTab->NavigateFocus(direction);
-            }
+            _UnZoomIfNeeded();
+            terminalTab->NavigateFocus(direction);
         }
     }
 
     TermControl TerminalPage::_GetActiveControl()
     {
-        if (auto index{ _GetFocusedTabIndex() })
+        if (const auto terminalTab{ _GetFocusedTabImpl() })
         {
-            if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*index)))
-            {
-                return terminalTab->GetActiveTerminalControl();
-            }
+            return terminalTab->GetActiveTerminalControl();
         }
         return nullptr;
     }
@@ -1443,7 +1453,7 @@ namespace winrt::TerminalApp::implementation
     // Method Description:
     // - returns a com_ptr to the currently focused tab. This might return null,
     //   so make sure to check the result!
-    winrt::TerminalApp::TabBase TerminalPage::_GetFocusedTab()
+    winrt::TerminalApp::TabBase TerminalPage::_GetFocusedTab() const noexcept
     {
         if (auto index{ _GetFocusedTabIndex() })
         {
@@ -1452,6 +1462,18 @@ namespace winrt::TerminalApp::implementation
         return nullptr;
     }
 
+    // Method Description:
+    // - returns a com_ptr to the currently focused tab implementation. This might return null,
+    //   so make sure to check the result!
+    winrt::com_ptr<TerminalTab> TerminalPage::_GetFocusedTabImpl() const noexcept
+    {
+        if (auto tab{ _GetFocusedTab() })
+        {
+            return _GetTerminalTabImpl(tab);
+        }
+        return nullptr;
+    }
+
     // Method Description:
     // - An async method for changing the focused tab on the UI thread. This
     //   method will _only_ set the selected item of the TabView, which will
@@ -1493,13 +1515,10 @@ namespace winrt::TerminalApp::implementation
     //   tab's Closed event.
     void TerminalPage::_CloseFocusedPane()
     {
-        if (auto index{ _GetFocusedTabIndex() })
+        if (const auto terminalTab{ _GetFocusedTabImpl() })
         {
-            if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*index)))
-            {
-                _UnZoomIfNeeded();
-                terminalTab->ClosePane();
-            }
+            _UnZoomIfNeeded();
+            terminalTab->ClosePane();
         }
     }
 
@@ -1542,26 +1561,23 @@ namespace winrt::TerminalApp::implementation
     // - rowsToScroll: a number of lines to move the viewport. If not provided we will use a system default.
     void TerminalPage::_Scroll(ScrollDirection scrollDirection, const Windows::Foundation::IReference<uint32_t>& rowsToScroll)
     {
-        if (auto index{ _GetFocusedTabIndex() })
+        if (const auto terminalTab{ _GetFocusedTabImpl() })
         {
-            if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*index)))
+            uint32_t realRowsToScroll;
+            if (rowsToScroll == nullptr)
             {
-                uint32_t realRowsToScroll;
-                if (rowsToScroll == nullptr)
-                {
-                    // The magic value of WHEEL_PAGESCROLL indicates that we need to scroll the entire page
-                    realRowsToScroll = _systemRowsToScroll == WHEEL_PAGESCROLL ?
-                                           terminalTab->GetActiveTerminalControl().GetViewHeight() :
-                                           _systemRowsToScroll;
-                }
-                else
-                {
-                    // use the custom value specified in the command
-                    realRowsToScroll = rowsToScroll.Value();
-                }
-                auto scrollDelta = _ComputeScrollDelta(scrollDirection, realRowsToScroll);
-                terminalTab->Scroll(scrollDelta);
+                // The magic value of WHEEL_PAGESCROLL indicates that we need to scroll the entire page
+                realRowsToScroll = _systemRowsToScroll == WHEEL_PAGESCROLL ?
+                                       terminalTab->GetActiveTerminalControl().GetViewHeight() :
+                                       _systemRowsToScroll;
             }
+            else
+            {
+                // use the custom value specified in the command
+                realRowsToScroll = rowsToScroll.Value();
+            }
+            auto scrollDelta = _ComputeScrollDelta(scrollDirection, realRowsToScroll);
+            terminalTab->Scroll(scrollDelta);
         }
     }
 
@@ -1578,6 +1594,7 @@ namespace winrt::TerminalApp::implementation
     //   configurations. See CascadiaSettings::BuildSettings for more details.
     void TerminalPage::_SplitPane(const SplitState splitType,
                                   const SplitType splitMode,
+                                  const float splitSize,
                                   const NewTerminalArgs& newTerminalArgs)
     {
         // Do nothing if we're requesting no split.
@@ -1586,17 +1603,9 @@ namespace winrt::TerminalApp::implementation
             return;
         }
 
-        auto indexOpt = _GetFocusedTabIndex();
+        const auto focusedTab{ _GetFocusedTabImpl() };
 
-        // Do nothing if for some reason, there's no tab in focus. We don't want to crash.
-        if (!indexOpt)
-        {
-            return;
-        }
-
-        auto focusedTab = _GetTerminalTabImpl(_tabs.GetAt(*indexOpt));
-
-        // Do nothing if the focused tab isn't a TerminalTab
+        // Do nothing if no TerminalTab is focused
         if (!focusedTab)
         {
             return;
@@ -1615,6 +1624,12 @@ namespace winrt::TerminalApp::implementation
                 {
                     profileFound = true;
                     controlSettings = { winrt::make<TerminalSettings>(_settings, current_guid.value(), *_bindings) };
+                    const auto workingDirectory = focusedTab->GetActiveTerminalControl().WorkingDirectory();
+                    const auto validWorkingDirectory = !workingDirectory.empty();
+                    if (validWorkingDirectory)
+                    {
+                        controlSettings.StartingDirectory(workingDirectory);
+                    }
                     realGuid = current_guid.value();
                 }
                 // TODO: GH#5047 - In the future, we should get the Profile of
@@ -1647,7 +1662,7 @@ namespace winrt::TerminalApp::implementation
                 realSplitType = focusedTab->PreCalculateAutoSplit(availableSpace);
             }
 
-            const auto canSplit = focusedTab->PreCalculateCanSplit(realSplitType, availableSpace);
+            const auto canSplit = focusedTab->PreCalculateCanSplit(realSplitType, splitSize, availableSpace);
             if (!canSplit)
             {
                 return;
@@ -1660,7 +1675,7 @@ namespace winrt::TerminalApp::implementation
 
             _UnZoomIfNeeded();
 
-            focusedTab->SplitPane(realSplitType, realGuid, newControl);
+            focusedTab->SplitPane(realSplitType, splitSize, realGuid, newControl);
         }
         CATCH_LOG();
     }
@@ -1675,13 +1690,10 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_ResizePane(const ResizeDirection& direction)
     {
-        if (auto index{ _GetFocusedTabIndex() })
+        if (const auto terminalTab{ _GetFocusedTabImpl() })
         {
-            if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*index)))
-            {
-                _UnZoomIfNeeded();
-                terminalTab->ResizePane(direction);
-            }
+            _UnZoomIfNeeded();
+            terminalTab->ResizePane(direction);
         }
     }
 
@@ -1692,14 +1704,8 @@ namespace winrt::TerminalApp::implementation
     // - scrollDirection: ScrollUp will move the viewport up, ScrollDown will move the viewport down
     void TerminalPage::_ScrollPage(ScrollDirection scrollDirection)
     {
-        auto indexOpt = _GetFocusedTabIndex();
-        // Do nothing if for some reason, there's no tab in focus. We don't want to crash.
-        if (!indexOpt)
-        {
-            return;
-        }
-
-        if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*indexOpt)))
+        // Do nothing if for some reason, there's no terminal tab in focus. We don't want to crash.
+        if (const auto terminalTab{ _GetFocusedTabImpl() })
         {
             const auto control = _GetActiveControl();
             const auto termHeight = control.GetViewHeight();
@@ -1710,13 +1716,10 @@ namespace winrt::TerminalApp::implementation
 
     void TerminalPage::_ScrollToBufferEdge(ScrollDirection scrollDirection)
     {
-        if (const auto indexOpt = _GetFocusedTabIndex())
+        if (const auto terminalTab{ _GetFocusedTabImpl() })
         {
-            if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*indexOpt)))
-            {
-                auto scrollDelta = _ComputeScrollDelta(scrollDirection, INT_MAX);
-                terminalTab->Scroll(scrollDelta);
-            }
+            auto scrollDelta = _ComputeScrollDelta(scrollDirection, INT_MAX);
+            terminalTab->Scroll(scrollDelta);
         }
     }
 
@@ -1826,12 +1829,9 @@ namespace winrt::TerminalApp::implementation
     {
         if (_settings && _settings.GlobalSettings().SnapToGridOnResize())
         {
-            if (auto index{ _GetFocusedTabIndex() })
+            if (const auto terminalTab{ _GetFocusedTabImpl() })
             {
-                if (auto terminalTab = _GetTerminalTabImpl(_tabs.GetAt(*index)))
-                {
-                    return terminalTab->CalcSnappedDimension(widthOrHeight, dimension);
-                }
+                return terminalTab->CalcSnappedDimension(widthOrHeight, dimension);
             }
         }
         return dimension;
@@ -1927,8 +1927,9 @@ namespace winrt::TerminalApp::implementation
                 }
             }
 
-            const bool hasNewLine = std::find(text.cbegin(), text.cend(), L'\n') != text.cend();
-            const bool warnMultiLine = hasNewLine && _settings.GlobalSettings().WarnAboutMultiLinePaste();
+            const auto isNewLineLambda = [](auto c) { return c == L'\n' || c == L'\r'; };
+            const auto hasNewLine = std::find_if(text.cbegin(), text.cend(), isNewLineLambda) != text.cend();
+            const auto warnMultiLine = hasNewLine && _settings.GlobalSettings().WarnAboutMultiLinePaste();
 
             constexpr const std::size_t minimumSizeForWarning = 1024 * 5; // 5 KiB
             const bool warnLargeText = text.size() > minimumSizeForWarning &&
@@ -1938,6 +1939,13 @@ namespace winrt::TerminalApp::implementation
             {
                 co_await winrt::resume_foreground(Dispatcher());
 
+                // We have to initialize the dialog here to be able to change the text of the text block within it
+                FindName(L"MultiLinePasteDialog").try_as<WUX::Controls::ContentDialog>();
+                ClipboardText().Text(text);
+
+                // The vertical offset on the scrollbar does not reset automatically, so reset it manually
+                ClipboardContentScrollViewer().ScrollToVerticalOffset(0);
+
                 ContentDialogResult warningResult;
                 if (warnMultiLine)
                 {
@@ -1948,6 +1956,9 @@ namespace winrt::TerminalApp::implementation
                     warningResult = co_await _ShowLargePasteWarningDialog();
                 }
 
+                // Clear the clipboard text so it doesn't lie around in memory
+                ClipboardText().Text(L"");
+
                 if (warningResult != ContentDialogResult::Primary)
                 {
                     // user rejected the paste
@@ -2188,7 +2199,7 @@ namespace winrt::TerminalApp::implementation
                 // here, then the user won't be able to navigate the ATS any
                 // longer.
                 //
-                // When the tab swither is eventually dismissed, the focus will
+                // When the tab switcher is eventually dismissed, the focus will
                 // get tossed back to the focused terminal control, so we don't
                 // need to worry about focus getting lost.
                 if (CommandPalette().Visibility() != Visibility::Visible)
@@ -2212,7 +2223,7 @@ namespace winrt::TerminalApp::implementation
     // - eventArgs: the event's constituent arguments
     void TerminalPage::_OnTabSelectionChanged(const IInspectable& sender, const WUX::Controls::SelectionChangedEventArgs& /*eventArgs*/)
     {
-        if (!_rearranging)
+        if (!_rearranging && !_removing)
         {
             auto tabView = sender.as<MUX::Controls::TabView>();
             auto selectedIndex = tabView.SelectedIndex();
@@ -2309,6 +2320,9 @@ namespace winrt::TerminalApp::implementation
             {
                 settingsTab.UpdateSettings(_settings);
             }
+
+            auto tabImpl{ winrt::get_self<TabBase>(tab) };
+            tabImpl->SetKeyMap(_settings.KeyMap());
         }
 
         auto weakThis{ get_weak() };
@@ -2698,7 +2712,7 @@ namespace winrt::TerminalApp::implementation
     // - an empty list if we failed to parse, otherwise a list of actions to execute.
     std::vector<ActionAndArgs> TerminalPage::ConvertExecuteCommandlineToActions(const ExecuteCommandlineArgs& args)
     {
-        ::TerminalApp::AppCommandlineArgs appArgs;
+        ::Microsoft::Terminal::CommandlineArgs::AppCommandlineArgs appArgs;
         if (appArgs.ParseArgs(args) == 0)
         {
             return appArgs.GetStartupActions();
@@ -2795,6 +2809,7 @@ namespace winrt::TerminalApp::implementation
             _mruTabs.Append(*newTabImpl);
 
             newTabImpl->SetDispatch(*_actionDispatch);
+            newTabImpl->SetKeyMap(_settings.KeyMap());
 
             // Give the tab its index in the _tabs vector so it can manage its own SwitchToTab command.
             _UpdateTabIndices();
@@ -2837,7 +2852,7 @@ namespace winrt::TerminalApp::implementation
     // Return Value:
     // - If the tab is a TerminalTab, a com_ptr to the implementation type.
     //   If the tab is not a TerminalTab, nullptr
-    winrt::com_ptr<TerminalTab> TerminalPage::_GetTerminalTabImpl(const TerminalApp::TabBase& tab) const
+    winrt::com_ptr<TerminalTab> TerminalPage::_GetTerminalTabImpl(const TerminalApp::TabBase& tab)
     {
         if (auto terminalTab = tab.try_as<TerminalApp::TerminalTab>())
         {

src/cascadia/TerminalApp/TerminalPage.h

@@ -10,7 +10,7 @@
 
 #include <winrt/Microsoft.Terminal.TerminalControl.h>
 
-#include "AppCommandlineArgs.h"
+#include "../CommandlineArgs/AppCommandlineArgs.h"
 
 static constexpr uint32_t DefaultRowsToScroll{ 3 };
 static constexpr std::wstring_view TabletInputServiceKey{ L"TabletInputService" };
@@ -81,6 +81,8 @@ namespace winrt::TerminalApp::implementation
         void ShowKeyboardServiceWarning();
         winrt::hstring KeyboardServiceDisabledText();
 
+        winrt::fire_and_forget ProcessStartupActions(Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::ActionAndArgs> actions, const bool initial);
+
         // -------------------------------- WinRT Events ---------------------------------
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(TitleChanged, _titleChangeHandlers, winrt::Windows::Foundation::IInspectable, winrt::hstring);
         DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(LastTabClosed, _lastTabClosedHandlers, winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::LastTabClosedEventArgs);
@@ -110,8 +112,8 @@ namespace winrt::TerminalApp::implementation
         Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
 
         Windows::Foundation::Collections::IObservableVector<TerminalApp::TabBase> _tabs;
-        Windows::Foundation::Collections::IVector<TerminalApp::TabBase> _mruTabs;
-        winrt::com_ptr<TerminalTab> _GetTerminalTabImpl(const TerminalApp::TabBase& tab) const;
+        Windows::Foundation::Collections::IObservableVector<TerminalApp::TabBase> _mruTabs;
+        static winrt::com_ptr<TerminalTab> _GetTerminalTabImpl(const TerminalApp::TabBase& tab);
 
         void _UpdateTabIndices();
 
@@ -124,6 +126,7 @@ namespace winrt::TerminalApp::implementation
         bool _rearranging;
         std::optional<int> _rearrangeFrom;
         std::optional<int> _rearrangeTo;
+        bool _removing{ false };
 
         uint32_t _systemRowsToScroll{ DefaultRowsToScroll };
 
@@ -137,7 +140,6 @@ namespace winrt::TerminalApp::implementation
         StartupState _startupState{ StartupState::NotInitialized };
 
         Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::ActionAndArgs> _startupActions;
-        winrt::fire_and_forget _ProcessStartupActions(Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::ActionAndArgs> actions, const bool initial);
 
         void _ShowAboutDialog();
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> _ShowCloseWarningDialog();
@@ -156,6 +158,7 @@ namespace winrt::TerminalApp::implementation
         void _AboutButtonOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
         void _ThirdPartyNoticesOnClick(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
 
+        void _KeyDownHandler(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Input::KeyRoutedEventArgs const& e);
         void _HookupKeyBindings(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap) noexcept;
         void _RegisterActionCallbacks();
 
@@ -181,7 +184,9 @@ namespace winrt::TerminalApp::implementation
 
         winrt::Microsoft::Terminal::TerminalControl::TermControl _GetActiveControl();
         std::optional<uint32_t> _GetFocusedTabIndex() const noexcept;
-        TerminalApp::TabBase _GetFocusedTab();
+        TerminalApp::TabBase _GetFocusedTab() const noexcept;
+        winrt::com_ptr<TerminalTab> _GetFocusedTabImpl() const noexcept;
+
         winrt::fire_and_forget _SetFocusedTabIndex(const uint32_t tabIndex);
         void _CloseFocusedTab();
         void _CloseFocusedPane();
@@ -192,8 +197,13 @@ namespace winrt::TerminalApp::implementation
         // Todo: add more event implementations here
         // MSFT:20641986: Add keybindings for New Window
         void _Scroll(ScrollDirection scrollDirection, const Windows::Foundation::IReference<uint32_t>& rowsToScroll);
-        void _SplitPane(const Microsoft::Terminal::Settings::Model::SplitState splitType, const Microsoft::Terminal::Settings::Model::SplitType splitMode = Microsoft::Terminal::Settings::Model::SplitType::Manual, const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs = nullptr);
+
+        void _SplitPane(const Microsoft::Terminal::Settings::Model::SplitState splitType,
+                        const Microsoft::Terminal::Settings::Model::SplitType splitMode = Microsoft::Terminal::Settings::Model::SplitType::Manual,
+                        const float splitSize = 0.5f,
+                        const Microsoft::Terminal::Settings::Model::NewTerminalArgs& newTerminalArgs = nullptr);
         void _ResizePane(const Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
+
         void _ScrollPage(ScrollDirection scrollDirection);
         void _ScrollToBufferEdge(ScrollDirection scrollDirection);
         void _SetAcceleratorForMenuItem(Windows::UI::Xaml::Controls::MenuFlyoutItem& menuItem, const winrt::Microsoft::Terminal::TerminalControl::KeyChord& keyChord);
@@ -244,12 +254,9 @@ namespace winrt::TerminalApp::implementation
 
         void _OpenSettingsUI();
 
-        void _MakeSwitchToTabCommand(const TerminalApp::TabBase& tab, const uint32_t index);
-
         static int _ComputeScrollDelta(ScrollDirection scrollDirection, const uint32_t rowsToScroll);
         static uint32_t _ReadSystemRowsToScroll();
 
-        void _UpdateTabSwitcherCommands(const bool mru);
         void _UpdateMRUTab(const uint32_t index);
 
         void _TryMoveTab(const uint32_t currentTabIndex, const int32_t suggestedNewTabIndex);

src/cascadia/TerminalApp/TerminalPage.xaml

@@ -58,6 +58,26 @@ the MIT License. See LICENSE in the project root for license information. -->
             x:Name="MultiLinePasteDialog"
             x:Uid="MultiLinePasteDialog"
             DefaultButton="Primary">
+            <StackPanel>
+                <TextBlock
+                    x:Uid="MultiLineWarningText"
+                    TextWrapping="Wrap">
+                </TextBlock>
+                <TextBlock
+                    x:Uid="ClipboardTextHeader"
+                    Margin="0,16,0,0">
+                </TextBlock>
+                <ScrollViewer
+                    Margin="0,8,0,0"
+                    x:Name="ClipboardContentScrollViewer"
+                    MaxHeight="100">
+                    <TextBlock
+                        x:Name="ClipboardText"
+                        TextWrapping="Wrap"
+                        FontFamily="Cascadia Mono">
+                    </TextBlock>
+                </ScrollViewer>
+            </StackPanel>
         </ContentDialog>
 
         <ContentDialog
@@ -95,6 +115,7 @@ the MIT License. See LICENSE in the project root for license information. -->
             x:Name="CommandPalette"
             Grid.Row="1"
             Visibility="Collapsed"
+            PreviewKeyDown ="_KeyDownHandler"
             VerticalAlignment="Stretch" />
 
         <mux:InfoBar x:Name="KeyboardWarningInfoBar"

src/cascadia/TerminalApp/TerminalTab.cpp

@@ -50,6 +50,9 @@ namespace winrt::TerminalApp::implementation
                 tab->SetTabText(title);
             }
         });
+
+        _UpdateHeaderControlMaxWidth();
+
         // Use our header control as the TabViewItem's header
         TabViewItem().Header(_headerControl);
     }
@@ -75,11 +78,24 @@ namespace winrt::TerminalApp::implementation
         _RecalculateAndApplyTabColor();
     }
 
-    void TerminalTab::_SetToolTip(const winrt::hstring& tabTitle)
+    winrt::fire_and_forget TerminalTab::_UpdateHeaderControlMaxWidth()
     {
-        WUX::Controls::ToolTip toolTip{};
-        toolTip.Content(winrt::box_value(tabTitle));
-        WUX::Controls::ToolTipService::SetToolTip(TabViewItem(), toolTip);
+        auto weakThis{ get_weak() };
+
+        co_await winrt::resume_foreground(TabViewItem().Dispatcher());
+
+        if (auto tab{ weakThis.get() })
+        {
+            const auto settings{ winrt::TerminalApp::implementation::AppLogic::CurrentAppSettings() };
+            if (settings.GlobalSettings().TabWidthMode() == winrt::Microsoft::UI::Xaml::Controls::TabViewWidthMode::SizeToContent)
+            {
+                tab->_headerControl.RenamerMaxWidth(HeaderRenameBoxWidthTitleLength);
+            }
+            else
+            {
+                tab->_headerControl.RenamerMaxWidth(HeaderRenameBoxWidthDefault);
+            }
+        }
     }
 
     // Method Description:
@@ -169,6 +185,9 @@ namespace winrt::TerminalApp::implementation
     void TerminalTab::UpdateSettings(const winrt::TerminalApp::TerminalSettings& settings, const GUID& profile)
     {
         _rootPane->UpdateSettings(settings, profile);
+
+        // The tabWidthMode may have changed, update the header control accordingly
+        _UpdateHeaderControlMaxWidth();
     }
 
     // Method Description:
@@ -219,17 +238,19 @@ namespace winrt::TerminalApp::implementation
 
         if (auto tab{ weakThis.get() })
         {
-            if (hide)
+            if (tab->_iconHidden != hide)
             {
-                Icon({});
-                TabViewItem().IconSource(IconPathConverter::IconSourceMUX({}));
-                tab->_iconHidden = true;
-            }
-            else
-            {
-                Icon(_lastIconPath);
-                TabViewItem().IconSource(IconPathConverter::IconSourceMUX(_lastIconPath));
-                tab->_iconHidden = false;
+                if (hide)
+                {
+                    Icon({});
+                    TabViewItem().IconSource(IconPathConverter::IconSourceMUX({}));
+                }
+                else
+                {
+                    Icon(_lastIconPath);
+                    TabViewItem().IconSource(IconPathConverter::IconSourceMUX(_lastIconPath));
+                }
+                tab->_iconHidden = hide;
             }
         }
     }
@@ -271,7 +292,7 @@ namespace winrt::TerminalApp::implementation
 
             // Update the control to reflect the changed title
             _headerControl.Title(activeTitle);
-            _SetToolTip(activeTitle);
+            _UpdateToolTip();
         }
     }
 
@@ -293,17 +314,6 @@ namespace winrt::TerminalApp::implementation
         control.ScrollViewport(currentOffset + delta);
     }
 
-    // Method Description:
-    // - Determines whether the focused pane has sufficient space to be split.
-    // Arguments:
-    // - splitType: The type of split we want to create.
-    // Return Value:
-    // - True if the focused pane can be split. False otherwise.
-    bool TerminalTab::CanSplitPane(SplitState splitType)
-    {
-        return _activePane->CanSplit(splitType);
-    }
-
     // Method Description:
     // - Split the focused pane in our tree of panes, and place the
     //   given TermControl into the newly created pane.
@@ -313,11 +323,14 @@ namespace winrt::TerminalApp::implementation
     // - control: A TermControl to use in the new pane.
     // Return Value:
     // - <none>
-    void TerminalTab::SplitPane(SplitState splitType, const GUID& profile, TermControl& control)
+    void TerminalTab::SplitPane(SplitState splitType,
+                                const float splitSize,
+                                const GUID& profile,
+                                TermControl& control)
     {
         // Make sure to take the ID before calling Split() - Split() will clear out the active pane's ID
         const auto activePaneId = _activePane->Id();
-        auto [first, second] = _activePane->Split(splitType, profile, control);
+        auto [first, second] = _activePane->Split(splitType, splitSize, profile, control);
         first->Id(activePaneId);
         second->Id(_nextPaneId);
         ++_nextPaneId;
@@ -943,9 +956,11 @@ namespace winrt::TerminalApp::implementation
         return _rootPane->PreCalculateAutoSplit(_activePane, availableSpace).value_or(SplitState::Vertical);
     }
 
-    bool TerminalTab::PreCalculateCanSplit(SplitState splitType, winrt::Windows::Foundation::Size availableSpace) const
+    bool TerminalTab::PreCalculateCanSplit(SplitState splitType,
+                                           const float splitSize,
+                                           winrt::Windows::Foundation::Size availableSpace) const
     {
-        return _rootPane->PreCalculateCanSplit(_activePane, splitType, availableSpace).value_or(false);
+        return _rootPane->PreCalculateCanSplit(_activePane, splitType, splitSize, availableSpace).value_or(false);
     }
 
     // Method Description:

src/cascadia/TerminalApp/TerminalTab.h

@@ -7,6 +7,9 @@
 #include "TabBase.h"
 #include "TerminalTab.g.h"
 
+static constexpr double HeaderRenameBoxWidthDefault{ 165 };
+static constexpr double HeaderRenameBoxWidthTitleLength{ std::numeric_limits<double>::infinity() };
+
 // fwdecl unittest classes
 namespace TerminalAppLocalTests
 {
@@ -30,15 +33,19 @@ namespace winrt::TerminalApp::implementation
 
         winrt::fire_and_forget Scroll(const int delta);
 
-        bool CanSplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType);
-        void SplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType, const GUID& profile, winrt::Microsoft::Terminal::TerminalControl::TermControl& control);
+        void SplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
+                       const float splitSize,
+                       const GUID& profile,
+                       winrt::Microsoft::Terminal::TerminalControl::TermControl& control);
 
         winrt::fire_and_forget UpdateIcon(const winrt::hstring iconPath);
         winrt::fire_and_forget HideIcon(const bool hide);
 
         float CalcSnappedDimension(const bool widthOrHeight, const float dimension) const;
         winrt::Microsoft::Terminal::Settings::Model::SplitState PreCalculateAutoSplit(winrt::Windows::Foundation::Size rootSize) const;
-        bool PreCalculateCanSplit(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType, winrt::Windows::Foundation::Size availableSpace) const;
+        bool PreCalculateCanSplit(winrt::Microsoft::Terminal::Settings::Model::SplitState splitType,
+                                  const float splitSize,
+                                  winrt::Windows::Foundation::Size availableSpace) const;
 
         void ResizeContent(const winrt::Windows::Foundation::Size& newSize);
         void ResizePane(const winrt::Microsoft::Terminal::Settings::Model::ResizeDirection& direction);
@@ -98,7 +105,7 @@ namespace winrt::TerminalApp::implementation
 
         void _MakeTabViewItem();
 
-        void _SetToolTip(const winrt::hstring& tabTitle);
+        winrt::fire_and_forget _UpdateHeaderControlMaxWidth();
 
         void _CreateContextMenu() override;
 

src/cascadia/TerminalApp/pch.h

@@ -76,7 +76,5 @@ TRACELOGGING_DECLARE_PROVIDER(g_hTerminalAppProvider);
 
 #include <winrt/Windows.UI.Popups.h>
 
-#include <CLI11/CLI11.hpp>
-
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"

src/cascadia/TerminalConnection/TerminalConnection.vcxproj

@@ -81,6 +81,5 @@
       <AdditionalDependencies>$(OpenConsoleCommonOutDir)\conptylib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-
   <Import Project="$(SolutionDir)build\rules\CollectWildcardResources.targets" />
 </Project>

src/cascadia/TerminalControl/TermControl.cpp

@@ -1288,7 +1288,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
                     _terminal->SetSelectionEnd(terminalPosition, mode);
                     _selectionNeedsToBeCopied = true;
                 }
-                else if (mode == ::Terminal::SelectionExpansionMode::Cell)
+                else if (mode == ::Terminal::SelectionExpansionMode::Cell && !shiftEnabled)
                 {
                     // Single Click: reset the selection and begin a new one
                     _terminal->ClearSelection();
@@ -1344,8 +1344,10 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         const auto ptr = args.Pointer();
         const auto point = args.GetCurrentPoint(*this);
+        const auto cursorPosition = point.Position();
+        const auto terminalPosition = _GetTerminalPosition(cursorPosition);
 
-        if (!_focused)
+        if (!_focused && (_terminal->GetHyperlinkAtPosition(terminalPosition).empty()))
         {
             args.Handled(true);
             return;
@@ -1364,8 +1366,6 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
             {
                 auto lock = _terminal->LockForWriting();
 
-                const auto cursorPosition = point.Position();
-
                 if (_singleClickTouchdownPos)
                 {
                     // Figure out if the user's moved a quarter of a cell's smaller axis away from the clickdown point
@@ -1407,10 +1407,10 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
                     _TryStopAutoScroll(ptr.PointerId());
                 }
             }
-            const auto terminalPos = _GetTerminalPosition(point.Position());
-            if (terminalPos != _lastHoveredCell)
+
+            if (terminalPosition != _lastHoveredCell)
             {
-                const auto uri = _terminal->GetHyperlinkAtPosition(terminalPos);
+                const auto uri = _terminal->GetHyperlinkAtPosition(terminalPosition);
                 if (!uri.empty())
                 {
                     // Update the tooltip with the URI
@@ -1425,7 +1425,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
                     // Compute the location of the top left corner of the cell in DIPS
                     const til::size marginsInDips{ til::math::rounding, GetPadding().Left, GetPadding().Top };
-                    const til::point startPos{ terminalPos.X, terminalPos.Y };
+                    const til::point startPos{ terminalPosition.X, terminalPosition.Y };
                     const til::size fontSize{ _actualFont.GetSize() };
                     const til::point posInPixels{ startPos * fontSize };
                     const til::point posInDIPs{ posInPixels / SwapChainPanel().CompositionScaleX() };
@@ -1435,10 +1435,10 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
                     OverlayCanvas().SetLeft(HyperlinkTooltipBorder(), (locationInDIPs.x() - SwapChainPanel().ActualOffset().x));
                     OverlayCanvas().SetTop(HyperlinkTooltipBorder(), (locationInDIPs.y() - SwapChainPanel().ActualOffset().y));
                 }
-                _lastHoveredCell = terminalPos;
+                _lastHoveredCell = terminalPosition;
 
-                const auto newId = _terminal->GetHyperlinkIdAtPosition(terminalPos);
-                const auto newInterval = _terminal->GetHyperlinkIntervalFromPosition(terminalPos);
+                const auto newId = _terminal->GetHyperlinkIdAtPosition(terminalPosition);
+                const auto newInterval = _terminal->GetHyperlinkIntervalFromPosition(terminalPosition);
                 // If the hyperlink ID changed or the interval changed, trigger a redraw all
                 // (so this will happen both when we move onto a link and when we move off a link)
                 if (newId != _lastHoveredId || (newInterval != _lastHoveredInterval))
@@ -2025,6 +2025,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
     // - Pre-process text pasted (presumably from the clipboard)
     //   before sending it over the terminal's connection, converting
     //   Windows-space \r\n line-endings to \r line-endings
+    // - Also converts \n line-endings to \r line-endings
     void TermControl::_SendPastedTextToConnection(const std::wstring& wstr)
     {
         // Some notes on this implementation:
@@ -2034,20 +2035,52 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         //   performance guarantees aren't exactly stellar)
         // - The STL doesn't have a simple string search/replace method.
         //   This fact is lamentable.
-        // - This line-ending conversion is intentionally fairly
-        //   conservative, to avoid stripping out lone \n characters
-        //   where they could conceivably be intentional.
+        // - We search for \n, and when we find it we copy the string up to
+        //   the \n (but not including it). Then, we check the if the
+        //   previous character is \r, if its not, then we had a lone \n
+        //   and so we append our own \r
 
-        std::wstring stripped{ wstr };
+        std::wstring stripped;
+        stripped.reserve(wstr.length());
 
         std::wstring::size_type pos = 0;
+        std::wstring::size_type begin = 0;
 
-        while ((pos = stripped.find(L"\r\n", pos)) != std::wstring::npos)
+        while ((pos = wstr.find(L"\n", pos)) != std::wstring::npos)
         {
-            stripped.replace(pos, 2, L"\r");
+            // copy up to but not including the \n
+            stripped.append(wstr.cbegin() + begin, wstr.cbegin() + pos);
+            if (!(pos > 0 && (wstr.at(pos - 1) == L'\r')))
+            {
+                // there was no \r before the \n we did not copy,
+                // so append our own \r (this effectively replaces the \n
+                // with a \r)
+                stripped.push_back(L'\r');
+            }
+            ++pos;
+            begin = pos;
         }
 
-        _connection.WriteInput(stripped);
+        // If we entered the while loop even once, begin would be non-zero
+        // (because we set begin = pos right after incrementing pos)
+        // So, if begin is still zero at this point it means we never found a newline
+        // and we can just write the original string
+        if (begin == 0)
+        {
+            _connection.WriteInput(wstr);
+        }
+        else
+        {
+            // copy over the part after the last \n
+            stripped.append(wstr.cbegin() + begin, wstr.cend());
+
+            // we may have removed some characters, so we may not need as much space
+            // as we reserved earlier
+            stripped.shrink_to_fit();
+            _connection.WriteInput(stripped);
+        }
+
+        _terminal->ClearSelection();
         _terminal->TrySnapOnInput();
     }
 
@@ -2428,6 +2461,12 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
         return _settings.ProfileName();
     }
 
+    hstring TermControl::WorkingDirectory() const
+    {
+        hstring hstr{ _terminal->GetWorkingDirectory() };
+        return hstr;
+    }
+
     // Method Description:
     // - Given a copy-able selection, get the selected text from the buffer and send it to the
     //     Windows Clipboard (CascadiaWin32:main.cpp).

src/cascadia/TerminalControl/TermControl.h

@@ -106,6 +106,7 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         hstring Title();
         hstring GetProfileName() const;
+        hstring WorkingDirectory() const;
 
         bool CopySelectionToClipboard(bool singleLine, const Windows::Foundation::IReference<CopyFormat>& formats);
         void PasteTextFromClipboard();

src/cascadia/TerminalControl/TermControl.idl

@@ -110,6 +110,8 @@ namespace Microsoft.Terminal.TerminalControl
         UInt64 TaskbarState { get; };
         UInt64 TaskbarProgress { get; };
 
+        String WorkingDirectory { get; };
+
         Windows.Foundation.IReference<Windows.UI.Color> TabColor { get; };
         event Windows.Foundation.TypedEventHandler<Object, Object> TabColorChanged;
     }

src/cascadia/TerminalCore/ITerminalApi.hpp

@@ -65,6 +65,9 @@ namespace Microsoft::Terminal::Core
 
         virtual bool SetTaskbarProgress(const size_t state, const size_t progress) noexcept = 0;
 
+        virtual bool SetWorkingDirectory(std::wstring_view uri) noexcept = 0;
+        virtual std::wstring_view GetWorkingDirectory() noexcept = 0;
+
     protected:
         ITerminalApi() = default;
     };

src/cascadia/TerminalCore/Terminal.hpp

@@ -117,6 +117,8 @@ public:
     bool EndHyperlink() noexcept override;
 
     bool SetTaskbarProgress(const size_t state, const size_t progress) noexcept override;
+    bool SetWorkingDirectory(std::wstring_view uri) noexcept override;
+    std::wstring_view GetWorkingDirectory() noexcept override;
 #pragma endregion
 
 #pragma region ITerminalInput
@@ -253,6 +255,7 @@ private:
 
     size_t _hyperlinkPatternId;
 
+    std::wstring _workingDirectory;
 #pragma region Text Selection
     // a selection is represented as a range between two COORDs (start and end)
     // the pivot is the COORD that remains selected when you extend a selection in any direction

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -618,3 +618,14 @@ bool Terminal::SetTaskbarProgress(const size_t state, const size_t progress) noe
     }
     return true;
 }
+
+bool Terminal::SetWorkingDirectory(std::wstring_view uri) noexcept
+{
+    _workingDirectory = uri;
+    return true;
+}
+
+std::wstring_view Terminal::GetWorkingDirectory() noexcept
+{
+    return _workingDirectory;
+}

src/cascadia/TerminalCore/TerminalDispatch.cpp

@@ -417,43 +417,55 @@ bool TerminalDispatch::DoConEmuAction(const std::wstring_view string) noexcept
     const auto parts = Utils::SplitString(string, L';');
     unsigned int subParam = 0;
 
-    // For now, the only ConEmu action we support is setting the taskbar state/progress,
-    // which has a sub param value of 4
-    if (parts.size() < 1 || !Utils::StringToUint(til::at(parts, 0), subParam) || subParam != 4)
+    if (parts.size() < 1 || !Utils::StringToUint(til::at(parts, 0), subParam))
     {
         return false;
     }
 
-    if (parts.size() >= 2)
+    // 4 is SetProgressBar, which sets the taskbar state/progress.
+    if (subParam == 4)
     {
-        // A state parameter is defined, parse it out
-        const auto stateSuccess = Utils::StringToUint(til::at(parts, 1), state);
-        if (!stateSuccess)
+        if (parts.size() >= 2)
         {
-            return false;
-        }
-        if (parts.size() >= 3)
-        {
-            // A progress parameter is also defined, parse it out
-            const auto progressSuccess = Utils::StringToUint(til::at(parts, 2), progress);
-            if (!progressSuccess)
+            // A state parameter is defined, parse it out
+            const auto stateSuccess = Utils::StringToUint(til::at(parts, 1), state);
+            if (!stateSuccess)
             {
                 return false;
             }
+            if (parts.size() >= 3)
+            {
+                // A progress parameter is also defined, parse it out
+                const auto progressSuccess = Utils::StringToUint(til::at(parts, 2), progress);
+                if (!progressSuccess)
+                {
+                    return false;
+                }
+            }
+        }
+
+        if (state > TaskbarMaxState)
+        {
+            // state is out of bounds, return false
+            return false;
+        }
+        if (progress > TaskbarMaxProgress)
+        {
+            // progress is greater than the maximum allowed value, clamp it to the max
+            progress = TaskbarMaxProgress;
+        }
+        return _terminalApi.SetTaskbarProgress(state, progress);
+    }
+    // 9 is SetWorkingDirectory, which informs the terminal about the current working directory.
+    else if (subParam == 9)
+    {
+        if (parts.size() >= 2)
+        {
+            return _terminalApi.SetWorkingDirectory(til::at(parts, 1));
         }
     }
 
-    if (state > TaskbarMaxState)
-    {
-        // state is out of bounds, return false
-        return false;
-    }
-    if (progress > TaskbarMaxProgress)
-    {
-        // progress is greater than the maximum allowed value, clamp it to the max
-        progress = TaskbarMaxProgress;
-    }
-    return _terminalApi.SetTaskbarProgress(state, progress);
+    return false;
 }
 
 // Routine Description:

src/cascadia/TerminalSettingsEditor/ColorLightenConverter.cpp

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+#include "ColorLightenConverter.h"
+#include "ColorLightenConverter.g.cpp"
+
+using namespace winrt::Windows;
+using namespace winrt::Windows::UI;
+using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Text;
+
+namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
+{
+    Foundation::IInspectable ColorLightenConverter::Convert(Foundation::IInspectable const& value,
+                                                            Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
+                                                            Foundation::IInspectable const& /* parameter */,
+                                                            hstring const& /* language */)
+    {
+        auto original = winrt::unbox_value_or<Color>(value, Color{ 255, 0, 0, 0 });
+        auto result = original;
+        result.A = 128; // halfway transparent
+        return winrt::box_value(result);
+    }
+
+    Foundation::IInspectable ColorLightenConverter::ConvertBack(Foundation::IInspectable const& /*value*/,
+                                                                Windows::UI::Xaml::Interop::TypeName const& /* targetType */,
+                                                                Foundation::IInspectable const& /*parameter*/,
+                                                                hstring const& /* language */)
+    {
+        throw hresult_not_implemented();
+    }
+}

src/cascadia/TerminalSettingsEditor/ColorLightenConverter.h

@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#pragma once
+
+#include "ColorLightenConverter.g.h"
+#include "../inc/cppwinrt_utils.h"
+
+DECLARE_CONVERTER(winrt::Microsoft::Terminal::Settings::Editor, ColorLightenConverter);

src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp

@@ -73,6 +73,18 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             auto entry = winrt::make<ColorTableEntry>(i, Windows::UI::Color{ 0, 0, 0, 0 });
             _CurrentColorTable.Append(entry);
         }
+
+        // Try to look up the scheme that was navigated to. If we find it, immediately select it.
+        const std::wstring lastNameFromNav{ _State.LastSelectedScheme() };
+        const auto it = std::find_if(begin(_ColorSchemeList),
+                                     end(_ColorSchemeList),
+                                     [&lastNameFromNav](const auto& scheme) { return scheme.Name() == lastNameFromNav; });
+
+        if (it != end(_ColorSchemeList))
+        {
+            auto scheme = *it;
+            ColorSchemeComboBox().SelectedItem(scheme);
+        }
     }
 
     // Function Description:
@@ -90,6 +102,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         CurrentColorScheme(colorScheme);
         _UpdateColorTable(colorScheme);
 
+        _State.LastSelectedScheme(colorScheme.Name());
+
         // Set the text disclaimer for the text box
         hstring disclaimer{};
         const std::wstring schemeName{ colorScheme.Name() };

src/cascadia/TerminalSettingsEditor/ColorSchemes.h

@@ -17,6 +17,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
             _Globals{ settings } {}
 
         GETSET_PROPERTY(Model::GlobalAppSettings, Globals, nullptr);
+        GETSET_PROPERTY(winrt::hstring, LastSelectedScheme, L"");
     };
 
     struct ColorSchemes : ColorSchemesT<ColorSchemes>

src/cascadia/TerminalSettingsEditor/ColorSchemes.idl

@@ -3,9 +3,11 @@
 
 namespace Microsoft.Terminal.Settings.Editor
 {
+
     runtimeclass ColorSchemesPageNavigationState
     {
         Microsoft.Terminal.Settings.Model.GlobalAppSettings Globals;
+        String LastSelectedScheme;
     };
 
     [default_interface] runtimeclass ColorSchemes : Windows.UI.Xaml.Controls.Page, Windows.UI.Xaml.Data.INotifyPropertyChanged

src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml

@@ -44,6 +44,8 @@ the MIT License. See LICENSE in the project root for license information. -->
             <local:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
             <local:ColorToHexConverter x:Key="ColorToHexConverter"/>
             <local:InvertedBooleanToVisibilityConverter x:Key="InvertedBooleanToVisibilityConverter"/>
+            <local:ColorLightenConverter x:Key="ColorLightenConverter"/>
+
         </ResourceDictionary>
     </Page.Resources>
 
@@ -139,6 +141,23 @@ the MIT License. See LICENSE in the project root for license information. -->
                             <TextBlock Text="{x:Bind Name, Mode=OneWay}"
                                        Style="{StaticResource ColorHeaderStyle}"/>
                             <Button Background="{x:Bind Color, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
+
+
+                                <Button.Resources>
+                                    <!-- Resources to colorize hover/pressed states based on the color of the button -->
+                                    <ResourceDictionary>
+                                        <ResourceDictionary.ThemeDictionaries>
+                                            <ResourceDictionary x:Key="Light">
+                                                <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{x:Bind Color, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                            </ResourceDictionary>
+                                            <ResourceDictionary x:Key="Dark">
+                                                <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{x:Bind Color, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                            </ResourceDictionary>
+                                            <!-- No High contrast dictionary, let's just leave that unchanged. -->
+                                        </ResourceDictionary.ThemeDictionaries>
+                                    </ResourceDictionary>
+                                </Button.Resources>
+
                                 <Button.Flyout>
                                     <Flyout>
                                         <ColorPicker Tag="{x:Bind Index, Mode=OneWay}"
@@ -159,6 +178,23 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <TextBlock x:Uid="ColorScheme_Foreground"
                                Style="{StaticResource ColorHeaderStyle}"/>
                     <Button Background="{Binding Color, ElementName=ForegroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
+
+
+                        <Button.Resources>
+                            <!-- Resources to colorize hover/pressed states based on the color of the button -->
+                            <ResourceDictionary>
+                                <ResourceDictionary.ThemeDictionaries>
+                                    <ResourceDictionary x:Key="Light">
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{Binding Color, ElementName=ForegroundPicker, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                    </ResourceDictionary>
+                                    <ResourceDictionary x:Key="Dark">
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{Binding Color, ElementName=ForegroundPicker, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                    </ResourceDictionary>
+                                    <!-- No High contrast dictionary, let's just leave that unchanged. -->
+                                </ResourceDictionary.ThemeDictionaries>
+                            </ResourceDictionary>
+                        </Button.Resources>
+
                         <Button.Flyout>
                             <Flyout>
                                 <ColorPicker x:Name="ForegroundPicker" Color="{x:Bind CurrentColorScheme.Foreground, Mode=TwoWay}"/>
@@ -170,6 +206,23 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <TextBlock x:Uid="ColorScheme_Background"
                                Style="{StaticResource ColorHeaderStyle}"/>
                     <Button Background="{Binding Color, ElementName=BackgroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
+
+
+                        <Button.Resources>
+                            <!-- Resources to colorize hover/pressed states based on the color of the button -->
+                            <ResourceDictionary>
+                                <ResourceDictionary.ThemeDictionaries>
+                                    <ResourceDictionary x:Key="Light">
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{Binding Color, ElementName=BackgroundPicker, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                    </ResourceDictionary>
+                                    <ResourceDictionary x:Key="Dark">
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{Binding Color, ElementName=BackgroundPicker, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                    </ResourceDictionary>
+                                    <!-- No High contrast dictionary, let's just leave that unchanged. -->
+                                </ResourceDictionary.ThemeDictionaries>
+                            </ResourceDictionary>
+                        </Button.Resources>
+
                         <Button.Flyout>
                             <Flyout>
                                 <ColorPicker x:Name="BackgroundPicker"
@@ -182,6 +235,23 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <TextBlock x:Uid="ColorScheme_CursorColor"
                                Style="{StaticResource ColorHeaderStyle}"/>
                     <Button Background="{Binding Color, ElementName=CursorColorPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
+
+
+                        <Button.Resources>
+                            <!-- Resources to colorize hover/pressed states based on the color of the button -->
+                            <ResourceDictionary>
+                                <ResourceDictionary.ThemeDictionaries>
+                                    <ResourceDictionary x:Key="Light">
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{Binding Color, ElementName=CursorColorPicker, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                    </ResourceDictionary>
+                                    <ResourceDictionary x:Key="Dark">
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{Binding Color, ElementName=CursorColorPicker, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                    </ResourceDictionary>
+                                    <!-- No High contrast dictionary, let's just leave that unchanged. -->
+                                </ResourceDictionary.ThemeDictionaries>
+                            </ResourceDictionary>
+                        </Button.Resources>
+
                         <Button.Flyout>
                             <Flyout>
                                 <ColorPicker x:Name="CursorColorPicker"
@@ -194,6 +264,23 @@ the MIT License. See LICENSE in the project root for license information. -->
                     <TextBlock x:Uid="ColorScheme_SelectionBackground"
                                Style="{StaticResource ColorHeaderStyle}"/>
                     <Button Background="{Binding Color, ElementName=SelectionBackgroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
+
+
+                        <Button.Resources>
+                            <!-- Resources to colorize hover/pressed states based on the color of the button -->
+                            <ResourceDictionary>
+                                <ResourceDictionary.ThemeDictionaries>
+                                    <ResourceDictionary x:Key="Light">
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{Binding Color, ElementName=SelectionBackgroundPicker, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                    </ResourceDictionary>
+                                    <ResourceDictionary x:Key="Dark">
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{Binding Color, ElementName=SelectionBackgroundPicker, Converter={StaticResource ColorLightenConverter}, Mode=OneWay}"/>
+                                    </ResourceDictionary>
+                                    <!-- No High contrast dictionary, let's just leave that unchanged. -->
+                                </ResourceDictionary.ThemeDictionaries>
+                            </ResourceDictionary>
+                        </Button.Resources>
+
                         <Button.Flyout>
                             <Flyout>
                                 <ColorPicker x:Name="SelectionBackgroundPicker"

src/cascadia/TerminalSettingsEditor/ColorToBrushConverter.idl

@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass ColorToBrushConverter : [default] Windows.UI.Xaml.Data.IValueConverter
-    {
-        ColorToBrushConverter();
-    };
-}

src/cascadia/TerminalSettingsEditor/ColorToHexConverter.idl

@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass ColorToHexConverter : [default] Windows.UI.Xaml.Data.IValueConverter
-    {
-        ColorToHexConverter();
-    };
-}

src/cascadia/TerminalSettingsEditor/CommonResources.xaml

@@ -6,7 +6,10 @@
     <x:Double x:Key="StandardFontSize">15.0</x:Double>
     <Thickness x:Key="StandardIndentMargin">20,0,0,0</Thickness>
     <Thickness x:Key="StandardControlSpacing">0,0,0,20</Thickness>
-    <x:Double x:Key="StandardBoxMinWidth">200</x:Double>
+    <x:Double x:Key="StandardBoxMinWidth">250</x:Double>
+    
+    <Thickness x:Key="PivotIndentMargin">10,0,0,0</Thickness>
+    <Thickness x:Key="PivotStackPanelMargin">0,10,0,0</Thickness>
 
     <!-- This is for easier transition to the SettingsContainer control.
          The SettingsContainer will wrap a setting with inheritance UI.-->

src/cascadia/TerminalSettingsEditor/Converters.idl

@@ -0,0 +1,51 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+namespace Microsoft.Terminal.Settings.Editor
+{
+
+    runtimeclass ColorLightenConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        ColorLightenConverter();
+    };
+
+    runtimeclass FontWeightConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        FontWeightConverter();
+    };
+
+    runtimeclass InvertedBooleanToVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        InvertedBooleanToVisibilityConverter();
+    };
+
+    runtimeclass ColorToBrushConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        ColorToBrushConverter();
+    };
+
+    runtimeclass ColorToHexConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        ColorToHexConverter();
+    };
+
+    runtimeclass PercentageConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        PercentageConverter();
+    };
+
+    runtimeclass StringIsEmptyConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        StringIsEmptyConverter();
+    };
+
+    runtimeclass StringIsNotDesktopConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        StringIsNotDesktopConverter();
+    };
+    runtimeclass DesktopWallpaperToEmptyStringConverter : [default] Windows.UI.Xaml.Data.IValueConverter
+    {
+        DesktopWallpaperToEmptyStringConverter();
+    };
+
+}

src/cascadia/TerminalSettingsEditor/EnumEntry.h

@@ -21,6 +21,24 @@ Author(s):
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    template<typename T>
+    struct EnumEntryComparator
+    {
+        bool operator()(const Editor::EnumEntry& lhs, const Editor::EnumEntry& rhs) const
+        {
+            return lhs.EnumValue().as<T>() < rhs.EnumValue().as<T>();
+        }
+    };
+
+    template<typename T>
+    struct EnumEntryReverseComparator
+    {
+        bool operator()(const Editor::EnumEntry& lhs, const Editor::EnumEntry& rhs) const
+        {
+            return lhs.EnumValue().as<T>() > rhs.EnumValue().as<T>();
+        }
+    };
+
     struct EnumEntry : EnumEntryT<EnumEntry>
     {
     public:

src/cascadia/TerminalSettingsEditor/FontWeightConverter.idl

@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass FontWeightConverter : [default] Windows.UI.Xaml.Data.IValueConverter
-    {
-        FontWeightConverter();
-    };
-}

src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml

@@ -34,6 +34,13 @@ the MIT License. See LICENSE in the project root for license information. -->
                                    Style="{StaticResource RadioButtonsSettingStyle}"/>
             </ContentPresenter>
 
+            <!--Always show tabs-->
+            <ContentPresenter Style="{StaticResource SettingContainerStyle}">
+                <CheckBox x:Uid="Globals_AlwaysShowTabs"
+                          IsChecked="{x:Bind State.Globals.AlwaysShowTabs, Mode=TwoWay}"
+                          Style="{StaticResource CheckBoxSettingStyle}"/>
+            </ContentPresenter>
+
             <!--Show Titlebar-->
             <ContentPresenter Style="{StaticResource SettingContainerStyle}">
                 <CheckBox x:Uid="Globals_ShowTitlebar"
@@ -48,10 +55,10 @@ the MIT License. See LICENSE in the project root for license information. -->
                           Style="{StaticResource CheckBoxSettingStyle}"/>
             </ContentPresenter>
 
-            <!--Always show tabs-->
+            <!--Always on Top-->
             <ContentPresenter Style="{StaticResource SettingContainerStyle}">
-                <CheckBox x:Uid="Globals_AlwaysShowTabs"
-                          IsChecked="{x:Bind State.Globals.AlwaysShowTabs, Mode=TwoWay}"
+                <CheckBox x:Uid="Globals_AlwaysOnTop"
+                          IsChecked="{x:Bind State.Globals.AlwaysOnTop, Mode=TwoWay}"
                           Style="{StaticResource CheckBoxSettingStyle}"/>
             </ContentPresenter>
 
@@ -64,13 +71,6 @@ the MIT License. See LICENSE in the project root for license information. -->
                                    Style="{StaticResource RadioButtonsSettingStyle}"/>
             </ContentPresenter>
 
-            <!--Confirm Close All Tabs-->
-            <ContentPresenter Style="{StaticResource SettingContainerStyle}">
-                <CheckBox x:Uid="Globals_ConfirmCloseAllTabs"
-                          IsChecked="{x:Bind State.Globals.ConfirmCloseAllTabs, Mode=TwoWay}"
-                          Style="{StaticResource CheckBoxSettingStyle}"/>
-            </ContentPresenter>
-
             <!--Disable Animations-->
             <ContentPresenter Style="{StaticResource SettingContainerStyle}">
                 <CheckBox x:Uid="Globals_DisableAnimations"

src/cascadia/TerminalSettingsEditor/Interaction.cpp

@@ -5,14 +5,19 @@
 #include "Interaction.h"
 #include "Interaction.g.cpp"
 #include "InteractionPageNavigationState.g.cpp"
+#include "EnumEntry.h"
 
 using namespace winrt::Windows::UI::Xaml::Navigation;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
     Interaction::Interaction()
     {
         InitializeComponent();
+
+        INITIALIZE_BINDABLE_ENUM_SETTING(TabSwitcherMode, TabSwitcherMode, TabSwitcherMode, L"Globals_TabSwitcherMode", L"Content");
+        INITIALIZE_BINDABLE_ENUM_SETTING(CopyFormat, CopyFormat, winrt::Microsoft::Terminal::TerminalControl::CopyFormat, L"Globals_CopyFormat", L"Content");
     }
 
     void Interaction::OnNavigatedTo(const NavigationEventArgs& e)

src/cascadia/TerminalSettingsEditor/Interaction.h

@@ -25,6 +25,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void OnNavigatedTo(const winrt::Windows::UI::Xaml::Navigation::NavigationEventArgs& e);
 
         GETSET_PROPERTY(Editor::InteractionPageNavigationState, State, nullptr);
+
+        GETSET_BINDABLE_ENUM_SETTING(TabSwitcherMode, Model::TabSwitcherMode, State().Globals, TabSwitcherMode);
+        GETSET_BINDABLE_ENUM_SETTING(CopyFormat, winrt::Microsoft::Terminal::TerminalControl::CopyFormat, State().Globals, CopyFormatting);
     };
 }
 

src/cascadia/TerminalSettingsEditor/Interaction.idl

@@ -1,6 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import "EnumEntry.idl";
+
 namespace Microsoft.Terminal.Settings.Editor
 {
     runtimeclass InteractionPageNavigationState
@@ -12,5 +14,11 @@ namespace Microsoft.Terminal.Settings.Editor
     {
         Interaction();
         InteractionPageNavigationState State { get; };
+
+        IInspectable CurrentTabSwitcherMode;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> TabSwitcherModeList { get; };
+
+        IInspectable CurrentCopyFormat;
+        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> CopyFormatList { get; };
     }
 }

src/cascadia/TerminalSettingsEditor/Interaction.xaml

@@ -4,8 +4,10 @@ the MIT License. See LICENSE in the project root for license information. -->
     x:Class="Microsoft.Terminal.Settings.Editor.Interaction"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:Microsoft.Terminal.Settings.Editor"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
 
     <Page.Resources>
@@ -13,6 +15,11 @@ the MIT License. See LICENSE in the project root for license information. -->
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="CommonResources.xaml"/>
             </ResourceDictionary.MergedDictionaries>
+            
+            <DataTemplate x:DataType="local:EnumEntry" x:Key="EnumRadioButtonTemplate">
+                <RadioButton Content="{x:Bind EnumName, Mode=OneWay}"
+                             Style="{StaticResource RadioButtonSettingStyle}"/>
+            </DataTemplate>
         </ResourceDictionary>
     </Page.Resources>
     
@@ -25,6 +32,15 @@ the MIT License. See LICENSE in the project root for license information. -->
                           Style="{StaticResource CheckBoxSettingStyle}"/>
              </ContentPresenter>
 
+            <!--Copy Format-->
+            <ContentPresenter Style="{StaticResource SettingContainerStyle}">
+                <muxc:RadioButtons x:Uid="Globals_CopyFormat"
+                                   ItemsSource="{x:Bind CopyFormatList, Mode=OneWay}"
+                                   SelectedItem="{x:Bind CurrentCopyFormat, Mode=TwoWay}"
+                                   ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
+                                   Style="{StaticResource RadioButtonsSettingStyle}"/>
+            </ContentPresenter>
+
             <!--Word Delimiters-->
             <ContentPresenter Style="{StaticResource SettingContainerStyle}">
                 <TextBox x:Uid="Globals_WordDelimiters"
@@ -38,6 +54,15 @@ the MIT License. See LICENSE in the project root for license information. -->
                           IsChecked="{x:Bind State.Globals.SnapToGridOnResize, Mode=TwoWay}"
                           Style="{StaticResource CheckBoxSettingStyle}"/>
             </ContentPresenter>
+            
+            <!--Tab Switcher Mode-->
+            <ContentPresenter Style="{StaticResource SettingContainerStyle}">
+                <muxc:RadioButtons x:Uid="Globals_TabSwitcherMode"
+                                   SelectedItem="{x:Bind CurrentTabSwitcherMode}"
+                                   ItemsSource="{x:Bind TabSwitcherModeList}"
+                                   ItemTemplate="{StaticResource EnumRadioButtonTemplate}"
+                                   Style="{StaticResource RadioButtonsSettingStyle}"/>
+            </ContentPresenter>
         </StackPanel>
     </ScrollViewer>
 </Page>

src/cascadia/TerminalSettingsEditor/InvertedBooleanToVisibilityConverter.idl

@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-namespace Microsoft.Terminal.Settings.Editor
-{
-    runtimeclass InvertedBooleanToVisibilityConverter : [default] Windows.UI.Xaml.Data.IValueConverter
-    {
-        InvertedBooleanToVisibilityConverter();
-    };
-}

src/cascadia/TerminalSettingsEditor/Launch.h

@@ -6,6 +6,7 @@
 #include "Launch.g.h"
 #include "LaunchPageNavigationState.g.h"
 #include "Utils.h"
+#include "../CommandlineArgs/AppCommandlineArgs.h"
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
@@ -31,6 +32,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         GETSET_PROPERTY(Editor::LaunchPageNavigationState, State, nullptr);
 
         GETSET_BINDABLE_ENUM_SETTING(LaunchMode, Model::LaunchMode, State().Settings().GlobalSettings, LaunchMode);
+
+    private:
+        ::Microsoft::Terminal::CommandlineArgs::AppCommandlineArgs argParser;
     };
 }