Migrate spelling-0.0.21 changes from main

<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? -->
## Summary of the Pull Request
Immediately cancelling the preview when the user is navigating back from a nested command.

<!-- Other than the issue solved, is this relevant to any other issues/existing PRs? -->
## References

<!-- Please review the items on the PR checklist before submitting-->
## PR Checklist
* [x] Closes #10165
* [x] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA
* [ ] Tests added/passed
* [ ] Documentation updated. If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/terminal) and link it here: #xxx
* [ ] Schema updated.
* [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

<!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here -->
## Detailed Description of the Pull Request / Additional comments
Basically 2 changes are done here:
- Allow the click handler to run for the back button when the button has focus and user hits the enter key (similarly as hitting space now).
- Now immediately cancelling the preview when the user is navigating back. Felt nicer to do it immediately at that point then keeping the preview active until the user hits cancel to close the palette. So the preview is already cancelled at step **5** instead of 6 as mentioned in the reproduction steps here https://github.com/microsoft/terminal/issues/10165#issue-899838383. But of course let me know if you're not agreeing here 😀 .

<!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well -->
## Validation Steps Performed
- Open 'Color Scheme' and verified preview is still working fine when selecting different schemes.
- After tabbing back to the Back button verified that when hitting enter or space the preview is cancelled and the original color scheme is being used again.
- Then after going back to 'Color Scheme' previews are still working ok.
- After hitting Enter on one of the Color Schemes the scheme still becomes active as before.

(cherry picked from commit 1cc383f865)

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "XamlStyler.Console": {
+      "version": "3.2008.4",
+      "commands": [
+        "xstyler"
+      ]
+    }
+  }
+}

.github/ISSUE_TEMPLATE/Bug_Report.md

@@ -1,54 +0,0 @@
----
-name: "Bug report 🐛"
-about: Report errors or unexpected behavior
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!-- 
-🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
-
-I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
-1. If I delete this entire template and go my own path, the core team may close my issue without further explanation or engagement.
-2. If I list multiple bugs/concerns in this one issue, the core team may close my issue without further explanation or engagement.
-3. If I write an issue that has many duplicates, the core team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
-4. If I leave the title incomplete when filing the issue, the core team may close my issue without further explanation or engagement.
-5. If I file something completely blank in the body, the core team may close my issue without further explanation or engagement.
-
-All good? Then proceed!
--->
-
-<!--
-This bug tracker is monitored by Windows Terminal development team and other technical folks.
-
-**Important: When reporting BSODs or security issues, DO NOT attach memory dumps, logs, or traces to Github issues**.
-Instead, send dumps/traces to secure@microsoft.com, referencing this GitHub issue.
-
-If this is an application crash, please also provide a Feedback Hub submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal (Preview)" and choose "Share My Feedback" after submission to get the link.
-
-Please use this form and describe your issue, concisely but precisely, with as much detail as possible.
-
--->
-
-# Environment
-
-```none
-Windows build number: [run `[Environment]::OSVersion` for powershell, or `ver` for cmd]
-Windows Terminal version (if applicable):
-
-Any other software?
-```
-
-# Steps to reproduce
-
-<!-- A description of how to trigger this bug. -->
-
-# Expected behavior
-
-<!-- A description of what you're expecting, possibly containing screenshots or reference material. -->
-
-# Actual behavior
-
-<!-- What's actually happening? -->

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -0,0 +1,57 @@
+name: "Bug report 🐛"
+description: Report errors or unexpected behavior
+title: ''
+labels: ''
+assignees: ''
+issue_body: true
+body:
+- type: markdown
+  attributes:
+    value: |
+      Please make sure to [search for existing issues](https://github.com/microsoft/terminal/issues) before filing a new one!
+
+      If this is an application crash, please also provide a [Feedback Hub](https://aka.ms/terminal-feedback-hub) submission link so we can find your diagnostic data on the backend. Use the category "Apps > Windows Terminal" and choose "Share My Feedback" after submission to get the link.
+
+- type: input
+  attributes:
+    label: Windows Terminal version (or Windows build number)
+    placeholder: "10.0.19042.0, 1.7.3651.0"
+    description: |
+      If you are reporting an issue in Windows Terminal, you can find the version in the about dialog.
+
+      If you are reporting an issue with the Windows Console, please run `ver` or `[Environment]::OSVersion`.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Other Software
+    description: If you're reporting a bug about our interaction with other software, what software? What versions?
+    placeholder: |
+      vim 8.2 (inside WSL)
+      OpenSSH_for_Windows_8.1p1
+      My Cool Application v0.3 (include a code snippet if it would help!)
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Steps to reproduce
+    placeholder: Tell us the steps required to trigger your bug.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: If you want to include screenshots, paste them into the markdown editor below the form or follow up with a separate comment.
+    placeholder: What were you expecting?
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Actual Behavior
+    placeholder: What happened instead?
+  validations:
+    required: true

.nuget/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="vswhere" version="2.6.7" />
-</packages>
+</packages>

.vscode/extensions.json

@@ -0,0 +1,13 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=827846 to learn about workspace recommendations.
+    // Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
+
+    // List of extensions which should be recommended for users of this workspace.
+    "recommendations": [
+        "ms-vscode.cpptools"
+    ],
+    // List of extensions recommended by VS Code that should not be recommended for users of this workspace.
+    "unwantedRecommendations": [
+        
+    ]
+}

.vscode/launch.json

@@ -0,0 +1,24 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug OpenConsole by Launching (x64, debug)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}\\bin\\x64\\debug\\openconsole.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceFolder}",
+            "environment": [],
+        },
+        {
+            "name": "Debug Terminal by Attaching (You go build/register/launch it first.)",
+            "type": "cppvsdbg",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,32 @@
+{
+    "C_Cpp.default.browse.databaseFilename": "${workspaceFolder}\\.vscode\\.BROWSE.VC.DB",
+    "C_Cpp.default.browse.path": [
+        "${workspaceFolder}"
+    ],
+    "C_Cpp.loggingLevel": "None",
+    "files.associations": {
+        "xstring": "cpp",
+        "*.idl": "cpp",
+        "array": "cpp",
+        "future": "cpp",
+        "istream": "cpp",
+        "memory": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "variant": "cpp",
+        "xlocmes": "cpp",
+        "xlocmon": "cpp",
+        "xlocnum": "cpp",
+        "xloctime": "cpp",
+        "multi_span": "cpp",
+        "pointers": "cpp",
+        "vector": "cpp"
+    },
+    "files.exclude": {
+        "**/bin/**": true,
+        "**/obj/**": true,
+        "**/packages/**": true,
+        "**/generated files/**": true
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,120 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "process",
+            "label": "Build Terminal/Console",
+            "command": "powershell.exe",
+            "args": [
+              "-Command",
+              "Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;",
+              "Set-MsBuildDevEnvironment;",
+              "$project = switch(\"${input:buildProjectChoice}\"){OpenConsole{\"Conhost\\Host_EXE\"} Terminal{\"Terminal\\CascadiaPackage\"}};",
+              "$target = switch(\"${input:buildModeChoice}\"){Build{\"\"} Rebuild{\":Rebuild\"} Clean{\":Clean\"}};",
+              "$target = $project + $target;",
+              "msbuild",
+              "${workspaceFolder}\\OpenConsole.sln",
+              "/p:Configuration=${input:configChoice}",
+              "/p:Platform=${input:platformChoice}",
+              "/p:AppxSymbolPackageEnabled=false", // This takes a long time, so false if we don't really need it.
+              "/t:$target",
+              "/m", // Parallel builds
+              "/verbosity:minimal"
+            ],
+            "problemMatcher": ["$msCompile"],
+            "group": {
+              "kind": "build",
+              "isDefault": true
+            },
+            "runOptions": {
+                "reevaluateOnRerun": false,
+                "instanceLimit": 1,
+                "runOn": "default"
+            }
+        },
+        {
+            "type": "process",
+            "label": "Register Windows Terminal x64 Debug",
+            "command": "powershell.exe",
+            "args": [
+              "-Command",
+              "Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;",
+              "Set-MsBuildDevEnvironment;",
+              "Set-Location -Path ${workspaceFolder}\\src\\cascadia\\CascadiaPackage\\AppPackages\\CascadiaPackage_0.0.1.0_x64_Debug_Test;",
+              "if ((Get-AppxPackage -Name 'WindowsTerminalDev*') -ne $null) { Remove-AppxPackage 'WindowsTerminalDev_0.0.1.0_x64__8wekyb3d8bbwe'};",
+              "New-Item ..\\loose -Type Directory -Force;",
+              "makeappx unpack /v /o /p .\\CascadiaPackage_0.0.1.0_x64_Debug.msix /d ..\\Loose\\;",
+              "Add-AppxPackage -Path ..\\loose\\AppxManifest.xml -Register -ForceUpdateFromAnyVersion -ForceApplicationShutdown"
+            ],
+            "problemMatcher": ["$msCompile"],
+            "group": {
+              "kind": "build"
+            }
+        },
+        {
+            "type": "process",
+            "label": "Run Windows Terminal Dev",
+            "command": "wtd.exe",
+            "args": [
+            ],
+            "problemMatcher": ["$msCompile"],
+        },
+        {
+            "type": "process",
+            "label": "Run Code Format",
+            "command": "powershell.exe",
+            "args": [
+              "-Command",
+              "Import-Module ${workspaceFolder}\\tools\\OpenConsole.psm1;",
+              "Set-MsBuildDevEnvironment;",
+              "Invoke-CodeFormat",
+            ],
+            "problemMatcher": ["$msCompile"],
+        }
+    ],
+    "inputs":[
+        {
+            "id": "platformChoice",
+            "type": "pickString",
+            "description": "Processor architecture choice",
+            "options":[
+                "x64",
+                "x86",
+                "arm64"
+            ],
+            "default": "x64"
+        },
+        {
+            "id": "configChoice",
+            "type": "pickString",
+            "description": "Debug or release?",
+            "options":[
+                "Debug",
+                "Release"
+            ],
+            "default": "Debug"
+        },
+        {
+            "id": "buildModeChoice",
+            "type": "pickString",
+            "description": "Build, rebuild, or clean?",
+            "options":[
+                "Build",
+                "Rebuild",
+                "Clean"
+            ],
+            "default": "Build"
+        },
+        {
+            "id": "buildProjectChoice",
+            "type": "pickString",
+            "description": "OpenConsole or Terminal?",
+            "options":[
+                "OpenConsole",
+                "Terminal"
+            ],
+            "default": "Terminal"
+        }
+
+    ]
+}

README.md

@@ -33,10 +33,23 @@ This is our preferred method.
 
 #### Via GitHub
 
-For users who are unable to install Terminal from the Microsoft Store, Terminal
-builds can be manually downloaded from this repository's [Releases
+For users who are unable to install Windows Terminal from the Microsoft Store,
+released builds can be manually downloaded from this repository's [Releases
 page](https://github.com/microsoft/terminal/releases).
 
+Download the `Microsoft.WindowsTerminal_<versionNumber>.msixbundle` file from
+the **Assets** section. To install the app, you can simply double-click on the
+`.msixbundle` file, and the app installer should automatically run. If that
+fails for any reason, you can try the following command at a PowerShell prompt:
+
+```powershell
+# NOTE: If you are using PowerShell 7+, please run
+# Import-Module Appx -UseWindowsPowerShell
+# before using Add-AppxPackage.
+
+Add-AppxPackage Microsoft.WindowsTerminal_<versionNumber>.msixbundle
+```
+
 > 🔴 Note: If you install Terminal manually:
 >
 > * Terminal will not auto-update when new builds are released so you will need

XamlStyler.json

@@ -0,0 +1,41 @@
+{
+    "AttributesTolerance": 1,
+    "KeepFirstAttributeOnSameLine": true,
+    "MaxAttributeCharactersPerLine": 0,
+    "MaxAttributesPerLine": 1,
+    "NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
+    "SeparateByGroups": false,
+    "AttributeIndentation": 0,
+    "AttributeIndentationStyle": 1,
+    "RemoveDesignTimeReferences":  false,
+    "EnableAttributeReordering": true,
+    "AttributeOrderingRuleGroups": [
+        "x:Class",
+        "xmlns, xmlns:x",
+        "xmlns:*",
+        "x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
+        "Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
+        "Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
+        "Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
+        "*:*, *",
+        "PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
+        "mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
+        "Storyboard.*, From, To, Duration"
+    ],
+    "FirstLineAttributes": "",
+    "OrderAttributesByName": true,
+    "PutEndingBracketOnNewLine": false,
+    "RemoveEndingTagOfEmptyElement": true,
+    "SpaceBeforeClosingSlash": true,
+    "RootElementLineBreakRule": 0,
+    "ReorderVSM": 2,
+    "ReorderGridChildren": false,
+    "ReorderCanvasChildren": false,
+    "ReorderSetters": 0,
+    "FormatMarkupExtension": true,
+    "NoNewLineMarkupExtensions": "x:Bind, Binding",
+    "ThicknessSeparator": 2,
+    "ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin",
+    "FormatOnSave": true,
+    "CommentPadding": 2,
+}

build/Helix/PrepareHelixPayload.ps1

@@ -19,8 +19,8 @@ New-Item -ItemType Directory -Force -Path $payloadDir
 
 # Copy files from nuget packages
 Copy-Item "$nugetPackagesDir\microsoft.windows.apps.test.1.0.181203002\lib\netcoreapp2.1\*.dll" $payloadDir
-Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$Platform\*" $payloadDir
-Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$Platform\CoreClr\*" $payloadDir
+Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.58.210305002\build\Binaries\$Platform\*" $payloadDir
+Copy-Item "$nugetPackagesDir\Microsoft.Taef.10.58.210305002\build\Binaries\$Platform\CoreClr\*" $payloadDir
 New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\"

build/Helix/packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
-  <package id="TAEF.Redist.Wlk" version="10.57.200731005-develop" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.58.210305002" targetFramework="native" />
   <package id="microsoft.windows.apps.test" version="1.0.181203002" targetFramework="native" />
   <package id="runtime.win-x86.microsoft.netcore.app" version="2.1.0" targetFramework="native" />
   <package id="runtime.win-x64.microsoft.netcore.app" version="2.1.0" targetFramework="native" />

build/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
-  <package id="TAEF.Redist.Wlk" version="10.57.200731005-develop" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.58.210305002" targetFramework="native" />
 </packages>

build/pipelines/templates/helix-createprojfile-steps.yml

@@ -12,4 +12,4 @@ steps:
     inputs:
       targetType: filePath
       filePath: build\Helix\GenerateTestProjFile.ps1
-      arguments: -TestFile '${{ parameters.testFilePath }}' -OutputProjFile '$(Build.ArtifactStagingDirectory)\${{ parameters.outputProjFileName }}' -JobTestSuiteName '${{ parameters.testSuite }}' -TaefPath '$(Build.SourcesDirectory)\build\Helix\packages\taef.redist.wlk.10.57.200731005-develop\build\Binaries\x86' -TaefQuery '${{ parameters.taefQuery }}'
+      arguments: -TestFile '${{ parameters.testFilePath }}' -OutputProjFile '$(Build.ArtifactStagingDirectory)\${{ parameters.outputProjFileName }}' -JobTestSuiteName '${{ parameters.testSuite }}' -TaefPath '$(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.58.210305002\build\Binaries\x86' -TaefQuery '${{ parameters.taefQuery }}'

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

@@ -36,7 +36,7 @@ jobs:
     matrix: ${{ parameters.matrix }}
   variables:
     artifactsDir: $(Build.SourcesDirectory)\Artifacts
-    taefPath: $(Build.SourcesDirectory)\build\Helix\packages\taef.redist.wlk.10.57.200731005-develop\build\Binaries\$(buildPlatform)
+    taefPath: $(Build.SourcesDirectory)\build\Helix\packages\Microsoft.Taef.10.58.210305002\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}}'
 
 

build/rules/GenerateFeatureFlags.proj

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- THIS PROJECT CANNOT BE LOADED INTO THE SOLUTION. -->
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Release|Any CPU">
+      <Configuration>Release</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Fuzzing|Any CPU">
+      <Configuration>Fuzzing</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="AuditMode|Any CPU">
+      <Configuration>AuditMode</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Any CPU">
+      <Configuration>Debug</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>d97c3c61-53cd-4e72-919b-9a0940e038f9</ProjectGuid>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IntermediateOutputPath>$(SolutionDir)obj\$(Configuration)\GenerateFeatureFlags\</IntermediateOutputPath>
+    <OpenConsoleCommonOutDir>$(SolutionDir)bin\$(Configuration)\</OpenConsoleCommonOutDir>
+
+    <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Preview'">Preview</_WTBrandingName>
+    <_WTBrandingName Condition="'$(WindowsTerminalBranding)'=='Release'">Release</_WTBrandingName>
+    <_WTBrandingName Condition="'$(_WTBrandingName)'==''">Dev</_WTBrandingName>
+  </PropertyGroup>
+
+  <Target Name="_GenerateBranchAndBrandingCache">
+    <Exec Command="git.exe rev-parse --abbrev-ref HEAD"
+      CustomWarningRegularExpression="^fatal:.*"
+      ConsoleToMsBuild="true"
+      IgnoreExitCode="true">
+      <Output TaskParameter="ConsoleOutput" ItemName="_GitBranchLines" />
+    </Exec>
+
+    <ItemGroup>
+      <_BrandingLines Include="$(_WTBrandingName)" />
+    </ItemGroup>
+
+    <WriteLinesToFile File="$(IntermediateOutputPath)branch_branding_cache.txt"
+      Lines="@(_GitBranchLines);@(_BrandingLines)"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true" />
+
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)branch_branding_cache.txt" />
+      <_BranchBrandingCacheFiles Include="$(IntermediateOutputPath)branch_branding_cache.txt" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="_RunFeatureFlagScript"
+    Inputs="@(FeatureFlagFile);@(_BranchBrandingCacheFiles)"
+    Outputs="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h"
+    DependsOnTargets="_GenerateBranchAndBrandingCache">
+    <MakeDir Directories="$(OpenConsoleCommonOutDir)\inc" />
+    <Exec
+      Command="powershell -NoLogo -NoProfile -NonInteractive -ExecutionPolicy ByPass -Command &quot;$(SolutionDir)\tools\Generate-FeatureStagingHeader.ps1&quot; -Path &quot;%(FeatureFlagFile.FullPath)&quot; -Branding $(_WTBrandingName)"
+      ConsoleToMsBuild="true"
+      StandardOutputImportance="low">
+      <Output TaskParameter="ConsoleOutput" ItemName="_FeatureFlagFileLines" />
+    </Exec>
+
+    <!--
+      We gather the feature flag output in MSBuild and emit the file so that we can take advantage of
+      WriteOnlyWhenDifferent. Doing this ensures that we don't rebuild the world when the branch changes
+      (if it results in a new TilFeatureStaging.h that would have had the same content/features as the previous one)
+    -->
+
+    <WriteLinesToFile File="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h"
+      Lines="@(_FeatureFlagFileLines)"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true" />
+
+    <ItemGroup>
+      <FileWrites Include="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="Build" DependsOnTargets="_RunFeatureFlagScript" />
+  <Target Name="Clean">
+    <Delete Files="$(OpenConsoleCommonOutDir)\inc\TilFeatureStaging.h" />
+  </Target>
+
+  <ItemGroup>
+    <FeatureFlagFile Include="$(SolutionDir)\src\features.xml" />
+  </ItemGroup>
+</Project>

build/scripts/Invoke-FormattingCheck.ps1

@@ -3,12 +3,24 @@
 # Checks for code formatting errors. Will throw exception if any are found.
 function Invoke-CheckBadCodeFormatting() {
     Import-Module ./tools/OpenConsole.psm1
-    Invoke-CodeFormat
+
+    # Don't run the XAML formatter in this step - even if it changes nothing,
+    # it'll still touch all the .xaml files.
+    Invoke-CodeFormat -IgnoreXaml
+
     # returns a non-zero exit code if there are any diffs in the tracked files in the repo
     git diff-index --quiet HEAD --
     if ($lastExitCode -eq 1) {
+
+        # Write the list of files that need updating to the log
+        git diff-index --name-only HEAD
+
         throw "code formatting bad, run Invoke-CodeFormat on branch"
     }
+
+    # Manually check the formatting of our .xaml files, without touching them.
+    Verify-XamlFormat
+
 }
 
 Invoke-CheckBadCodeFormatting

build/scripts/Test-WindowsTerminalPackage.ps1

@@ -58,7 +58,7 @@ Try {
 
     ### Check the activatable class entries for a few DLLs we need.
     $inProcServers = $Manifest.Package.Extensions.Extension.InProcessServer.Path
-    $RequiredInProcServers = ("TerminalApp.dll", "TerminalControl.dll", "TerminalConnection.dll")
+    $RequiredInProcServers = ("TerminalApp.dll", "Microsoft.Terminal.Control.dll", "Microsoft.Terminal.Remoting.dll", "Microsoft.Terminal.Settings.Editor.dll", "Microsoft.Terminal.Settings.Model.dll", "TerminalConnection.dll")
 
     Write-Verbose "InProc Servers: $inProcServers"
 

consolegit2gitfilters.json

@@ -19,6 +19,7 @@
     "/.github/",
     "/samples/",
     "/res/terminal/",
+    "/res/fonts/",
     "/doc/specs/",
     "/doc/cascadia/",
     "/doc/user-docs/",
@@ -38,6 +39,7 @@
     ".wrn",
     ".rec",
     ".err",
+    "XamlStyler.json",
     ".xlsx"
   ]
 }

custom.props

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

doc/TAEF.md

@@ -12,9 +12,9 @@ Use the [TAEF Verify Macros for C++](https://docs.microsoft.com/en-us/windows-ha
 
 ### Running Tests
 
-If you have Visual Studio and related C++ components installed, and you have successfully restored NuGets, you should have the TAEF test runner `te.exe` available locally as part of the `Taef.Redist.Wlk` package.
+If you have Visual Studio and related C++ components installed, and you have successfully restored NuGets, you should have the TAEF test runner `te.exe` available locally as part of the `Microsoft.Taef` package.
 
-> Note that you cannot easily run TAEF tests directly through Visual Studio. The `Taef.Redist.Wlk` NuGet package comes with an adapter that will let you browse and execute TAEF tests inside of Visual Studio, but its performance and reliability prevent us from recommending it here.
+> Note that you cannot easily run TAEF tests directly through Visual Studio. The `Microsoft.Taef` NuGet package comes with an adapter that will let you browse and execute TAEF tests inside of Visual Studio, but its performance and reliability prevent us from recommending it here.
 
 In a "normal" CMD environment, `te.exe` may not be directly available. Try the following command to set up the development enviroment first:
 

doc/cascadia/Unittesting-CppWinRT-Xaml.md

@@ -166,7 +166,7 @@ should be working just the same as before.
 Now that you have a static library project, you can start building your unittest
 dll. Start by creating a new directory for your unittest code, and creating a
 `.vcxproj` for a TAEF unittest dll. For the Terminal solution, we use the TAEF
-nuget package `Taef.Redist.Wlk`.
+nuget package `Microsoft.Taef`.
 
 ### Referencing your C++/WinRT static lib
 

doc/cascadia/profiles.schema.json

@@ -52,6 +52,117 @@
         }
       ]
     },
+    "AppearanceConfig": {
+      "properties": {
+        "colorScheme": {
+          "description": "The name of a color scheme to use when unfocused.",
+          "type": "string"
+        },
+        "foreground": {
+          "$ref": "#/definitions/Color",
+          "default": "#cccccc",
+          "description": "Sets the text color when unfocused. Overrides \"foreground\" from the color scheme. Uses hex color format: \"#rrggbb\".",
+          "type": ["string", "null"]
+        },
+        "background": {
+          "$ref": "#/definitions/Color",
+          "default": "#0c0c0c",
+          "description": "Sets the background color of the text when unfocused. Overrides \"background\" from the color scheme. Uses hex color format: \"#rrggbb\".",
+          "type": ["string", "null"]
+        },
+        "selectionBackground": {
+          "oneOf": [
+            {"$ref": "#/definitions/Color"},
+            { "type": "null" }
+          ],
+          "description": "Sets the background color of selected text when unfocused. Overrides selectionBackground set in the color scheme. Uses hex color format: \"#rrggbb\"."
+        },
+        "cursorColor": {
+          "oneOf": [
+            { "$ref": "#/definitions/Color" },
+            {"type": "null"}
+          ],
+          "description": "Sets the color of the cursor when unfocused. Overrides the cursor color from the color scheme. Uses hex color format: \"#rrggbb\"."
+        },
+        "cursorShape": {
+          "default": "bar",
+          "description": "Sets the shape of the cursor when unfocused. Possible values:\n -\"bar\" ( ┃, default )\n -\"doubleUnderscore\" ( ‗ )\n -\"emptyBox\" ( ▯ )\n -\"filledBox\" ( █ )\n -\"underscore\" ( ▁ )\n -\"vintage\" ( ▃ )",
+          "enum": [
+            "bar",
+            "doubleUnderscore",
+            "emptyBox",
+            "filledBox",
+            "underscore",
+            "vintage"
+          ],
+          "type": "string"
+        },
+        "cursorHeight": {
+          "description": "Sets the percentage height of the cursor (when unfocused) starting from the bottom. Only works when cursorShape is set to \"vintage\". Accepts values from 1-100.",
+          "maximum": 100,
+          "minimum": 1,
+          "type": ["integer","null"],
+          "default": 25
+        },
+        "backgroundImage": {
+          "description": "Sets the file location of the image to draw over the window background when unfocused.",
+          "oneOf": [
+            {
+              "type": ["string", null]
+            },
+            {
+              "enum": [
+                "desktopWallpaper"
+              ]
+            }
+          ],
+          "type": [ "string", "null" ]
+        },
+        "backgroundImageOpacity": {
+          "default": 1.0,
+          "description": "Sets the transparency of the background image when unfocused. Accepts floating point values from 0-1.",
+          "maximum": 1.0,
+          "minimum": 0.0,
+          "type": "number"
+        },
+        "backgroundImageStretchMode": {
+          "default": "uniformToFill",
+          "description": "Sets how the background image is resized to fill the window when unfocused.",
+          "enum": [
+            "fill",
+            "none",
+            "uniform",
+            "uniformToFill"
+          ],
+          "type": "string"
+        },
+        "backgroundImageAlignment": {
+          "default": "center",
+          "enum": [
+            "bottom",
+            "bottomLeft",
+            "bottomRight",
+            "center",
+            "left",
+            "right",
+            "top",
+            "topLeft",
+            "topRight"
+          ],
+          "description": "Sets how the background image aligns to the boundaries of the window when unfocused. Possible values: \"center\", \"left\", \"top\", \"right\", \"bottom\", \"topLeft\", \"topRight\", \"bottomLeft\", \"bottomRight\"",
+          "type": "string"
+        },
+        "experimental.retroTerminalEffect": {
+          "description": "When set to true, enable retro terminal effects when unfocused. This is an experimental feature, and its continued existence is not guaranteed.",
+          "type": "boolean"
+        },
+        "experimental.pixelShaderPath": {
+          "description": "Use to set a path to a pixel shader to use with the Terminal when unfocused. Overrides `experimental.retroTerminalEffect`. This is an experimental feature, and its continued existence is not guaranteed.",
+          "type": "string"
+        }
+      },
+      "type": "object"
+    },
     "ProfileGuid": {
       "default": "{}",
       "pattern": "^\\{[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}\\}$",
@@ -77,6 +188,8 @@
         "duplicateTab",
         "find",
         "findMatch",
+        "identifyWindow",
+        "identifyWindows",
         "moveFocus",
         "moveTab",
         "newTab",
@@ -85,12 +198,14 @@
         "openNewTabDropdown",
         "openSettings",
         "openTabColorPicker",
+        "openWindowRenamer",
         "paste",
         "prevTab",
         "renameTab",
         "openTabRenamer",
         "resetFontSize",
         "resizePane",
+        "renameWindow",
         "scrollDown",
         "scrollDownPage",
         "scrollUp",
@@ -222,10 +337,32 @@
           "$ref": "#/definitions/Color",
           "default": null,
           "description": "If provided, will set the tab's color to the given value"
+        },
+        "suppressApplicationTitle": {
+          "type": "boolean",
+          "default": "false",
+          "description": "When set to true, tabTitle overrides the default title of the tab and any title change messages from the application will be suppressed. When set to false, tabTitle behaves as normal"
+        },
+        "colorScheme": {
+          "description": "The name of a color scheme to use, instead of the one specified by the profile",
+          "type": "string"
         }
       },
       "type": "object"
     },
+    "SwitchToAdjacentTabArgs" : {
+      "oneOf": [
+        { "type": "null" },
+        {
+          "enum": [
+            "mru",
+            "inOrder",
+            "disabled"
+          ],
+          "type": "string"
+        }
+      ]
+    },
     "ShortcutAction": {
       "properties": {
         "action": {
@@ -404,12 +541,14 @@
             "action": { "type": "string", "pattern": "openSettings" },
             "target": {
               "type": "string",
-              "default": "settingsFile",
-              "description": "The settings file to open.",
+              "default": "settingsUI",
+              "description": "Opens Settings UI or settings file.",
               "enum": [
                 "settingsFile",
                 "defaultsFile",
-                "allFiles"
+                "allFiles",
+                "settingsUI"
+                
               ]
             }
           }
@@ -597,6 +736,70 @@
         }
       ]
     },
+    "PrevTabAction": {
+      "description": "Arguments corresponding to a Previous Tab Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type":"string", "pattern": "prevTab" },
+            "tabSwitcherMode": {
+              "$ref": "#/definitions/SwitchToAdjacentTabArgs",
+              "default": null,
+              "description": "Move to the previous tab using \"tabSwitcherMode\". If no mode is provided, use the one globally defined one."
+            }
+          }
+        }
+      ]
+    },
+    "NextTabAction": {
+      "description": "Arguments corresponding to a Next Tab Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type":"string", "pattern": "nextTab" },
+            "tabSwitcherMode": {
+              "$ref": "#/definitions/SwitchToAdjacentTabArgs",
+              "default": null,
+              "description": "Move to the next tab using \"tabSwitcherMode\". If no mode is provided, use the one globally defined one."
+            }
+          }
+        }
+      ]
+    },
+    "RenameTabAction": {
+      "description": "Arguments corresponding to a renameTab Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type": "string", "pattern": "renameTab" },
+            "title": {
+              "type": "string",
+              "default": "",
+              "description": "A title to assign to the tab. If omitted or null, this action will restore the tab's title to the original value."
+            }
+          }
+        }
+      ]
+    },
+    "RenameWindowAction": {
+      "description": "Arguments corresponding to a renameWindow Action",
+      "allOf": [
+        { "$ref": "#/definitions/ShortcutAction" },
+        {
+          "properties": {
+            "action": { "type": "string", "pattern": "renameWindow" },
+            "name": {
+              "type": "string",
+              "default": "",
+              "description": "A name to assign to the window."
+            }
+          }
+        }
+      ]
+    },
     "Keybinding": {
       "additionalProperties": false,
       "properties": {
@@ -623,6 +826,10 @@
               { "$ref": "#/definitions/MoveTabAction" },
               { "$ref": "#/definitions/FindMatchAction" },
               { "$ref": "#/definitions/NewWindowAction" },
+              { "$ref": "#/definitions/NextTabAction" },
+              { "$ref": "#/definitions/PrevTabAction" },
+              { "$ref": "#/definitions/RenameTabAction" },
+              { "$ref": "#/definitions/RenameWindowAction" },
               { "type": "null" }
             ]
         },
@@ -906,6 +1113,11 @@
           "description": "Sets the background color of the text. Overrides \"background\" from the color scheme. Uses hex color format: \"#rrggbb\".",
           "type": ["string", "null"]
         },
+        "unfocusedAppearance": {
+          "$ref": "#/definitions/AppearanceConfig",
+          "description": "Sets the appearance of the terminal when it is unfocused.",
+          "type": ["object", "null"]
+        },
         "backgroundImage": {
           "description": "Sets the file location of the image to draw over the window background.",
           "oneOf": [
@@ -993,9 +1205,9 @@
           "description": "Sets the color of the cursor. Overrides the cursor color from the color scheme. Uses hex color format: \"#rrggbb\"."
         },
         "cursorHeight": {
-          "description": "Sets the percentage height of the cursor starting from the bottom. Only works when cursorShape is set to \"vintage\". Accepts values from 25-100.",
+          "description": "Sets the percentage height of the cursor starting from the bottom. Only works when cursorShape is set to \"vintage\". Accepts values from 1-100.",
           "maximum": 100,
-          "minimum": 25,
+          "minimum": 1,
           "type": ["integer","null"],
           "default": 25
         },

doc/feature_flags.md

@@ -0,0 +1,65 @@
+# til::feature
+
+Feature flags are controlled by an XML document stored at `src/features.xml`.
+
+## Example Document
+
+```xml
+<?xml version="1.0"?>
+<featureStaging xmlns="http://microsoft.com/TilFeatureStaging-Schema.xsd">
+    <feature>
+        <!-- This will produce Feature_XYZ::IsEnabled() and TIL_FEATURE_XYZ_ENABLED (preprocessor) -->
+        <name>Feature_XYZ</name>
+
+        <description>Does a cool thing</description>
+
+        <!-- GitHub deliverable number; optional -->
+        <id>1234</id>
+
+        <!-- Whether the feature defaults to enabled or disabled -->
+        <stage>AlwaysEnabled|AlwaysDisabled</stage>
+
+        <!-- Branch wildcards where the feature should be *DISABLED* -->
+        <alwaysDisabledBranchTokens>
+            <branchToken>branch/with/wildcard/*</branchToken>
+            <!-- ... more branchTokens ... -->
+        </alwaysDisabledBranchTokens>
+
+        <!-- Just like alwaysDisabledBranchTokens, but for *ENABLING* the feature. -->
+        <alwaysEnabledBranchTokens>
+            <branchToken>...</branchToken>
+        </alwaysEnabledBranchTokens>
+
+        <!-- Brandings where the feature should be *DISABLED* -->
+        <alwaysDisabledBrandingTokens>
+            <!-- Valid brandings include Dev, Preview, Release, WindowsInbox -->
+            <brandingToken>Release</brandingToken>
+            <!-- ... more brandingTokens ... -->
+        </alwaysDisabledBrandingTokens>
+
+        <!-- Just like alwaysDisabledBrandingTokens, but for *ENABLING* the feature -->
+        <alwaysEnabledBrandingTokens>
+            <branchToken>...</branchToken>
+        </alwaysEnabledBrandingTokens>
+
+        <!-- Unequivocally disable this feature in Release -->
+        <alwaysDisabledReleaseTokens />
+    </feature>
+</featureStaging>
+```
+
+## Notes
+
+Features that are disabled for Release using `alwaysDisabledReleaseTokens` are
+*always* disabled in Release, even if they come from a branch that would have
+been enabled by the wildcard.
+
+### Precedence
+
+1. `alwaysDisabledReleaseTokens`
+2. Enabled branches
+3. Disabled branches
+   * The longest branch token that matches your branch will win.
+3. Enabled brandings
+4. Disabled brandings
+5. The feature's default state

doc/terminal-v2-roadmap.md

@@ -2,17 +2,16 @@
 
 ## Overview
 
-This document outlines the roadmap towards delivering Windows Terminal 2.0 by Spring 2021.
-
+This document outlines the roadmap towards delivering Windows Terminal 2.0 by Winter 2021.
 
 ## Milestones
 
-The Windows Terminal project is engineered and delivered as a set of 4-week milestones. New features will go into [Windows Terminal Preview](https://aka.ms/terminal-preview) first, then a month after they've been in Preview, those features will move into [Windows Terminal](https://aka.ms/terminal).
+Windows Terminal is engineered and delivered as a set of 6-week milestones. New features will go into [Windows Terminal Preview](https://aka.ms/terminal-preview) first, then a month after they've been in Preview, those features will move into [Windows Terminal](https://aka.ms/terminal).
 
 | Duration | Activity | Releases |
 | --- | --- | --- |
-| 2 weeks | Dev Work<br/> <ul><li>Fixes / Features for future Windows Releases</li><li>Fixes / Features for Windows Terminal</li></ul> |  Release to Internal Selfhosters at end of week 2 |
-| 1 week | Quality & Stability<br/> <ul><li>Bug Fixes</li><li>Perf & Stability</li><li>UI Polish</li><li>Tests</li><li>etc.</li></ul>| Push to Microsoft Store at end of week 3 |
+| 4 weeks | Dev Work<br/> <ul><li>Fixes / Features for future Windows Releases</li><li>Fixes / Features for Windows Terminal</li></ul> |  Release to Internal Selfhosters at end of week 4 |
+| 1 week | Quality & Stability<br/> <ul><li>Bug Fixes</li><li>Perf & Stability</li><li>UI Polish</li><li>Tests</li><li>etc.</li></ul>| Push to Microsoft Store at end of week 5 |
 | 1 week | Release <br/> <ul><li>Available from [Microsoft Store](https://aka.ms/terminal) & [GitHub Releases](https://github.com/microsoft/terminal/releases)</li><li>Release Notes & Announcement Blog published</li><li>Engineering System Maintenance</li><li>Community Engagement</li><li>Docs</li><li>Future Milestone Planning</li></ul> | Release available from Microsoft Store & GitHub Releases |
 
 ## Terminal Roadmap / Timeline
@@ -26,12 +25,15 @@ Below is the schedule for when milestones will be included in release builds of
 | 2020-08-31 | [1.3] in Windows Terminal Preview<br>[1.2] in Windows Terminal | [Windows Terminal Preview 1.3 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-3-release/) |
 | 2020-09-30 | [1.4] in Windows Terminal Preview<br>[1.3] in Windows Terminal | [Windows Terminal Preview 1.4 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-4-release/) |
 | 2020-11-30 | [1.5] in Windows Terminal Preview<br>[1.4] in Windows Terminal | [Windows Terminal Preview 1.5 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-5-release/) |
-| 2020-12-31 | [1.6] in Windows Terminal Preview<br>[1.5] in Windows Terminal | |
-| 2021-01-31 | 1.7 in Windows Terminal Preview<br>[1.6] in Windows Terminal | |
-| 2021-02-28 | 1.8 in Windows Terminal Preview<br>1.8 in Windows Terminal | |
-| 2021-03-31 | 1.9 in Windows Terminal Preview<br>1.9 in Windows Terminal | |
-| 2021-04-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
-| 2021-05-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
+| 2021-01-31 | [1.6] in Windows Terminal Preview<br>[1.5] in Windows Terminal | [Windows Terminal Preview 1.6 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-6-release/) |
+| 2021-03-01 | [1.7] in Windows Terminal Preview<br>[1.6] in Windows Terminal | [Windows Terminal Preview 1.7 Release](https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-7-release/) |
+| 2021-04-30 | [1.8] in Windows Terminal Preview<br>[1.7] in Windows Terminal | |
+| 2021-05-31 | [1.9] in Windows Terminal Preview<br>[1.8] in Windows Terminal | |
+| 2021-07-31 | 1.10 in Windows Terminal Preview<br>[1.9] in Windows Terminal | |
+| 2021-08-30 | 1.11 in Windows Terminal Preview<br>1.10 in Windows Terminal | |
+| 2021-10-31 | 1.12 in Windows Terminal Preview<br>1.11 in Windows Terminal | |
+| 2021-11-30 | 2.0 RC in Windows Terminal Preview<br>2.0 RC in Windows Terminal | |
+| 2021-12-31 | [2.0] in Windows Terminal Preview<br>[2.0] in Windows Terminal | |
 
 ## Issue Triage & Prioritization
 
@@ -84,6 +86,9 @@ Feature Notes:
 [1.4]: https://github.com/microsoft/terminal/milestone/28
 [1.5]: https://github.com/microsoft/terminal/milestone/30
 [1.6]: https://github.com/microsoft/terminal/milestone/31
+[1.7]: https://github.com/microsoft/terminal/milestone/32
+[1.8]: https://github.com/microsoft/terminal/milestone/33
+[1.9]: https://github.com/microsoft/terminal/milestone/34
 [2.0]: https://github.com/microsoft/terminal/milestone/22
 [#1564]: https://github.com/microsoft/terminal/issues/1564
 [#6720]: https://github.com/microsoft/terminal/pull/6720

res/README.md

@@ -6,16 +6,3 @@ The images in this directory do not fall under the same [license](https://raw.gi
 of the Windows Terminal code.
 
 Please consult the [license](./LICENSE) in this directory for terms applicable to the image assets in this directory.
-
-## Fonts
-
-The fonts in this directory do not fall under the same [license](https://raw.githubusercontent.com/microsoft/terminal/main/LICENSE) as the rest
-of the Windows Terminal code.
-
-Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadia-code/main/LICENSE) in the
-[microsoft/cascadia-code](https://github.com/microsoft/cascadia-code) repository for terms applicable to the fonts in this directory.
-
-### Fonts Included
-
-* Cascadia Code, Cascadia Mono (2102.25)
-   * from microsoft/cascadia-code@911dc421f333e3b72b97381d16fee5b71eb48f04

res/fonts/README.md

@@ -0,0 +1,12 @@
+# Windows Terminal and Console Assets (Fonts)
+
+The fonts in this directory do not fall under the same [license](https://raw.githubusercontent.com/microsoft/terminal/main/LICENSE) as the rest
+of the Windows Terminal code.
+
+Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadia-code/main/LICENSE) in the
+[microsoft/cascadia-code](https://github.com/microsoft/cascadia-code) repository for terms applicable to the fonts in this directory.
+
+### Fonts Included
+
+* Cascadia Code, Cascadia Mono (2106.17)
+   * from microsoft/cascadia-code@fb0bce69c1c12f6c298b8bc1c1d181868f5daa9a

samples/ConPTY/GUIConsole/GUIConsole.WPF/App.xaml

@@ -1,8 +1,6 @@
-<Application x:Class="GUIConsole.Wpf.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             StartupUri="MainWindow.xaml">
-    <Application.Resources>
-         
-    </Application.Resources>
-</Application>
+<Application x:Class="GUIConsole.Wpf.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources />
+</Application>

samples/ConPTY/GUIConsole/GUIConsole.WPF/MainWindow.xaml

@@ -1,84 +1,100 @@
-<Window x:Class="GUIConsole.Wpf.MainWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d"
-        
-        Title="MainWindow" Height="450" Width="800"
-        Background="#C7000000"
-        AllowsTransparency="True"
-        WindowStyle="None"
-        MouseDown="Window_MouseDown"
-        BorderThickness="1"
-        BorderBrush="LightSlateGray"
-        
-        KeyDown="Window_KeyDown"
-        Loaded="Window_Loaded">
-    <Window.Resources>
-        <Style x:Key="TitleBarButtonStyle" TargetType="{x:Type Button}">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="FontFamily" Value="Segoe MDL2 Assets"/>
-            <Setter Property="FontSize" Value="14"/>
-            <Setter Property="Height" Value="32"/>
-            <Setter Property="Width" Value="46"/>
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="Foreground" Value="White"/>
-            <Setter Property="BorderThickness" Value="0"/>
-        </Style>
-
-        <Style x:Key="CloseButtonStyle" TargetType="{x:Type Button}" BasedOn="{StaticResource TitleBarButtonStyle}">
-            <Setter Property="Content" Value="&#xE10A;"/>
-            <!--Remove the default Button template's Triggers, otherwise they'll override our trigger below.-->
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <Border Background="{TemplateBinding Background}">
-                            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        </Border>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Button.Background" Value="Red"/>
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-    </Window.Resources>
-    
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <Grid Grid.Row="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*"/>
-                <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-            <TextBlock x:Name="TitleBarTitle" Grid.Column="0" VerticalAlignment="Center" Padding="10 0" Foreground="White">
-                GUIConsole
-            </TextBlock>
-            <StackPanel x:Name="TitleBarButtons" Grid.Column="1" Orientation="Horizontal" VerticalAlignment="Top">
-                <Button x:Name="MinimizeButton"
-                        Click="MinimizeButton_Click"
-                        Content="&#xE108;"
-                        Style="{StaticResource TitleBarButtonStyle}"/>
-                <Button x:Name="MaximizeRestoreButton"
-                        Click="MaximizeRestoreButton_Click"
-                        Content="&#xE922;"
-                        FontSize="12"
-                        Style="{StaticResource TitleBarButtonStyle}"/>
-                <Button x:Name="CloseButton"
-                        Click="CloseButton_Click" 
-                        FontSize="12"
-                        Style="{StaticResource CloseButtonStyle}"/>
-            </StackPanel>
-        </Grid>
-        <ScrollViewer x:Name="TerminalHistoryViewer" Grid.Row="1" ScrollChanged="ScrollViewer_ScrollChanged">
-            <TextBlock x:Name="TerminalHistoryBlock" FontFamily="Consolas" TextWrapping="Wrap" Foreground="White"/>
-        </ScrollViewer>
-    </Grid>
-</Window>
+<Window x:Class="GUIConsole.Wpf.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        Title="MainWindow"
+        Width="800"
+        Height="450"
+        AllowsTransparency="True"
+        Background="#C7000000"
+        BorderBrush="LightSlateGray"
+        BorderThickness="1"
+        KeyDown="Window_KeyDown"
+        Loaded="Window_Loaded"
+        MouseDown="Window_MouseDown"
+        WindowStyle="None"
+        mc:Ignorable="d">
+    <Window.Resources>
+        <Style x:Key="TitleBarButtonStyle"
+               TargetType="{x:Type Button}">
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="Height" Value="32" />
+            <Setter Property="Width" Value="46" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="Foreground" Value="White" />
+            <Setter Property="BorderThickness" Value="0" />
+        </Style>
+
+        <Style x:Key="CloseButtonStyle"
+               BasedOn="{StaticResource TitleBarButtonStyle}"
+               TargetType="{x:Type Button}">
+            <Setter Property="Content" Value="&#xE10A;" />
+            <!--  Remove the default Button template's Triggers, otherwise they'll override our trigger below.  -->
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border Background="{TemplateBinding Background}">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center" />
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsMouseOver" Value="True">
+                    <Setter Property="Button.Background" Value="Red" />
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </Window.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <TextBlock x:Name="TitleBarTitle"
+                       Grid.Column="0"
+                       Padding="10,0"
+                       VerticalAlignment="Center"
+                       Foreground="White">
+                GUIConsole
+            </TextBlock>
+            <StackPanel x:Name="TitleBarButtons"
+                        Grid.Column="1"
+                        VerticalAlignment="Top"
+                        Orientation="Horizontal">
+                <Button x:Name="MinimizeButton"
+                        Click="MinimizeButton_Click"
+                        Content="&#xE108;"
+                        Style="{StaticResource TitleBarButtonStyle}" />
+                <Button x:Name="MaximizeRestoreButton"
+                        Click="MaximizeRestoreButton_Click"
+                        Content="&#xE922;"
+                        FontSize="12"
+                        Style="{StaticResource TitleBarButtonStyle}" />
+                <Button x:Name="CloseButton"
+                        Click="CloseButton_Click"
+                        FontSize="12"
+                        Style="{StaticResource CloseButtonStyle}" />
+            </StackPanel>
+        </Grid>
+        <ScrollViewer x:Name="TerminalHistoryViewer"
+                      Grid.Row="1"
+                      ScrollChanged="ScrollViewer_ScrollChanged">
+            <TextBlock x:Name="TerminalHistoryBlock"
+                       FontFamily="Consolas"
+                       Foreground="White"
+                       TextWrapping="Wrap" />
+        </ScrollViewer>
+    </Grid>
+</Window>

samples/PixelShaders/Outlines.hlsl

@@ -0,0 +1,66 @@
+// A minimal pixel shader that outlines text
+
+// The terminal graphics as a texture
+Texture2D shaderTexture;
+SamplerState samplerState;
+
+// Terminal settings such as the resolution of the texture
+cbuffer PixelShaderSettings {
+  // The number of seconds since the pixel shader was enabled
+  float  Time;
+  // UI Scale
+  float  Scale;
+  // Resolution of the shaderTexture
+  float2 Resolution;
+  // Background color as rgba
+  float4 Background;
+};
+
+// A pixel shader is a program that given a texture coordinate (tex) produces a color.
+// tex is an x,y tuple that ranges from 0,0 (top left) to 1,1 (bottom right).
+// Just ignore the pos parameter.
+float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
+{
+    // Read the color value at the current texture coordinate (tex)
+    //  float4 is tuple of 4 floats, rgba
+    float4 color = shaderTexture.Sample(samplerState, tex);
+
+    // Read the color value at some offset, will be used as shadow. For the best
+    // effect, read the colors offset on the left, right, top, bottom of this
+    // fragment, as well as on the corners of this fragment.
+    //
+    // You could get away with fewer samples, but the resulting outlines will be
+    // blurrier.
+
+    //left, right, top, bottom:
+    float4 leftColor   = shaderTexture.Sample(samplerState, tex+1.0*Scale*float2( 1.0,  0.0)/Resolution.y);
+    float4 rightColor  = shaderTexture.Sample(samplerState, tex+1.0*Scale*float2(-1.0,  0.0)/Resolution.y);
+    float4 topColor    = shaderTexture.Sample(samplerState, tex+1.0*Scale*float2( 0.0,  1.0)/Resolution.y);
+    float4 bottomColor = shaderTexture.Sample(samplerState, tex+1.0*Scale*float2( 0.0, -1.0)/Resolution.y);
+
+    // Corners
+    float4 topLeftColor     = shaderTexture.Sample(samplerState, tex+1.0*Scale*float2( 1.0,  1.0)/Resolution.y);
+    float4 topRightColor    = shaderTexture.Sample(samplerState, tex+1.0*Scale*float2(-1.0,  1.0)/Resolution.y);
+    float4 bottomLeftColor  = shaderTexture.Sample(samplerState, tex+1.0*Scale*float2( 1.0, -1.0)/Resolution.y);
+    float4 bottomRightColor = shaderTexture.Sample(samplerState, tex+1.0*Scale*float2(-1.0, -1.0)/Resolution.y);
+
+
+    // Now, if any of those adjacent cells has text in it, then the *color vec4
+    // will have a non-zero .w (which is used for alpha). Use that alpha value
+    // to add some black to the current fragment.
+    //
+    // This will result in only coloring fragments adjacent to text, but leaving
+    // background images (for example) untouched.
+    float3 outlineColor = float3(0, 0, 0);
+    float4 result = color;
+    result = result + float4(outlineColor, leftColor.w);
+    result = result + float4(outlineColor, rightColor.w);
+    result = result + float4(outlineColor, topColor.w);
+    result = result + float4(outlineColor, bottomColor.w);
+
+    result = result + float4(outlineColor, topLeftColor.w);
+    result = result + float4(outlineColor, topRightColor.w);
+    result = result + float4(outlineColor, bottomLeftColor.w);
+    result = result + float4(outlineColor, bottomRightColor.w);
+    return result;
+}

src/Terminal.wprp

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WindowsPerformanceRecorder Version="1.0" Author="Microsoft Corporation" Copyright="Microsoft Corporation" Company="Microsoft Corporation">
+  <Profiles>
+    <EventCollector Id="EventCollector_Terminal" Name="Terminal">
+      <BufferSize Value="64" />
+      <Buffers Value="4" />
+    </EventCollector>
+    <EventProvider Id="EventProvider_TerminalControl" Name="28c82e50-57af-5a86-c25b-e39cd990032b" />
+    <EventProvider Id="EventProvider_TerminalConnection" Name="e912fe7b-eeb6-52a5-c628-abe388e5f792" />
+    <EventProvider Id="EventProvider_TerminalSettingsModel" Name="be579944-4d33-5202-e5d6-a7a57f1935cb" />
+    <EventProvider Id="EventProvider_TerminalApp" Name="24a1622f-7da7-5c77-3303-d850bd1ab2ed" />
+    <EventProvider Id="EventProvider_TerminalWin32Host" Name="56c06166-2e2e-5f4d-7ff3-74f4b78c87d6" />
+    <EventProvider Id="EventProvider_TerminalRemoting" Name="d6f04aad-629f-539a-77c1-73f5c3e4aa7b" />
+    <EventProvider Id="EventProvider_TerminalDirectX" Name="c93e739e-ae50-5a14-78e7-f171e947535d" />
+    <Profile Id="Terminal.Verbose.File" Name="Terminal" Description="Terminal" LoggingMode="File" DetailLevel="Verbose">
+      <Collectors>
+        <EventCollectorId Value="EventCollector_Terminal">
+          <EventProviders>
+            <EventProviderId Value="EventProvider_TerminalControl" />
+            <EventProviderId Value="EventProvider_TerminalConnection" />
+            <EventProviderId Value="EventProvider_TerminalSettingsModel" />
+            <EventProviderId Value="EventProvider_TerminalApp" />
+            <EventProviderId Value="EventProvider_TerminalWin32Host" />
+            <EventProviderId Value="EventProvider_TerminalRemoting" />
+            <EventProviderId Value="EventProvider_TerminalDirectX" />
+          </EventProviders>
+        </EventCollectorId>
+      </Collectors>
+    </Profile>
+    <Profile Id="Terminal.Light.File" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="File" DetailLevel="Light" />
+    <Profile Id="Terminal.Verbose.Memory" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="Memory" DetailLevel="Verbose" />
+    <Profile Id="Terminal.Light.Memory" Name="Terminal" Description="Terminal" Base="Terminal.Verbose.File" LoggingMode="Memory" DetailLevel="Light" />
+  </Profiles>
+</WindowsPerformanceRecorder>

src/cascadia/CascadiaPackage/CascadiaPackage.wapproj

@@ -70,6 +70,7 @@
   <ItemGroup>
     <ProjectReference Include="..\WindowsTerminal\WindowsTerminal.vcxproj" />
     <ProjectReference Include="..\..\host\exe\Host.EXE.vcxproj" />
+    <ProjectReference Include="..\..\host\proxy\Host.Proxy.vcxproj" />
     <ProjectReference Include="..\TerminalAzBridge\TerminalAzBridge.vcxproj" />
     <ProjectReference Include="..\ShellExtension\WindowsTerminalShellExt.vcxproj" />
     <ProjectReference Include="..\wt\wt.vcxproj" />

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -73,9 +73,43 @@
                 <uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
               </uap3:AppExtensionHost>
         </uap3:Extension>
-
+        <uap3:Extension Category="windows.appExtension">
+            <uap3:AppExtension Name="com.microsoft.windows.console.host"
+                Id="OpenConsole-Dev"
+                DisplayName="OpenConsole Dev"
+                Description="Console host built from microsoft/terminal open source repository"
+                PublicFolder="Public">
+                <uap3:Properties>
+                    <Clsid>{1F9F2BF5-5BC3-4F17-B0E6-912413F1F451}</Clsid>
+                </uap3:Properties>
+            </uap3:AppExtension>
+        </uap3:Extension>
+        <uap3:Extension Category="windows.appExtension">
+            <uap3:AppExtension Name="com.microsoft.windows.terminal.host"
+                Id="Terminal-Dev"
+                DisplayName="Windows Terminal Dev"
+                Description="Terminal host built from microsoft/terminal open source repository"
+                PublicFolder="Public">
+                <uap3:Properties>
+                    <Clsid>{051F34EE-C1FD-4B19-AF75-9BA54648434C}</Clsid>
+                </uap3:Properties>
+            </uap3:AppExtension>
+        </uap3:Extension>
+        <com:Extension Category="windows.comInterface">
+            <com:ComInterface>
+                <com:ProxyStub Id="DEC4804D-56D1-4F73-9FBE-6828E7C85C56" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
+                <com:Interface Id="2B607BC1-43EB-40C3-95AE-2856ADDB7F23" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
+                <com:Interface Id="FA1E3AB4-9AEC-4A3C-96CA-E6078C30BD74" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/>
+            </com:ComInterface>
+        </com:Extension>
         <com:Extension Category="windows.comServer">
             <com:ComServer>
+                <com:ExeServer DisplayName="OpenConsole" Executable="OpenConsole.exe">
+                    <com:Class Id="1F9F2BF5-5BC3-4F17-B0E6-912413F1F451"/>
+                </com:ExeServer>
+                <com:ExeServer DisplayName="WindowsTerminal" Executable="WindowsTerminal.exe">
+                    <com:Class Id="051F34EE-C1FD-4B19-AF75-9BA54648434C"/>
+                </com:ExeServer>
                 <com:SurrogateServer DisplayName="WindowsTerminalShellExt">
                     <com:Class Id="52065414-e077-47ec-a3ac-1cc5455e1b54" Path="WindowsTerminalShellExt.dll" ThreadingModel="STA"/>
                 </com:SurrogateServer>

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -74,8 +74,45 @@
             Enabled="false"
             DisplayName="ms-resource:AppNamePre" />
         </uap5:Extension>
+        <!-- DISABLED FOR 1.8
+        <uap3:Extension Category="windows.appExtension">
+            <uap3:AppExtension Name="com.microsoft.windows.console.host"
+                Id="OpenConsole-Pre"
+                DisplayName="OpenConsole Preview"
+                Description="Console host built from microsoft/terminal open source repository"
+                PublicFolder="Public">
+                <uap3:Properties>
+                    <Clsid>{06EC847C-C0A5-46B8-92CB-7C92F6E35CD5}</Clsid>
+                </uap3:Properties>
+            </uap3:AppExtension>
+        </uap3:Extension>
+        <uap3:Extension Category="windows.appExtension">
+            <uap3:AppExtension Name="com.microsoft.windows.terminal.host"
+                Id="Terminal-Pre"
+                DisplayName="Windows Terminal Preview"
+                Description="Terminal host built from microsoft/terminal open source repository"
+                PublicFolder="Public">
+                <uap3:Properties>
+                    <Clsid>{86633F1F-6454-40EC-89CE-DA4EBA977EE2}</Clsid>
+                </uap3:Properties>
+            </uap3:AppExtension>
+        </uap3:Extension>
+        -->
+        <com:Extension Category="windows.comInterface">
+            <com:ComInterface>
+                <com:ProxyStub Id="1833E661-CC81-4DD0-87C6-C2F74BD39EFA" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
+                <com:Interface Id="2B607BC1-43EB-40C3-95AE-2856ADDB7F23" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/>
+                <com:Interface Id="FA1E3AB4-9AEC-4A3C-96CA-E6078C30BD74" ProxyStubClsid="1833E661-CC81-4DD0-87C6-C2F74BD39EFA"/>
+            </com:ComInterface>
+        </com:Extension>
         <com:Extension Category="windows.comServer">
             <com:ComServer>
+                <com:ExeServer DisplayName="OpenConsole" Executable="OpenConsole.exe">
+                    <com:Class Id="06EC847C-C0A5-46B8-92CB-7C92F6E35CD5"/>
+                </com:ExeServer>
+                <com:ExeServer DisplayName="WindowsTerminal" Executable="WindowsTerminal.exe">
+                    <com:Class Id="86633F1F-6454-40EC-89CE-DA4EBA977EE2"/>
+                </com:ExeServer>
                 <com:SurrogateServer DisplayName="WindowsTerminalShellExt">
                     <com:Class Id="02db545a-3e20-46de-83a5-1329b1e88b6b" Path="WindowsTerminalShellExt.dll" ThreadingModel="STA"/>
                 </com:SurrogateServer>
@@ -105,8 +142,10 @@
   <Extensions>
     <uap7:Extension Category="windows.sharedFonts">
       <uap7:SharedFonts>
-        <uap4:Font File="Cascadia.ttf" />
+        <uap4:Font File="CascadiaCode.ttf" />
+        <uap4:Font File="CascadiaCodeItalic.ttf" />
         <uap4:Font File="CascadiaMono.ttf" />
+        <uap4:Font File="CascadiaMonoItalic.ttf" />
       </uap7:SharedFonts>
     </uap7:Extension>
   </Extensions>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -74,9 +74,43 @@
             Enabled="false"
             DisplayName="ms-resource:AppName" />
         </uap5:Extension>
-
+        <!-- <uap3:Extension Category="windows.appExtension">
+            <uap3:AppExtension Name="com.microsoft.windows.console.host"
+                Id="OpenConsole"
+                DisplayName="OpenConsole"
+                Description="Console host built from microsoft/terminal open source repository"
+                PublicFolder="Public">
+                <uap3:Properties>
+                    <Clsid>{2EACA947-7F5F-4CFA-BA87-8F7FBEEFBE69}</Clsid>
+                </uap3:Properties>
+            </uap3:AppExtension>
+        </uap3:Extension>
+        <uap3:Extension Category="windows.appExtension">
+            <uap3:AppExtension Name="com.microsoft.windows.terminal.host"
+                Id="Terminal"
+                DisplayName="Windows Terminal"
+                Description="Terminal host built from microsoft/terminal open source repository"
+                PublicFolder="Public">
+                <uap3:Properties>
+                    <Clsid>{E12CFF52-A866-4C77-9A90-F570A7AA2C6B}</Clsid>
+                </uap3:Properties>
+            </uap3:AppExtension>
+        </uap3:Extension>
+        <com:Extension Category="windows.comInterface">
+            <com:ComInterface>
+                <com:ProxyStub Id="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/>
+                <com:Interface Id="2B607BC1-43EB-40C3-95AE-2856ADDB7F23" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
+                <com:Interface Id="FA1E3AB4-9AEC-4A3C-96CA-E6078C30BD74" ProxyStubClsid="3171DE52-6EFA-4AEF-8A9F-D02BD67E7A4F"/>
+            </com:ComInterface>
+        </com:Extension> -->
         <com:Extension Category="windows.comServer">
             <com:ComServer>
+                <!-- <com:ExeServer DisplayName="OpenConsole" Executable="OpenConsole.exe">
+                    <com:Class Id="2EACA947-7F5F-4CFA-BA87-8F7FBEEFBE69"/>
+                </com:ExeServer>
+                <com:ExeServer DisplayName="WindowsTerminal" Executable="WindowsTerminal.exe">
+                    <com:Class Id="E12CFF52-A866-4C77-9A90-F570A7AA2C6B"/>
+                </com:ExeServer> -->
                 <com:SurrogateServer DisplayName="WindowsTerminalShellExt">
                     <com:Class Id="9f156763-7844-4dc4-b2b1-901f640f5155" Path="WindowsTerminalShellExt.dll" ThreadingModel="STA"/>
                 </com:SurrogateServer>
@@ -106,8 +140,10 @@
   <Extensions>
     <uap7:Extension Category="windows.sharedFonts">
       <uap7:SharedFonts>
-        <uap4:Font File="Cascadia.ttf" />
+        <uap4:Font File="CascadiaCode.ttf" />
+        <uap4:Font File="CascadiaCodeItalic.ttf" />
         <uap4:Font File="CascadiaMono.ttf" />
+        <uap4:Font File="CascadiaMonoItalic.ttf" />
       </uap7:SharedFonts>
     </uap7:Extension>
   </Extensions>

src/cascadia/CascadiaResources.build.items

@@ -12,13 +12,9 @@
       <Link>Images\%(RecursiveDir)%(FileName)%(Extension)</Link>
     </Content>
     <!-- Fonts -->
-    <Content Include="$(OpenConsoleDir)res\Cascadia.ttf" Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
+    <Content Include="$(OpenConsoleDir)res\fonts\*.ttf" Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
       <DeploymentContent>true</DeploymentContent>
-      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
-    </Content>
-    <Content Include="$(OpenConsoleDir)res\CascadiaMono.ttf" Condition="'$(WindowsTerminalOfficialBuild)'=='true'">
-      <DeploymentContent>true</DeploymentContent>
-      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <Link>%(FileName)%(Extension)</Link>
     </Content>
     <!-- Profile Icons -->
     <Content Include="$(OpenConsoleDir)src\cascadia\CascadiaPackage\ProfileIcons\**\*">

src/cascadia/LocalTests_SettingsModel/ColorSchemeTests.cpp

@@ -338,34 +338,34 @@ namespace SettingsModelLocalTests
 
         // verify profile defaults
         Log::Comment(L"Profile Defaults");
-        VERIFY_ARE_EQUAL(newName, settings->ProfileDefaults().ColorSchemeName());
-        VERIFY_IS_TRUE(settings->ProfileDefaults().HasColorSchemeName());
+        VERIFY_ARE_EQUAL(newName, settings->ProfileDefaults().DefaultAppearance().ColorSchemeName());
+        VERIFY_IS_TRUE(settings->ProfileDefaults().DefaultAppearance().HasColorSchemeName());
 
         // verify all other profiles
         const auto& profiles{ settings->AllProfiles() };
         {
             const auto& prof{ profiles.GetAt(0) };
             Log::Comment(prof.Name().c_str());
-            VERIFY_ARE_EQUAL(newName, prof.ColorSchemeName());
-            VERIFY_IS_TRUE(prof.HasColorSchemeName());
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().ColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasColorSchemeName());
         }
         {
             const auto& prof{ profiles.GetAt(1) };
             Log::Comment(prof.Name().c_str());
-            VERIFY_ARE_EQUAL(newName, prof.ColorSchemeName());
-            VERIFY_IS_TRUE(prof.HasColorSchemeName());
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().ColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasColorSchemeName());
         }
         {
             const auto& prof{ profiles.GetAt(2) };
             Log::Comment(prof.Name().c_str());
-            VERIFY_ARE_EQUAL(newName, prof.ColorSchemeName());
-            VERIFY_IS_FALSE(prof.HasColorSchemeName());
+            VERIFY_ARE_EQUAL(newName, prof.DefaultAppearance().ColorSchemeName());
+            VERIFY_IS_FALSE(prof.DefaultAppearance().HasColorSchemeName());
         }
         {
             const auto& prof{ profiles.GetAt(3) };
             Log::Comment(prof.Name().c_str());
-            VERIFY_ARE_EQUAL(L"Scheme 2", prof.ColorSchemeName());
-            VERIFY_IS_TRUE(prof.HasColorSchemeName());
+            VERIFY_ARE_EQUAL(L"Scheme 2", prof.DefaultAppearance().ColorSchemeName());
+            VERIFY_IS_TRUE(prof.DefaultAppearance().HasColorSchemeName());
         }
     }
 }

src/cascadia/LocalTests_SettingsModel/CommandTests.cpp

@@ -9,7 +9,7 @@
 
 using namespace Microsoft::Console;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;

src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp

@@ -15,7 +15,7 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 
 namespace SettingsModelLocalTests
 {
@@ -1311,9 +1311,9 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(3u, settings->_allProfiles.Size());
         VERIFY_ARE_EQUAL(2u, settings->_globals->ColorSchemes().Size());
 
-        VERIFY_ARE_EQUAL(L"schemeOne", settings->_allProfiles.GetAt(0).ColorSchemeName());
-        VERIFY_ARE_EQUAL(L"InvalidSchemeName", settings->_allProfiles.GetAt(1).ColorSchemeName());
-        VERIFY_ARE_EQUAL(L"Campbell", settings->_allProfiles.GetAt(2).ColorSchemeName());
+        VERIFY_ARE_EQUAL(L"schemeOne", settings->_allProfiles.GetAt(0).DefaultAppearance().ColorSchemeName());
+        VERIFY_ARE_EQUAL(L"InvalidSchemeName", settings->_allProfiles.GetAt(1).DefaultAppearance().ColorSchemeName());
+        VERIFY_ARE_EQUAL(L"Campbell", settings->_allProfiles.GetAt(2).DefaultAppearance().ColorSchemeName());
 
         settings->_ValidateAllSchemesExist();
 
@@ -1323,9 +1323,9 @@ namespace SettingsModelLocalTests
         VERIFY_ARE_EQUAL(3u, settings->_allProfiles.Size());
         VERIFY_ARE_EQUAL(2u, settings->_globals->ColorSchemes().Size());
 
-        VERIFY_ARE_EQUAL(L"schemeOne", settings->_allProfiles.GetAt(0).ColorSchemeName());
-        VERIFY_ARE_EQUAL(L"Campbell", settings->_allProfiles.GetAt(1).ColorSchemeName());
-        VERIFY_ARE_EQUAL(L"Campbell", settings->_allProfiles.GetAt(2).ColorSchemeName());
+        VERIFY_ARE_EQUAL(L"schemeOne", settings->_allProfiles.GetAt(0).DefaultAppearance().ColorSchemeName());
+        VERIFY_ARE_EQUAL(L"Campbell", settings->_allProfiles.GetAt(1).DefaultAppearance().ColorSchemeName());
+        VERIFY_ARE_EQUAL(L"Campbell", settings->_allProfiles.GetAt(2).DefaultAppearance().ColorSchemeName());
     }
 
     void DeserializationTests::ValidateColorSchemeInCommands()
@@ -1543,7 +1543,7 @@ namespace SettingsModelLocalTests
         settings->_ParseJsonString(settingsJson, false);
         settings->LayerJson(settings->_userSettings);
         VERIFY_ARE_NOT_EQUAL(0u, settings->_allProfiles.Size());
-        VERIFY_ARE_EQUAL(expectedPath, settings->_allProfiles.GetAt(0).ExpandedBackgroundImagePath());
+        VERIFY_ARE_EQUAL(expectedPath, settings->_allProfiles.GetAt(0).DefaultAppearance().ExpandedBackgroundImagePath());
     }
     void DeserializationTests::TestProfileBackgroundImageWithDesktopWallpaper()
     {
@@ -1564,8 +1564,8 @@ namespace SettingsModelLocalTests
         auto settings = winrt::make_self<implementation::CascadiaSettings>();
         settings->_ParseJsonString(settingsJson, false);
         settings->LayerJson(settings->_userSettings);
-        VERIFY_ARE_EQUAL(expectedBackgroundImagePath, settings->_allProfiles.GetAt(0).BackgroundImagePath());
-        VERIFY_ARE_NOT_EQUAL(expectedBackgroundImagePath, settings->_allProfiles.GetAt(0).ExpandedBackgroundImagePath());
+        VERIFY_ARE_EQUAL(expectedBackgroundImagePath, settings->_allProfiles.GetAt(0).DefaultAppearance().BackgroundImagePath());
+        VERIFY_ARE_NOT_EQUAL(expectedBackgroundImagePath, settings->_allProfiles.GetAt(0).DefaultAppearance().ExpandedBackgroundImagePath());
     }
     void DeserializationTests::TestCloseOnExitParsing()
     {

src/cascadia/LocalTests_SettingsModel/KeyBindingsTests.cpp

@@ -11,7 +11,7 @@
 
 using namespace Microsoft::Console;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;

src/cascadia/LocalTests_SettingsModel/ProfileTests.cpp

@@ -117,14 +117,14 @@ namespace SettingsModelLocalTests
         const auto profile2Json = VerifyParseSucceeded(profile2String);
 
         auto profile0 = implementation::Profile::FromJson(profile0Json);
-        VERIFY_IS_NOT_NULL(profile0->Foreground());
-        VERIFY_ARE_EQUAL(til::color(0, 0, 0), til::color{ profile0->Foreground().Value() });
+        VERIFY_IS_NOT_NULL(profile0->DefaultAppearance().Foreground());
+        VERIFY_ARE_EQUAL(til::color(0, 0, 0), til::color{ profile0->DefaultAppearance().Foreground().Value() });
 
-        VERIFY_IS_NOT_NULL(profile0->Background());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->Background().Value() });
+        VERIFY_IS_NOT_NULL(profile0->DefaultAppearance().Background());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->DefaultAppearance().Background().Value() });
 
-        VERIFY_IS_NOT_NULL(profile0->SelectionBackground());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->SelectionBackground().Value() });
+        VERIFY_IS_NOT_NULL(profile0->DefaultAppearance().SelectionBackground());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile0->DefaultAppearance().SelectionBackground().Value() });
 
         VERIFY_ARE_EQUAL(L"profile0", profile0->Name());
 
@@ -135,14 +135,14 @@ namespace SettingsModelLocalTests
         auto profile1{ profile0->CreateChild() };
         profile1->LayerJson(profile1Json);
 
-        VERIFY_IS_NOT_NULL(profile1->Foreground());
-        VERIFY_ARE_EQUAL(til::color(2, 2, 2), til::color{ profile1->Foreground().Value() });
+        VERIFY_IS_NOT_NULL(profile1->DefaultAppearance().Foreground());
+        VERIFY_ARE_EQUAL(til::color(2, 2, 2), til::color{ profile1->DefaultAppearance().Foreground().Value() });
 
-        VERIFY_IS_NOT_NULL(profile1->Background());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile1->Background().Value() });
+        VERIFY_IS_NOT_NULL(profile1->DefaultAppearance().Background());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile1->DefaultAppearance().Background().Value() });
 
-        VERIFY_IS_NOT_NULL(profile1->Background());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile1->Background().Value() });
+        VERIFY_IS_NOT_NULL(profile1->DefaultAppearance().Background());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile1->DefaultAppearance().Background().Value() });
 
         VERIFY_ARE_EQUAL(L"profile1", profile1->Name());
 
@@ -154,14 +154,14 @@ namespace SettingsModelLocalTests
         auto profile2{ profile1->CreateChild() };
         profile2->LayerJson(profile2Json);
 
-        VERIFY_IS_NOT_NULL(profile2->Foreground());
-        VERIFY_ARE_EQUAL(til::color(3, 3, 3), til::color{ profile2->Foreground().Value() });
+        VERIFY_IS_NOT_NULL(profile2->DefaultAppearance().Foreground());
+        VERIFY_ARE_EQUAL(til::color(3, 3, 3), til::color{ profile2->DefaultAppearance().Foreground().Value() });
 
-        VERIFY_IS_NOT_NULL(profile2->Background());
-        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile2->Background().Value() });
+        VERIFY_IS_NOT_NULL(profile2->DefaultAppearance().Background());
+        VERIFY_ARE_EQUAL(til::color(1, 1, 1), til::color{ profile2->DefaultAppearance().Background().Value() });
 
-        VERIFY_IS_NOT_NULL(profile2->SelectionBackground());
-        VERIFY_ARE_EQUAL(til::color(2, 2, 2), til::color{ profile2->SelectionBackground().Value() });
+        VERIFY_IS_NOT_NULL(profile2->DefaultAppearance().SelectionBackground());
+        VERIFY_ARE_EQUAL(til::color(2, 2, 2), til::color{ profile2->DefaultAppearance().SelectionBackground().Value() });
 
         VERIFY_ARE_EQUAL(L"profile2", profile2->Name());
 

src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp

@@ -15,7 +15,7 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 
 namespace SettingsModelLocalTests
 {

src/cascadia/LocalTests_SettingsModel/SettingsModel.LocalTests.vcxproj

@@ -40,6 +40,7 @@
     <ClCompile Include="CommandTests.cpp" />
     <ClCompile Include="DeserializationTests.cpp" />
     <ClCompile Include="SerializationTests.cpp" />
+    <ClCompile Include="TerminalSettingsTests.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
@@ -57,7 +58,7 @@
 
     <!-- If you don't reference these projects here, the
     _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />
   </ItemGroup>

src/cascadia/LocalTests_SettingsModel/TerminalSettingsTests.cpp

@@ -0,0 +1,556 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#include "pch.h"
+
+#include "../TerminalSettingsModel/CascadiaSettings.h"
+#include "../TerminalSettingsModel/TerminalSettings.h"
+#include "TestUtils.h"
+
+using namespace Microsoft::Console;
+using namespace WEX::Logging;
+using namespace WEX::TestExecution;
+using namespace WEX::Common;
+using namespace winrt::Microsoft::Terminal::Settings::Model;
+using namespace winrt::Microsoft::Terminal::Control;
+
+namespace SettingsModelLocalTests
+{
+    // TODO:microsoft/terminal#3838:
+    // Unfortunately, these tests _WILL NOT_ work in our CI. We're waiting for
+    // an updated TAEF that will let us install framework packages when the test
+    // package is deployed. Until then, these tests won't deploy in CI.
+
+    class TerminalSettingsTests
+    {
+        // Use a custom AppxManifest to ensure that we can activate winrt types
+        // from our test. This property will tell taef to manually use this as
+        // the AppxManifest for this test class.
+        // This does not yet work for anything XAML-y. See TabTests.cpp for more
+        // details on that.
+        BEGIN_TEST_CLASS(TerminalSettingsTests)
+            TEST_CLASS_PROPERTY(L"RunAs", L"UAP")
+            TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
+        END_TEST_CLASS()
+
+        TEST_METHOD(TryCreateWinRTType);
+
+        TEST_METHOD(TestTerminalArgsForBinding);
+
+        TEST_METHOD(MakeSettingsForProfileThatDoesntExist);
+        TEST_METHOD(MakeSettingsForDefaultProfileThatDoesntExist);
+
+        TEST_METHOD(TestLayerProfileOnColorScheme);
+
+        TEST_CLASS_SETUP(ClassSetup)
+        {
+            return true;
+        }
+    };
+
+    void TerminalSettingsTests::TryCreateWinRTType()
+    {
+        TerminalSettings settings;
+        VERIFY_IS_NOT_NULL(settings);
+        auto oldFontSize = settings.FontSize();
+        settings.FontSize(oldFontSize + 5);
+        auto newFontSize = settings.FontSize();
+        VERIFY_ARE_NOT_EQUAL(oldFontSize, newFontSize);
+    }
+
+    void TerminalSettingsTests::TestTerminalArgsForBinding()
+    {
+        const std::string settingsJson{ R"(
+        {
+            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+            "profiles": [
+                {
+                    "name": "profile0",
+                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
+                    "historySize": 1,
+                    "commandline": "cmd.exe"
+                },
+                {
+                    "name": "profile1",
+                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+                    "historySize": 2,
+                    "commandline": "pwsh.exe"
+                },
+                {
+                    "name": "profile2",
+                    "historySize": 3,
+                    "commandline": "wsl.exe"
+                }
+            ],
+            "keybindings": [
+                { "keys": ["ctrl+a"], "command": { "action": "splitPane", "split": "vertical" } },
+                { "keys": ["ctrl+b"], "command": { "action": "splitPane", "split": "vertical", "profile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}" } },
+                { "keys": ["ctrl+c"], "command": { "action": "splitPane", "split": "vertical", "profile": "profile1" } },
+                { "keys": ["ctrl+d"], "command": { "action": "splitPane", "split": "vertical", "profile": "profile2" } },
+                { "keys": ["ctrl+e"], "command": { "action": "splitPane", "split": "horizontal", "commandline": "foo.exe" } },
+                { "keys": ["ctrl+f"], "command": { "action": "splitPane", "split": "horizontal", "profile": "profile1", "commandline": "foo.exe" } },
+                { "keys": ["ctrl+g"], "command": { "action": "newTab" } },
+                { "keys": ["ctrl+h"], "command": { "action": "newTab", "startingDirectory": "c:\\foo" } },
+                { "keys": ["ctrl+i"], "command": { "action": "newTab", "profile": "profile2", "startingDirectory": "c:\\foo" } },
+                { "keys": ["ctrl+j"], "command": { "action": "newTab", "tabTitle": "bar" } },
+                { "keys": ["ctrl+k"], "command": { "action": "newTab", "profile": "profile2", "tabTitle": "bar" } },
+                { "keys": ["ctrl+l"], "command": { "action": "newTab", "profile": "profile1", "tabTitle": "bar", "startingDirectory": "c:\\foo", "commandline":"foo.exe" } }
+            ]
+        })" };
+
+        const winrt::guid guid0{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}") };
+        const winrt::guid guid1{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}") };
+
+        CascadiaSettings settings{ til::u8u16(settingsJson) };
+
+        auto keymap = settings.GlobalSettings().KeyMap();
+        VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
+
+        const auto profile2Guid = settings.ActiveProfiles().GetAt(2).Guid();
+        VERIFY_ARE_NOT_EQUAL(winrt::guid{}, profile2Guid);
+
+        VERIFY_ARE_EQUAL(12u, keymap.Size());
+
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('A') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid0, guid);
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('B') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}", realArgs.TerminalArgs().Profile());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid1, guid);
+            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid1, guid);
+            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(profile2Guid, guid);
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"foo.exe", realArgs.TerminalArgs().Commandline());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid0, guid);
+            VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
+            VERIFY_ARE_EQUAL(L"foo.exe", realArgs.TerminalArgs().Commandline());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid1, guid);
+            VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid0, guid);
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"c:\\foo", realArgs.TerminalArgs().StartingDirectory());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid0, guid);
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
+            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('I') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"c:\\foo", realArgs.TerminalArgs().StartingDirectory());
+            VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(profile2Guid, guid);
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
+            VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('J') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid0, guid);
+            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
+            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('K') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
+            VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(profile2Guid, guid);
+            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
+            VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
+        }
+        {
+            KeyChord kc{ true, false, false, static_cast<int32_t>('L') };
+            auto actionAndArgs = ::TestUtils::GetActionAndArgs(keymap, kc);
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
+            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(realArgs);
+            // Verify the args have the expected value
+            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
+            VERIFY_ARE_EQUAL(L"foo.exe", realArgs.TerminalArgs().Commandline());
+            VERIFY_ARE_EQUAL(L"c:\\foo", realArgs.TerminalArgs().StartingDirectory());
+            VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
+            VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
+
+            const auto guid{ settings.GetProfileForArgs(realArgs.TerminalArgs()) };
+            const auto settingsStruct{ TerminalSettings::CreateWithNewTerminalArgs(settings, realArgs.TerminalArgs(), nullptr) };
+            const auto termSettings = settingsStruct.DefaultSettings();
+            VERIFY_ARE_EQUAL(guid1, guid);
+            VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
+            VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
+            VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
+            VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
+        }
+    }
+
+    void TerminalSettingsTests::MakeSettingsForProfileThatDoesntExist()
+    {
+        // Test that making settings throws when the GUID doesn't exist
+        const std::string settingsString{ R"(
+        {
+            "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+            "profiles": [
+                {
+                    "name" : "profile0",
+                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+                    "historySize": 1
+                },
+                {
+                    "name" : "profile1",
+                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
+                    "historySize": 2
+                }
+            ]
+        })" };
+        CascadiaSettings settings{ til::u8u16(settingsString) };
+
+        const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
+        const auto guid2 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
+        const auto guid3 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-3333-49a3-80bd-e8fdd045185c}");
+
+        try
+        {
+            auto terminalSettings{ TerminalSettings::CreateWithProfileByID(settings, guid1, nullptr) };
+            VERIFY_ARE_NOT_EQUAL(nullptr, terminalSettings);
+            VERIFY_ARE_EQUAL(1, terminalSettings.DefaultSettings().HistorySize());
+        }
+        catch (...)
+        {
+            VERIFY_IS_TRUE(false, L"This call to CreateWithProfileByID should succeed");
+        }
+
+        try
+        {
+            auto terminalSettings{ TerminalSettings::CreateWithProfileByID(settings, guid2, nullptr) };
+            VERIFY_ARE_NOT_EQUAL(nullptr, terminalSettings);
+            VERIFY_ARE_EQUAL(2, terminalSettings.DefaultSettings().HistorySize());
+        }
+        catch (...)
+        {
+            VERIFY_IS_TRUE(false, L"This call to CreateWithProfileByID should succeed");
+        }
+
+        VERIFY_THROWS(auto terminalSettings = TerminalSettings::CreateWithProfileByID(settings, guid3, nullptr), wil::ResultException, L"This call to constructor should fail");
+
+        try
+        {
+            const auto termSettings{ TerminalSettings::CreateWithNewTerminalArgs(settings, nullptr, nullptr) };
+            VERIFY_ARE_NOT_EQUAL(nullptr, termSettings);
+            VERIFY_ARE_EQUAL(1, termSettings.DefaultSettings().HistorySize());
+        }
+        catch (...)
+        {
+            VERIFY_IS_TRUE(false, L"This call to CreateWithNewTerminalArgs should succeed");
+        }
+    }
+
+    void TerminalSettingsTests::MakeSettingsForDefaultProfileThatDoesntExist()
+    {
+        // Test that MakeSettings _doesnt_ throw when we load settings with a
+        // defaultProfile that's not in the list, we validate the settings, and
+        // then call MakeSettings(nullopt). The validation should ensure that
+        // the default profile is something reasonable
+        const std::string settingsString{ R"(
+        {
+            "defaultProfile": "{6239a42c-3333-49a3-80bd-e8fdd045185c}",
+            "profiles": [
+                {
+                    "name" : "profile0",
+                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
+                    "historySize": 1
+                },
+                {
+                    "name" : "profile1",
+                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
+                    "historySize": 2
+                }
+            ]
+        })" };
+        CascadiaSettings settings{ til::u8u16(settingsString) };
+
+        VERIFY_ARE_EQUAL(2u, settings.Warnings().Size());
+        VERIFY_ARE_EQUAL(2u, settings.ActiveProfiles().Size());
+        VERIFY_ARE_EQUAL(settings.GlobalSettings().DefaultProfile(), settings.ActiveProfiles().GetAt(0).Guid());
+        try
+        {
+            const auto termSettings{ TerminalSettings::CreateWithNewTerminalArgs(settings, nullptr, nullptr) };
+            VERIFY_ARE_NOT_EQUAL(nullptr, termSettings);
+            VERIFY_ARE_EQUAL(1, termSettings.DefaultSettings().HistorySize());
+        }
+        catch (...)
+        {
+            VERIFY_IS_TRUE(false, L"This call to CreateWithNewTerminalArgs should succeed");
+        }
+    }
+
+    void TerminalSettingsTests::TestLayerProfileOnColorScheme()
+    {
+        Log::Comment(NoThrowString().Format(
+            L"Ensure that setting (or not) a property in the profile that should override a property of the color scheme works correctly."));
+
+        const std::string settings0String{ R"(
+        {
+            "defaultProfile": "profile5",
+            "profiles": [
+                {
+                    "name" : "profile0",
+                    "colorScheme": "schemeWithCursorColor"
+                },
+                {
+                    "name" : "profile1",
+                    "colorScheme": "schemeWithoutCursorColor"
+                },
+                {
+                    "name" : "profile2",
+                    "colorScheme": "schemeWithCursorColor",
+                    "cursorColor": "#234567"
+                },
+                {
+                    "name" : "profile3",
+                    "colorScheme": "schemeWithoutCursorColor",
+                    "cursorColor": "#345678"
+                },
+                {
+                    "name" : "profile4",
+                    "cursorColor": "#456789"
+                },
+                {
+                    "name" : "profile5"
+                }
+            ],
+            "schemes": [
+                {
+                    "name": "schemeWithCursorColor",
+                    "cursorColor": "#123456"
+                },
+                {
+                    "name": "schemeWithoutCursorColor"
+                }
+            ]
+        })" };
+
+        CascadiaSettings settings{ til::u8u16(settings0String) };
+
+        VERIFY_ARE_EQUAL(6u, settings.ActiveProfiles().Size());
+        VERIFY_ARE_EQUAL(2u, settings.GlobalSettings().ColorSchemes().Size());
+
+        auto createTerminalSettings = [&](const auto& profile, const auto& schemes) {
+            auto terminalSettings{ winrt::make_self<implementation::TerminalSettings>() };
+            terminalSettings->_ApplyProfileSettings(profile);
+            terminalSettings->_ApplyAppearanceSettings(profile.DefaultAppearance(), schemes);
+            return terminalSettings;
+        };
+
+        auto terminalSettings0 = createTerminalSettings(settings.ActiveProfiles().GetAt(0), settings.GlobalSettings().ColorSchemes());
+        auto terminalSettings1 = createTerminalSettings(settings.ActiveProfiles().GetAt(1), settings.GlobalSettings().ColorSchemes());
+        auto terminalSettings2 = createTerminalSettings(settings.ActiveProfiles().GetAt(2), settings.GlobalSettings().ColorSchemes());
+        auto terminalSettings3 = createTerminalSettings(settings.ActiveProfiles().GetAt(3), settings.GlobalSettings().ColorSchemes());
+        auto terminalSettings4 = createTerminalSettings(settings.ActiveProfiles().GetAt(4), settings.GlobalSettings().ColorSchemes());
+        auto terminalSettings5 = createTerminalSettings(settings.ActiveProfiles().GetAt(5), settings.GlobalSettings().ColorSchemes());
+
+        VERIFY_ARE_EQUAL(ARGB(0, 0x12, 0x34, 0x56), terminalSettings0->CursorColor()); // from color scheme
+        VERIFY_ARE_EQUAL(DEFAULT_CURSOR_COLOR, terminalSettings1->CursorColor()); // default
+        VERIFY_ARE_EQUAL(ARGB(0, 0x23, 0x45, 0x67), terminalSettings2->CursorColor()); // from profile (trumps color scheme)
+        VERIFY_ARE_EQUAL(ARGB(0, 0x34, 0x56, 0x78), terminalSettings3->CursorColor()); // from profile (not set in color scheme)
+        VERIFY_ARE_EQUAL(ARGB(0, 0x45, 0x67, 0x89), terminalSettings4->CursorColor()); // from profile (no color scheme)
+        VERIFY_ARE_EQUAL(DEFAULT_CURSOR_COLOR, terminalSettings5->CursorColor()); // default
+    }
+}

src/cascadia/LocalTests_SettingsModel/TestUtils.h

@@ -24,18 +24,18 @@ public:
     // Return Value:
     // - The ActionAndArgs bound to the given key, or nullptr if nothing is bound to it.
     static const winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs GetActionAndArgs(const winrt::Microsoft::Terminal::Settings::Model::KeyMapping& keymap,
-                                                                                             const winrt::Microsoft::Terminal::TerminalControl::KeyChord& kc)
+                                                                                             const winrt::Microsoft::Terminal::Control::KeyChord& kc)
     {
         std::wstring buffer{ L"" };
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Ctrl))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Control::KeyModifiers::Ctrl))
         {
             buffer += L"Ctrl+";
         }
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Shift))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Control::KeyModifiers::Shift))
         {
             buffer += L"Shift+";
         }
-        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::TerminalControl::KeyModifiers::Alt))
+        if (WI_IsFlagSet(kc.Modifiers(), winrt::Microsoft::Terminal::Control::KeyModifiers::Alt))
         {
             buffer += L"Alt+";
         }

src/cascadia/LocalTests_SettingsModel/pch.h

@@ -56,6 +56,8 @@ Author(s):
 
 #include <winrt/Microsoft.UI.Xaml.Controls.h>
 
+#include <winrt/Microsoft.Terminal.Core.h>
+
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"
 

src/cascadia/LocalTests_TerminalApp/CommandlineTest.cpp

@@ -458,6 +458,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NULL(myArgs.TerminalArgs().TabColor());
             VERIFY_IS_NULL(myArgs.TerminalArgs().ProfileIndex());
             VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -479,6 +480,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NULL(myArgs.TerminalArgs().ProfileIndex());
             VERIFY_IS_FALSE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"cmd", myArgs.TerminalArgs().Profile());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -500,6 +502,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NULL(myArgs.TerminalArgs().ProfileIndex());
             VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"c:\\Foo", myArgs.TerminalArgs().StartingDirectory());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -521,6 +524,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NULL(myArgs.TerminalArgs().ProfileIndex());
             VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"powershell.exe", myArgs.TerminalArgs().Commandline());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -543,6 +547,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
             auto myCommand = myArgs.TerminalArgs().Commandline();
             VERIFY_ARE_EQUAL(L"powershell.exe \"This is an arg with spaces\"", myCommand);
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -565,6 +570,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
             auto myCommand = myArgs.TerminalArgs().Commandline();
             VERIFY_ARE_EQUAL(L"powershell.exe \"This is an arg with spaces\" another-arg \"more spaces in this one\"", myCommand);
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -586,6 +592,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NULL(myArgs.TerminalArgs().ProfileIndex());
             VERIFY_IS_FALSE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"Windows PowerShell", myArgs.TerminalArgs().Profile());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -606,6 +613,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_NULL(myArgs.TerminalArgs().ProfileIndex());
             VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"wsl -d Alpine", myArgs.TerminalArgs().Commandline());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -628,6 +636,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_FALSE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"wsl -d Alpine", myArgs.TerminalArgs().Commandline());
             VERIFY_ARE_EQUAL(L"1", myArgs.TerminalArgs().Profile());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -651,6 +660,31 @@ namespace TerminalAppLocalTests
             VERIFY_ARE_EQUAL(til::color(myArgs.TerminalArgs().TabColor().Value()), expectedColor);
             VERIFY_IS_NULL(myArgs.TerminalArgs().ProfileIndex());
             VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"--colorScheme", L"Vintage" };
+            const winrt::hstring expectedScheme{ L"Vintage" };
+
+            _buildCommandlinesHelper(appArgs, 1u, rawCommands);
+
+            VERIFY_ARE_EQUAL(1u, appArgs._startupActions.size());
+
+            auto actionAndArgs = appArgs._startupActions.at(0);
+            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
+            VERIFY_IS_NOT_NULL(actionAndArgs.Args());
+            auto myArgs = actionAndArgs.Args().try_as<NewTabArgs>();
+            VERIFY_IS_NOT_NULL(myArgs);
+            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().Commandline().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().StartingDirectory().empty());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().TabTitle().empty());
+            VERIFY_IS_NULL(myArgs.TerminalArgs().TabColor());
+            VERIFY_IS_NULL(myArgs.TerminalArgs().ProfileIndex());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().Profile().empty());
+            VERIFY_IS_FALSE(myArgs.TerminalArgs().ColorScheme().empty());
+            VERIFY_ARE_EQUAL(expectedScheme, myArgs.TerminalArgs().ColorScheme());
         }
     }
 
@@ -680,6 +714,7 @@ namespace TerminalAppLocalTests
             auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(myArgs);
             VERIFY_ARE_EQUAL(SplitState::Automatic, myArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitType::Manual, myArgs.SplitMode());
             VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
         }
         {
@@ -699,6 +734,7 @@ namespace TerminalAppLocalTests
             auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(myArgs);
             VERIFY_ARE_EQUAL(SplitState::Horizontal, myArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitType::Manual, myArgs.SplitMode());
             VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
         }
         {
@@ -720,6 +756,28 @@ namespace TerminalAppLocalTests
             auto myArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
             VERIFY_IS_NOT_NULL(myArgs);
             VERIFY_ARE_EQUAL(SplitState::Vertical, myArgs.SplitStyle());
+            VERIFY_ARE_EQUAL(SplitType::Manual, myArgs.SplitMode());
+            VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
+        }
+        {
+            AppCommandlineArgs appArgs{};
+            std::vector<const wchar_t*> rawCommands{ L"wt.exe", subcommand, L"-D" };
+            auto commandlines = AppCommandlineArgs::BuildCommands(rawCommands);
+            VERIFY_ARE_EQUAL(1u, commandlines.size());
+            _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(SplitType::Duplicate, myArgs.SplitMode());
             VERIFY_IS_NOT_NULL(myArgs.TerminalArgs());
         }
         {
@@ -749,6 +807,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_FALSE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"wsl -d Alpine", myArgs.TerminalArgs().Commandline());
             VERIFY_ARE_EQUAL(L"1", myArgs.TerminalArgs().Profile());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -777,6 +836,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_FALSE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"wsl -d Alpine", myArgs.TerminalArgs().Commandline());
             VERIFY_ARE_EQUAL(L"1", myArgs.TerminalArgs().Profile());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
         {
             AppCommandlineArgs appArgs{};
@@ -805,6 +865,7 @@ namespace TerminalAppLocalTests
             VERIFY_IS_FALSE(myArgs.TerminalArgs().Profile().empty());
             VERIFY_ARE_EQUAL(L"wsl -d Alpine -H", myArgs.TerminalArgs().Commandline());
             VERIFY_ARE_EQUAL(L"1", myArgs.TerminalArgs().Profile());
+            VERIFY_IS_TRUE(myArgs.TerminalArgs().ColorScheme().empty());
         }
     }
 
@@ -1594,59 +1655,155 @@ namespace TerminalAppLocalTests
     void CommandlineTest::TestFindTargetWindow()
     {
         {
+            Log::Comment(L"wt.exe with no args should always use the value from"
+                         L" the settings (passed as the second argument).");
+
             std::vector<winrt::hstring> args{ L"wt.exe" };
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseAnyExisting,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseAnyExisting, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
         }
         {
+            Log::Comment(L"-w -1 should always result in a new window");
+
             std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"-1" };
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
         }
         {
+            Log::Comment(L"\"new\" should always result in a new window");
+
+            std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"new" };
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+        }
+        {
+            Log::Comment(L"-w with a negative number should always result in a "
+                         L"new window");
+
             std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"-12345" };
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
         }
         {
+            Log::Comment(L"-w with a positive number should result in us trying"
+                         L" to either make a new one or find an existing one "
+                         L"with that ID, depending on the provided argument");
+
+            std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"12345" };
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(12345, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(12345, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(12345, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+        }
+        {
+            Log::Comment(L"-w 0 should always use the \"current\" window");
+
             std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"0" };
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseCurrent, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
         }
         {
+            Log::Comment(L"-w last should always use the most recent window on "
+                         L"this desktop");
+
+            std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"last" };
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+        }
+        {
+            Log::Comment(L"Make sure we follow the provided argument when a "
+                         L"--window-id wasn't explicitly provided");
+
             std::vector<winrt::hstring> args{ L"wt.exe", L"new-tab" };
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseExisting, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseAnyExisting,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseAnyExisting, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
+        }
+        {
+            Log::Comment(L"Even if someone uses a subcommand as a window name, "
+                         L"that should work");
+
+            std::vector<winrt::hstring> args{ L"wt.exe", L"-w", L"new-tab" };
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseName, result.WindowId());
+            VERIFY_ARE_EQUAL(L"new-tab", result.WindowName());
+
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseName, result.WindowId());
+            VERIFY_ARE_EQUAL(L"new-tab", result.WindowName());
+
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseName, result.WindowId());
+            VERIFY_ARE_EQUAL(L"new-tab", result.WindowName());
         }
     }
 
@@ -1657,19 +1814,23 @@ namespace TerminalAppLocalTests
         // This is a little helper to make sure that these args _always_ return
         // UseNew, regardless of the windowing behavior.
         auto testHelper = [](auto&& args) {
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
         };
 
         testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"--help" });
         testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"new-tab", L"--help" });
         testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"-w", L"0", L"new-tab", L"--help" });
+        testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"-w", L"foo", L"new-tab", L"--help" });
         testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"new-tab", L";", L"--help" });
     }
 
@@ -1680,14 +1841,17 @@ namespace TerminalAppLocalTests
         // This is a little helper to make sure that these args _always_ return
         // UseNew, regardless of the windowing behavior.
         auto testHelper = [](auto&& args) {
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew));
+            auto result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseNew);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
 
-            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew,
-                             appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting));
+            result = appImpl::AppLogic::_doFindTargetWindow({ args }, WindowingMode::UseAnyExisting);
+            VERIFY_ARE_EQUAL(WindowingBehaviorUseNew, result.WindowId());
+            VERIFY_ARE_EQUAL(L"", result.WindowName());
         };
 
         testHelper(std::vector<winrt::hstring>{ L"wt.exe", L"--version" });

src/cascadia/LocalTests_TerminalApp/FilteredCommandTests.cpp

@@ -11,7 +11,7 @@ using namespace WEX::Logging;
 using namespace WEX::TestExecution;
 using namespace WEX::Common;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 
 namespace TerminalAppLocalTests
 {

src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 
 #include "../TerminalApp/TerminalPage.h"
-#include "../TerminalApp/TerminalSettings.h"
 #include "../LocalTests_SettingsModel/TestUtils.h"
 
 using namespace Microsoft::Console;
@@ -13,7 +12,7 @@ using namespace WEX::TestExecution;
 using namespace WEX::Common;
 using namespace winrt::TerminalApp;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 
 namespace TerminalAppLocalTests
 {
@@ -34,15 +33,6 @@ namespace TerminalAppLocalTests
             TEST_CLASS_PROPERTY(L"UAP:AppXManifest", L"TestHostAppXManifest.xml")
         END_TEST_CLASS()
 
-        TEST_METHOD(TryCreateWinRTType);
-
-        TEST_METHOD(TestTerminalArgsForBinding);
-
-        TEST_METHOD(MakeSettingsForProfileThatDoesntExist);
-        TEST_METHOD(MakeSettingsForDefaultProfileThatDoesntExist);
-
-        TEST_METHOD(TestLayerProfileOnColorScheme);
-
         TEST_METHOD(TestIterateCommands);
         TEST_METHOD(TestIterateOnGeneratedNamedCommands);
         TEST_METHOD(TestIterateOnBadJson);
@@ -83,487 +73,6 @@ namespace TerminalAppLocalTests
         }
     };
 
-    void SettingsTests::TryCreateWinRTType()
-    {
-        TerminalSettings settings;
-        VERIFY_IS_NOT_NULL(settings);
-        auto oldFontSize = settings.FontSize();
-        settings.FontSize(oldFontSize + 5);
-        auto newFontSize = settings.FontSize();
-        VERIFY_ARE_NOT_EQUAL(oldFontSize, newFontSize);
-    }
-
-    void SettingsTests::TestTerminalArgsForBinding()
-    {
-        const std::string settingsJson{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "commandline": "cmd.exe"
-                },
-                {
-                    "name": "profile1",
-                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2,
-                    "commandline": "pwsh.exe"
-                },
-                {
-                    "name": "profile2",
-                    "historySize": 3,
-                    "commandline": "wsl.exe"
-                }
-            ],
-            "keybindings": [
-                { "keys": ["ctrl+a"], "command": { "action": "splitPane", "split": "vertical" } },
-                { "keys": ["ctrl+b"], "command": { "action": "splitPane", "split": "vertical", "profile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}" } },
-                { "keys": ["ctrl+c"], "command": { "action": "splitPane", "split": "vertical", "profile": "profile1" } },
-                { "keys": ["ctrl+d"], "command": { "action": "splitPane", "split": "vertical", "profile": "profile2" } },
-                { "keys": ["ctrl+e"], "command": { "action": "splitPane", "split": "horizontal", "commandline": "foo.exe" } },
-                { "keys": ["ctrl+f"], "command": { "action": "splitPane", "split": "horizontal", "profile": "profile1", "commandline": "foo.exe" } },
-                { "keys": ["ctrl+g"], "command": { "action": "newTab" } },
-                { "keys": ["ctrl+h"], "command": { "action": "newTab", "startingDirectory": "c:\\foo" } },
-                { "keys": ["ctrl+i"], "command": { "action": "newTab", "profile": "profile2", "startingDirectory": "c:\\foo" } },
-                { "keys": ["ctrl+j"], "command": { "action": "newTab", "tabTitle": "bar" } },
-                { "keys": ["ctrl+k"], "command": { "action": "newTab", "profile": "profile2", "tabTitle": "bar" } },
-                { "keys": ["ctrl+l"], "command": { "action": "newTab", "profile": "profile1", "tabTitle": "bar", "startingDirectory": "c:\\foo", "commandline":"foo.exe" } }
-            ]
-        })" };
-
-        const winrt::guid guid0{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-0000-49a3-80bd-e8fdd045185c}") };
-        const winrt::guid guid1{ ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}") };
-
-        CascadiaSettings settings{ til::u8u16(settingsJson) };
-
-        auto keymap = settings.GlobalSettings().KeyMap();
-        VERIFY_ARE_EQUAL(3u, settings.ActiveProfiles().Size());
-
-        const auto profile2Guid = settings.ActiveProfiles().GetAt(2).Guid();
-        VERIFY_ARE_NOT_EQUAL(winrt::guid{}, profile2Guid);
-
-        VERIFY_ARE_EQUAL(12u, keymap.Size());
-
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('A') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid0, guid);
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('B') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}", realArgs.TerminalArgs().Profile());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid1, guid);
-            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('C') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid1, guid);
-            VERIFY_ARE_EQUAL(L"pwsh.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('D') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Vertical, realArgs.SplitStyle());
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(profile2Guid, guid);
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('E') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"foo.exe", realArgs.TerminalArgs().Commandline());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid0, guid);
-            VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('F') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::SplitPane, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<SplitPaneArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_ARE_EQUAL(SplitState::Horizontal, realArgs.SplitStyle());
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
-            VERIFY_ARE_EQUAL(L"foo.exe", realArgs.TerminalArgs().Commandline());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid1, guid);
-            VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('G') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid0, guid);
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('H') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"c:\\foo", realArgs.TerminalArgs().StartingDirectory());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid0, guid);
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
-            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('I') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"c:\\foo", realArgs.TerminalArgs().StartingDirectory());
-            VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(profile2Guid, guid);
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
-            VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('J') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid0, guid);
-            VERIFY_ARE_EQUAL(L"cmd.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
-            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('K') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_TRUE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
-            VERIFY_ARE_EQUAL(L"profile2", realArgs.TerminalArgs().Profile());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(profile2Guid, guid);
-            VERIFY_ARE_EQUAL(L"wsl.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
-            VERIFY_ARE_EQUAL(3, termSettings.HistorySize());
-        }
-        {
-            KeyChord kc{ true, false, false, static_cast<int32_t>('L') };
-            auto actionAndArgs = TestUtils::GetActionAndArgs(keymap, kc);
-            VERIFY_ARE_EQUAL(ShortcutAction::NewTab, actionAndArgs.Action());
-            const auto& realArgs = actionAndArgs.Args().try_as<NewTabArgs>();
-            VERIFY_IS_NOT_NULL(realArgs);
-            // Verify the args have the expected value
-            VERIFY_IS_NOT_NULL(realArgs.TerminalArgs());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Commandline().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().StartingDirectory().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().TabTitle().empty());
-            VERIFY_IS_FALSE(realArgs.TerminalArgs().Profile().empty());
-            VERIFY_ARE_EQUAL(L"foo.exe", realArgs.TerminalArgs().Commandline());
-            VERIFY_ARE_EQUAL(L"c:\\foo", realArgs.TerminalArgs().StartingDirectory());
-            VERIFY_ARE_EQUAL(L"bar", realArgs.TerminalArgs().TabTitle());
-            VERIFY_ARE_EQUAL(L"profile1", realArgs.TerminalArgs().Profile());
-
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, realArgs.TerminalArgs(), nullptr);
-            VERIFY_ARE_EQUAL(guid1, guid);
-            VERIFY_ARE_EQUAL(L"foo.exe", termSettings.Commandline());
-            VERIFY_ARE_EQUAL(L"bar", termSettings.StartingTitle());
-            VERIFY_ARE_EQUAL(L"c:\\foo", termSettings.StartingDirectory());
-            VERIFY_ARE_EQUAL(2, termSettings.HistorySize());
-        }
-    }
-
-    void SettingsTests::MakeSettingsForProfileThatDoesntExist()
-    {
-        // Test that MakeSettings throws when the GUID doesn't exist
-        const std::string settingsString{ R"(
-        {
-            "defaultProfile": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-            "profiles": [
-                {
-                    "name" : "profile0",
-                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1
-                },
-                {
-                    "name" : "profile1",
-                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2
-                }
-            ]
-        })" };
-        CascadiaSettings settings{ til::u8u16(settingsString) };
-
-        const auto guid1 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-1111-49a3-80bd-e8fdd045185c}");
-        const auto guid2 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-2222-49a3-80bd-e8fdd045185c}");
-        const auto guid3 = ::Microsoft::Console::Utils::GuidFromString(L"{6239a42c-3333-49a3-80bd-e8fdd045185c}");
-
-        try
-        {
-            auto terminalSettings = winrt::make<winrt::TerminalApp::implementation::TerminalSettings>(settings, guid1, nullptr);
-            VERIFY_ARE_NOT_EQUAL(nullptr, terminalSettings);
-            VERIFY_ARE_EQUAL(1, terminalSettings.HistorySize());
-        }
-        catch (...)
-        {
-            VERIFY_IS_TRUE(false, L"This call to BuildSettings should succeed");
-        }
-
-        try
-        {
-            auto terminalSettings = winrt::make<winrt::TerminalApp::implementation::TerminalSettings>(settings, guid2, nullptr);
-            VERIFY_ARE_NOT_EQUAL(nullptr, terminalSettings);
-            VERIFY_ARE_EQUAL(2, terminalSettings.HistorySize());
-        }
-        catch (...)
-        {
-            VERIFY_IS_TRUE(false, L"This call to BuildSettings should succeed");
-        }
-
-        VERIFY_THROWS(auto terminalSettings = winrt::make<winrt::TerminalApp::implementation::TerminalSettings>(settings, guid3, nullptr), wil::ResultException, L"This call to BuildSettings should fail");
-
-        try
-        {
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, nullptr, nullptr);
-            VERIFY_ARE_NOT_EQUAL(nullptr, termSettings);
-            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
-        }
-        catch (...)
-        {
-            VERIFY_IS_TRUE(false, L"This call to BuildSettings should succeed");
-        }
-    }
-
-    void SettingsTests::MakeSettingsForDefaultProfileThatDoesntExist()
-    {
-        // Test that MakeSettings _doesnt_ throw when we load settings with a
-        // defaultProfile that's not in the list, we validate the settings, and
-        // then call MakeSettings(nullopt). The validation should ensure that
-        // the default profile is something reasonable
-        const std::string settingsString{ R"(
-        {
-            "defaultProfile": "{6239a42c-3333-49a3-80bd-e8fdd045185c}",
-            "profiles": [
-                {
-                    "name" : "profile0",
-                    "guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1
-                },
-                {
-                    "name" : "profile1",
-                    "guid": "{6239a42c-2222-49a3-80bd-e8fdd045185c}",
-                    "historySize": 2
-                }
-            ]
-        })" };
-        CascadiaSettings settings{ til::u8u16(settingsString) };
-
-        VERIFY_ARE_EQUAL(2u, settings.Warnings().Size());
-        VERIFY_ARE_EQUAL(2u, settings.ActiveProfiles().Size());
-        VERIFY_ARE_EQUAL(settings.GlobalSettings().DefaultProfile(), settings.ActiveProfiles().GetAt(0).Guid());
-        try
-        {
-            const auto [guid, termSettings] = winrt::TerminalApp::implementation::TerminalSettings::BuildSettings(settings, nullptr, nullptr);
-            VERIFY_ARE_NOT_EQUAL(nullptr, termSettings);
-            VERIFY_ARE_EQUAL(1, termSettings.HistorySize());
-        }
-        catch (...)
-        {
-            VERIFY_IS_TRUE(false, L"This call to BuildSettings should succeed");
-        }
-    }
-
-    void SettingsTests::TestLayerProfileOnColorScheme()
-    {
-        Log::Comment(NoThrowString().Format(
-            L"Ensure that setting (or not) a property in the profile that should override a property of the color scheme works correctly."));
-
-        const std::string settings0String{ R"(
-        {
-            "defaultProfile": "profile5",
-            "profiles": [
-                {
-                    "name" : "profile0",
-                    "colorScheme": "schemeWithCursorColor"
-                },
-                {
-                    "name" : "profile1",
-                    "colorScheme": "schemeWithoutCursorColor"
-                },
-                {
-                    "name" : "profile2",
-                    "colorScheme": "schemeWithCursorColor",
-                    "cursorColor": "#234567"
-                },
-                {
-                    "name" : "profile3",
-                    "colorScheme": "schemeWithoutCursorColor",
-                    "cursorColor": "#345678"
-                },
-                {
-                    "name" : "profile4",
-                    "cursorColor": "#456789"
-                },
-                {
-                    "name" : "profile5"
-                }
-            ],
-            "schemes": [
-                {
-                    "name": "schemeWithCursorColor",
-                    "cursorColor": "#123456"
-                },
-                {
-                    "name": "schemeWithoutCursorColor"
-                }
-            ]
-        })" };
-
-        CascadiaSettings settings{ til::u8u16(settings0String) };
-
-        VERIFY_ARE_EQUAL(6u, settings.ActiveProfiles().Size());
-        VERIFY_ARE_EQUAL(2u, settings.GlobalSettings().ColorSchemes().Size());
-
-        auto createTerminalSettings = [&](const auto& profile, const auto& schemes) {
-            auto terminalSettings{ winrt::make_self<winrt::TerminalApp::implementation::TerminalSettings>() };
-            terminalSettings->_ApplyProfileSettings(profile, schemes);
-            return terminalSettings;
-        };
-
-        auto terminalSettings0 = createTerminalSettings(settings.ActiveProfiles().GetAt(0), settings.GlobalSettings().ColorSchemes());
-        auto terminalSettings1 = createTerminalSettings(settings.ActiveProfiles().GetAt(1), settings.GlobalSettings().ColorSchemes());
-        auto terminalSettings2 = createTerminalSettings(settings.ActiveProfiles().GetAt(2), settings.GlobalSettings().ColorSchemes());
-        auto terminalSettings3 = createTerminalSettings(settings.ActiveProfiles().GetAt(3), settings.GlobalSettings().ColorSchemes());
-        auto terminalSettings4 = createTerminalSettings(settings.ActiveProfiles().GetAt(4), settings.GlobalSettings().ColorSchemes());
-        auto terminalSettings5 = createTerminalSettings(settings.ActiveProfiles().GetAt(5), settings.GlobalSettings().ColorSchemes());
-
-        VERIFY_ARE_EQUAL(ARGB(0, 0x12, 0x34, 0x56), terminalSettings0->CursorColor()); // from color scheme
-        VERIFY_ARE_EQUAL(DEFAULT_CURSOR_COLOR, terminalSettings1->CursorColor()); // default
-        VERIFY_ARE_EQUAL(ARGB(0, 0x23, 0x45, 0x67), terminalSettings2->CursorColor()); // from profile (trumps color scheme)
-        VERIFY_ARE_EQUAL(ARGB(0, 0x34, 0x56, 0x78), terminalSettings3->CursorColor()); // from profile (not set in color scheme)
-        VERIFY_ARE_EQUAL(ARGB(0, 0x45, 0x67, 0x89), terminalSettings4->CursorColor()); // from profile (no color scheme)
-        VERIFY_ARE_EQUAL(DEFAULT_CURSOR_COLOR, terminalSettings5->CursorColor()); // default
-    }
-
     void SettingsTests::TestIterateCommands()
     {
         // For this test, put an iterable command with a given `name`,

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -85,6 +85,9 @@ namespace TerminalAppLocalTests
         TEST_METHOD(NextMRUTab);
         TEST_METHOD(VerifyCommandPaletteTabSwitcherOrder);
 
+        TEST_METHOD(TestWindowRenameSuccessful);
+        TEST_METHOD(TestWindowRenameFailure);
+
         TEST_CLASS_SETUP(ClassSetup)
         {
             return true;
@@ -260,6 +263,15 @@ namespace TerminalAppLocalTests
             page->Create();
             Log::Comment(L"Create()'d the page successfully");
 
+            // Build a NewTab action, to make sure we start with one. The real
+            // Terminal will always get one from AppCommandlineArgs.
+            NewTerminalArgs newTerminalArgs{};
+            NewTabArgs args{ newTerminalArgs };
+            ActionAndArgs newTabAction{ ShortcutAction::NewTab, args };
+            // push the arg onto the front
+            page->_startupActions.Append(newTabAction);
+            Log::Comment(L"Added a single newTab action");
+
             auto app = ::winrt::Windows::UI::Xaml::Application::Current();
 
             winrt::TerminalApp::TerminalPage pp = *page;
@@ -276,8 +288,9 @@ namespace TerminalAppLocalTests
             // In the real app, this isn't a problem, but doesn't happen
             // reliably in the unit tests.
             Log::Comment(L"Ensure we set the first tab as the selected one.");
-            auto tab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
-            page->_tabView.SelectedItem(tab->TabViewItem());
+            auto tab = page->_tabs.GetAt(0);
+            auto tabImpl = page->_GetTerminalTabImpl(tab);
+            page->_tabView.SelectedItem(tabImpl->TabViewItem());
             page->_UpdatedSelectedTab(0);
         });
         VERIFY_SUCCEEDED(result);
@@ -330,7 +343,7 @@ namespace TerminalAppLocalTests
     {
         // * Create a tab with a profile with GUID 1
         // * Reload the settings so that GUID 1 is no longer in the list of profiles
-        // * Try calling _DuplicateTabViewItem on tab 1
+        // * Try calling _DuplicateFocusedTab on tab 1
         // * No new tab should be created (and more importantly, the app should not crash)
         //
         // Created to test GH#2455
@@ -392,7 +405,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(L"Duplicate the first tab");
         result = RunOnUIThread([&page]() {
-            page->_DuplicateTabViewItem();
+            page->_DuplicateFocusedTab();
             VERIFY_ARE_EQUAL(2u, page->_tabs.Size());
         });
         VERIFY_SUCCEEDED(result);
@@ -407,7 +420,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(L"Duplicate the tab, and don't crash");
         result = RunOnUIThread([&page]() {
-            page->_DuplicateTabViewItem();
+            page->_DuplicateFocusedTab();
             VERIFY_ARE_EQUAL(2u, page->_tabs.Size(), L"We should gracefully do nothing here - the profile no longer exists.");
         });
         VERIFY_SUCCEEDED(result);
@@ -601,7 +614,6 @@ namespace TerminalAppLocalTests
         auto result = RunOnUIThread([&page]() {
             SplitPaneArgs args{ SplitType::Duplicate };
             ActionEventArgs eventArgs{ args };
-            // eventArgs.Args(args);
             page->_HandleSplitPane(nullptr, eventArgs);
             auto firstTab = page->_GetTerminalTabImpl(page->_tabs.GetAt(0));
 
@@ -782,8 +794,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(L"Switch to the next MRU tab, which is the fourth tab");
         TestOnUIThread([&page]() {
-            ActionEventArgs eventArgs{};
-            page->_HandleNextTab(nullptr, eventArgs);
+            page->_SelectNextTab(true, nullptr);
         });
 
         Log::Comment(L"Sleep to let events propagate");
@@ -804,8 +815,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(L"Switch to the next MRU tab, which is the second tab");
         TestOnUIThread([&page]() {
-            ActionEventArgs eventArgs{};
-            page->_HandleNextTab(nullptr, eventArgs);
+            page->_SelectNextTab(true, nullptr);
         });
 
         Log::Comment(L"Sleep to let events propagate");
@@ -829,8 +839,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(L"Switch to the next in-order tab, which is the third tab");
         TestOnUIThread([&page]() {
-            ActionEventArgs eventArgs{};
-            page->_HandleNextTab(nullptr, eventArgs);
+            page->_SelectNextTab(true, nullptr);
         });
         TestOnUIThread([&page]() {
             uint32_t focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
@@ -842,8 +851,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(L"Switch to the next in-order tab, which is the fourth tab");
         TestOnUIThread([&page]() {
-            ActionEventArgs eventArgs{};
-            page->_HandleNextTab(nullptr, eventArgs);
+            page->_SelectNextTab(true, nullptr);
         });
         TestOnUIThread([&page]() {
             uint32_t focusedIndex = page->_GetFocusedTabIndex().value_or(-1);
@@ -916,7 +924,7 @@ namespace TerminalAppLocalTests
 
         Log::Comment(L"Switch to the next MRU tab, which is the third tab");
         RunOnUIThread([&page]() {
-            page->_SelectNextTab(true);
+            page->_SelectNextTab(true, nullptr);
             // In the course of a single tick, the Command Palette will:
             // * open
             // * select the proper tab from the mru's list
@@ -943,4 +951,57 @@ namespace TerminalAppLocalTests
         // will also dismiss itself immediately when that's called. So we can't
         // really inspect the contents of the list in this test, unfortunately.
     }
+
+    void TabTests::TestWindowRenameSuccessful()
+    {
+        auto page = _commonSetup();
+        page->RenameWindowRequested([&page](auto&&, const winrt::TerminalApp::RenameWindowRequestedArgs args) {
+            // In the real terminal, this would bounce up to the monarch and
+            // come back down. Instead, immediately call back and set the name.
+            page->WindowName(args.ProposedName());
+        });
+
+        bool windowNameChanged = false;
+        page->PropertyChanged([&page, &windowNameChanged](auto&&, const winrt::WUX::Data::PropertyChangedEventArgs& args) mutable {
+            if (args.PropertyName() == L"WindowNameForDisplay")
+            {
+                windowNameChanged = true;
+            }
+        });
+
+        TestOnUIThread([&page]() {
+            page->_RequestWindowRename(winrt::hstring{ L"Foo" });
+        });
+        TestOnUIThread([&]() {
+            VERIFY_ARE_EQUAL(L"Foo", page->_WindowName);
+            VERIFY_IS_TRUE(windowNameChanged,
+                           L"The window name should have changed, and we should have raised a notification that WindowNameForDisplay changed");
+        });
+    }
+    void TabTests::TestWindowRenameFailure()
+    {
+        auto page = _commonSetup();
+        page->RenameWindowRequested([&page](auto&&, auto&&) {
+            // In the real terminal, this would bounce up to the monarch and
+            // come back down. Instead, immediately call back to tell the terminal it failed.
+            page->RenameFailed();
+        });
+
+        bool windowNameChanged = false;
+
+        page->PropertyChanged([&page, &windowNameChanged](auto&&, const winrt::WUX::Data::PropertyChangedEventArgs& args) mutable {
+            if (args.PropertyName() == L"WindowNameForDisplay")
+            {
+                windowNameChanged = true;
+            }
+        });
+
+        TestOnUIThread([&page]() {
+            page->_RequestWindowRename(winrt::hstring{ L"Foo" });
+        });
+        TestOnUIThread([&]() {
+            VERIFY_IS_FALSE(windowNameChanged,
+                            L"The window name should not have changed, we should have rejected the change.");
+        });
+    }
 }

src/cascadia/LocalTests_TerminalApp/TerminalApp.LocalTests.vcxproj

@@ -59,7 +59,7 @@
     <!-- If you don't reference these projects here, the
     _ConsoleGenerateAdditionalWinmdManifests step won't gather the winmd's -->
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalConnection\TerminalConnection.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalApp\dll\TerminalApp.vcxproj" />
     <ProjectReference Include="$(OpenConsoleDir)\src\cascadia\TerminalSettingsModel\dll\Microsoft.Terminal.Settings.Model.vcxproj" />

src/cascadia/LocalTests_TerminalApp/TestHostApp/TestHostApp.vcxproj

@@ -97,7 +97,7 @@
     </ProjectReference>
 
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalSettingsEditor\Microsoft.Terminal.Settings.Editor.vcxproj" />
-    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\TerminalControl.vcxproj" />
+    <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalControl\dll\TerminalControl.vcxproj" />
 
     <ProjectReference Include="$(OpenConsoleDir)src\cascadia\TerminalApp\dll\TerminalApp.vcxproj">
       <Project>{ca5cad1a-44bd-4ac7-ac72-f16e576fdd12}</Project>
@@ -117,7 +117,7 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore">
-      <HintPath>$(OpenConsoleDir)\packages\Taef.Redist.Wlk.10.57.200731005-develop\lib\Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore.winmd</HintPath>
+      <HintPath>$(OpenConsoleDir)\packages\Microsoft.Taef.10.58.210305002\lib\Microsoft.VisualStudio.TestPlatform.TestExecutor.WinRTCore.winmd</HintPath>
       <IsWinMDFile>true</IsWinMDFile>
 
       <!-- This path is _relative to the .winmd_ -->

src/cascadia/LocalTests_TerminalApp/TestHostApp/UnitTestApp.xaml

@@ -1,8 +1,5 @@
-<Application
-    x:Class="TestHostApp.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:TestHostApp"
-    RequestedTheme="Dark">
-
-</Application>
+<Application x:Class="TestHostApp.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="using:TestHostApp"
+             RequestedTheme="Dark" />

src/cascadia/LocalTests_TerminalApp/pch.h

@@ -45,6 +45,7 @@ Author(s):
 #include <winrt/Windows.ui.input.h>
 #include <winrt/Windows.UI.Xaml.Controls.h>
 #include <winrt/Windows.UI.Xaml.Controls.Primitives.h>
+#include <winrt/Windows.UI.Xaml.Data.h>
 #include <winrt/Windows.ui.xaml.media.h>
 #include <winrt/Windows.ui.xaml.input.h>
 #include <winrt/Windows.UI.Xaml.Markup.h>

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

@@ -798,7 +798,7 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
         }
     }
 
-    publicTerminal->_terminal->SetCursorStyle(theme.CursorStyle);
+    publicTerminal->_terminal->SetCursorStyle(static_cast<DispatchTypes::CursorStyle>(theme.CursorStyle));
 
     publicTerminal->_desiredFont = { fontFamily, 0, DEFAULT_FONT_WEIGHT, { 0, fontSize }, CP_UTF8 };
     publicTerminal->_UpdateFont(newDpi);

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

@@ -19,7 +19,7 @@ typedef struct _TerminalTheme
     COLORREF DefaultForeground;
     COLORREF DefaultSelectionBackground;
     float SelectionBackgroundAlpha;
-    DispatchTypes::CursorStyle CursorStyle;
+    uint32_t CursorStyle; // This will be converted to DispatchTypes::CursorStyle (size_t), but C# cannot marshal an enum type and have it fit in a size_t.
     COLORREF ColorTable[16];
 } TerminalTheme, *LPTerminalTheme;
 

src/cascadia/Remoting/FindTargetWindowArgs.h

@@ -25,8 +25,9 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
 {
     struct FindTargetWindowArgs : public FindTargetWindowArgsT<FindTargetWindowArgs>
     {
-        GETSET_PROPERTY(winrt::Microsoft::Terminal::Remoting::CommandlineArgs, Args, nullptr);
-        GETSET_PROPERTY(int, ResultTargetWindow, -1);
+        WINRT_PROPERTY(winrt::Microsoft::Terminal::Remoting::CommandlineArgs, Args, nullptr);
+        WINRT_PROPERTY(int, ResultTargetWindow, -1);
+        WINRT_PROPERTY(winrt::hstring, ResultTargetWindowName);
 
     public:
         FindTargetWindowArgs(winrt::Microsoft::Terminal::Remoting::CommandlineArgs args) :

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

@@ -25,6 +25,9 @@
     <ClInclude Include="ProposeCommandlineResult.h">
       <DependentUpon>Monarch.idl</DependentUpon>
     </ClInclude>
+    <ClInclude Include="RenameRequestArgs.h">
+      <DependentUpon>Peasant.idl</DependentUpon>
+    </ClInclude>
     <ClInclude Include="WindowActivatedArgs.h">
       <DependentUpon>Peasant.idl</DependentUpon>
     </ClInclude>
@@ -51,6 +54,9 @@
     <ClCompile Include="ProposeCommandlineResult.cpp">
       <DependentUpon>Monarch.idl</DependentUpon>
     </ClCompile>
+    <ClCompile Include="RenameRequestArgs.cpp">
+      <DependentUpon>Peasant.idl</DependentUpon>
+    </ClCompile>
     <ClCompile Include="WindowActivatedArgs.cpp">
       <DependentUpon>Peasant.idl</DependentUpon>
     </ClCompile>

src/cascadia/Remoting/Monarch.cpp

@@ -75,6 +75,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             auto newPeasantsId = peasant.GetID();
             // Add an event listener to the peasant's WindowActivated event.
             peasant.WindowActivated({ this, &Monarch::_peasantWindowActivated });
+            peasant.IdentifyWindowsRequested({ this, &Monarch::_identifyWindows });
+            peasant.RenameRequested({ this, &Monarch::_renameRequested });
 
             _peasants[newPeasantsId] = peasant;
 
@@ -147,6 +149,59 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         }
     }
 
+    // Method Description:
+    // - Find the ID of the peasant with the given name. If no such peasant
+    //   exists, then we'll return 0. If we encounter any peasants who have died
+    //   during this process, then we'll remove them from the set of _peasants
+    // Arguments:
+    // - name: The window name to look for
+    // Return Value:
+    // - 0 if we didn't find the given peasant, otherwise a positive number for
+    //   the window's ID.
+    uint64_t Monarch::_lookupPeasantIdForName(std::wstring_view name)
+    {
+        if (name.empty())
+        {
+            return 0;
+        }
+
+        std::vector<uint64_t> peasantsToErase{};
+        uint64_t result = 0;
+        for (const auto& [id, p] : _peasants)
+        {
+            try
+            {
+                auto otherName = p.WindowName();
+                if (otherName == name)
+                {
+                    result = id;
+                    break;
+                }
+            }
+            catch (...)
+            {
+                LOG_CAUGHT_EXCEPTION();
+                // Normally, we'd just erase the peasant here. However, we can't
+                // erase from the map while we're iterating over it like this.
+                // Instead, pull a good ole Java and collect this id for removal
+                // later.
+                peasantsToErase.push_back(id);
+            }
+        }
+
+        // Remove the dead peasants we came across while iterating.
+        for (const auto& id : peasantsToErase)
+        {
+            // Remove the peasant from the list of peasants
+            _peasants.erase(id);
+            // Remove the peasant from the list of MRU windows. They're dead.
+            // They can't be the MRU anymore.
+            _clearOldMruEntries(id);
+        }
+
+        return result;
+    }
+
     // Method Description:
     // - Handler for the `Peasant::WindowActivated` event. We'll make a in-proc
     //   copy of the WindowActivatedArgs from the peasant. That way, we won't
@@ -400,6 +455,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         // After the event was handled, ResultTargetWindow() will be filled with
         // the parsed result.
         const auto targetWindow = findWindowArgs->ResultTargetWindow();
+        const auto targetWindowName = findWindowArgs->ResultTargetWindowName();
 
         TraceLoggingWrite(g_hRemotingProvider,
                           "Monarch_ProposeCommandline",
@@ -410,6 +466,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         // that goes with it. Alternatively, if we were given a magic windowing
         // constant, we can use that to look up an appropriate peasant.
         if (targetWindow >= 0 ||
+            targetWindow == WindowingBehaviorUseName ||
             targetWindow == WindowingBehaviorUseExisting ||
             targetWindow == WindowingBehaviorUseAnyExisting)
         {
@@ -429,6 +486,9 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             case WindowingBehaviorUseAnyExisting:
                 windowID = _getMostRecentPeasantID(false);
                 break;
+            case WindowingBehaviorUseName:
+                windowID = _lookupPeasantIdForName(targetWindowName);
+                break;
             default:
                 windowID = ::base::saturated_cast<uint64_t>(targetWindow);
                 break;
@@ -449,7 +509,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             if (auto targetPeasant{ _getPeasant(windowID) })
             {
                 auto result{ winrt::make_self<Remoting::implementation::ProposeCommandlineResult>(false) };
-
                 try
                 {
                     // This will raise the peasant's ExecuteCommandlineRequested
@@ -463,6 +522,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                     // If we fail to propose the commandline to the peasant (it
                     // died?) then just tell this process to become a new window
                     // instead.
+                    result->WindowName(targetWindowName);
                     result->ShouldCreateWindow(true);
 
                     // If this fails, it'll be logged in the following
@@ -497,6 +557,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
 
                 auto result{ winrt::make_self<Remoting::implementation::ProposeCommandlineResult>(true) };
                 result->Id(windowID);
+                result->WindowName(targetWindowName);
                 return *result;
             }
         }
@@ -508,6 +569,115 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                           TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
 
         // In this case, no usable ID was provided. Return { true, nullopt }
-        return winrt::make<Remoting::implementation::ProposeCommandlineResult>(true);
+        auto result = winrt::make_self<Remoting::implementation::ProposeCommandlineResult>(true);
+        result->WindowName(targetWindowName);
+        return *result;
+    }
+
+    // Method Description:
+    // - Helper for doing something on each and every peasant, with no regard
+    //   for if the peasant is living or dead.
+    // - We'll try calling callback on every peasant.
+    // - If any single peasant is dead, then we'll call errorCallback, and move on.
+    // - We're taking an errorCallback here, because the thing we usually want
+    //   to do is TraceLog a message, but TraceLoggingWrite is actually a macro
+    //   that _requires_ the second arg to be a string literal. It can't just be
+    //   a variable.
+    // Arguments:
+    // - callback: The function to call on each peasant
+    // - errorCallback: The function to call if a peasant is dead.
+    // Return Value:
+    // - <none>
+    void Monarch::_forAllPeasantsIgnoringTheDead(std::function<void(const Remoting::IPeasant&, const uint64_t)> callback,
+                                                 std::function<void(const uint64_t)> errorCallback)
+    {
+        for (const auto& [id, p] : _peasants)
+        {
+            try
+            {
+                callback(p, id);
+            }
+            catch (...)
+            {
+                LOG_CAUGHT_EXCEPTION();
+                // If this fails, we don't _really_ care. Just move on to the
+                // next one. Someone else will clean up the dead peasant.
+                errorCallback(id);
+            }
+        }
+    }
+
+    // Method Description:
+    // - This is an event handler for the IdentifyWindowsRequested event. A
+    //   Peasant may raise that event if they want _all_ windows to identify
+    //   themselves.
+    // - This will tell each and every peasant to identify themselves. This will
+    //   eventually propagate down to TerminalPage::IdentifyWindow.
+    // Arguments:
+    // - <unused>
+    // Return Value:
+    // - <none>
+    void Monarch::_identifyWindows(const winrt::Windows::Foundation::IInspectable& /*sender*/,
+                                   const winrt::Windows::Foundation::IInspectable& /*args*/)
+    {
+        // Notify all the peasants to display their ID.
+        auto callback = [](auto&& p, auto&& /*id*/) {
+            p.DisplayWindowId();
+        };
+        auto onError = [](auto&& id) {
+            TraceLoggingWrite(g_hRemotingProvider,
+                              "Monarch_identifyWindows_Failed",
+                              TraceLoggingInt64(id, "peasantID", "The ID of the peasant which we could not identify"),
+                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+        };
+        _forAllPeasantsIgnoringTheDead(callback, onError);
+    }
+
+    // Method Description:
+    // - This is an event handler for the RenameRequested event. A
+    //   Peasant may raise that event when they want to be renamed to something else.
+    // - We will check if there are any other windows with this name. If there
+    //   are, then we'll reject the rename by setting args.Succeeded=false.
+    // - If there aren't any other windows with this name, then we'll set
+    //   args.Succeeded=true, allowing the window to keep this name.
+    // Arguments:
+    // - args: Contains the requested window name and a boolean (Succeeded)
+    //   indicating if the request was successful.
+    // Return Value:
+    // - <none>
+    void Monarch::_renameRequested(const winrt::Windows::Foundation::IInspectable& /*sender*/,
+                                   const winrt::Microsoft::Terminal::Remoting::RenameRequestArgs& args)
+    {
+        bool successfullyRenamed = false;
+
+        try
+        {
+            args.Succeeded(false);
+            const auto name{ args.NewName() };
+            // Try to find a peasant that currently has this name
+            const auto id = _lookupPeasantIdForName(name);
+            if (_getPeasant(id) == nullptr)
+            {
+                // If there is one, then oh no! The requestor is not allowed to
+                // be renamed.
+                args.Succeeded(true);
+                successfullyRenamed = true;
+            }
+
+            TraceLoggingWrite(g_hRemotingProvider,
+                              "Monarch_renameRequested",
+                              TraceLoggingWideString(name.c_str(), "name", "The newly proposed name"),
+                              TraceLoggingInt64(successfullyRenamed, "successfullyRenamed", "true if the peasant is allowed to rename themselves to that name."),
+                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+        }
+        catch (...)
+        {
+            LOG_CAUGHT_EXCEPTION();
+            // If this fails, we don't _really_ care. The peasant died, but
+            // they're the only one who cares about the result.
+            TraceLoggingWrite(g_hRemotingProvider,
+                              "Monarch_renameRequested_Failed",
+                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+        }
     }
 }

src/cascadia/Remoting/Monarch.h

@@ -67,12 +67,22 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
 
         winrt::Microsoft::Terminal::Remoting::IPeasant _getPeasant(uint64_t peasantID);
         uint64_t _getMostRecentPeasantID(bool limitToCurrentDesktop);
+        uint64_t _lookupPeasantIdForName(std::wstring_view name);
 
         void _peasantWindowActivated(const winrt::Windows::Foundation::IInspectable& sender,
                                      const winrt::Microsoft::Terminal::Remoting::WindowActivatedArgs& args);
         void _doHandleActivatePeasant(const winrt::com_ptr<winrt::Microsoft::Terminal::Remoting::implementation::WindowActivatedArgs>& args);
         void _clearOldMruEntries(const uint64_t peasantID);
 
+        void _forAllPeasantsIgnoringTheDead(std::function<void(const winrt::Microsoft::Terminal::Remoting::IPeasant&, const uint64_t)> callback,
+                                            std::function<void(const uint64_t)> errorCallback);
+
+        void _identifyWindows(const winrt::Windows::Foundation::IInspectable& sender,
+                              const winrt::Windows::Foundation::IInspectable& args);
+
+        void _renameRequested(const winrt::Windows::Foundation::IInspectable& sender,
+                              const winrt::Microsoft::Terminal::Remoting::RenameRequestArgs& args);
+
         friend class RemotingUnitTests::RemotingTests;
     };
 }

src/cascadia/Remoting/Monarch.idl

@@ -9,11 +9,12 @@ namespace Microsoft.Terminal.Remoting
     [default_interface] runtimeclass FindTargetWindowArgs {
         CommandlineArgs Args { get; };
         Int32 ResultTargetWindow;
+        String ResultTargetWindowName;
     }
 
     [default_interface] runtimeclass ProposeCommandlineResult {
         Windows.Foundation.IReference<UInt64> Id { get; };
-        // TODO:projects/5 - also return the name here, if the name was set on the commandline
+        String WindowName { get; };
         Boolean ShouldCreateWindow { get; }; // If you name this `CreateWindow`, the compiler will explode
     }
 

src/cascadia/Remoting/Peasant.cpp

@@ -117,4 +117,81 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         return _lastActivatedArgs;
     }
 
+    // Method Description:
+    // - Tell this window to display it's window ID. We'll raise a
+    //   DisplayWindowIdRequested event, which will get handled in the AppHost,
+    //   and used to tell the app to display the ID toast.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void Peasant::DisplayWindowId()
+    {
+        // Not worried about try/catching this. The handler is in AppHost, which
+        // is in-proc for us.
+        _DisplayWindowIdRequestedHandlers(*this, nullptr);
+    }
+
+    // Method Description:
+    // - Raises an event to ask that all windows be identified. This will come
+    //   back to us when the Monarch handles the event and calls our
+    //   DisplayWindowId method.
+    // Arguments:
+    // - <none>
+    // Return Value:
+    // - <none>
+    void Peasant::RequestIdentifyWindows()
+    {
+        bool successfullyNotified = false;
+
+        try
+        {
+            // Try/catch this, because the other side of this event is handled
+            // by the monarch. The monarch might have died. If they have, this
+            // will throw an exception. Just eat it, the election thread will
+            // handle hooking up the new one.
+            _IdentifyWindowsRequestedHandlers(*this, nullptr);
+            successfullyNotified = true;
+        }
+        catch (...)
+        {
+            LOG_CAUGHT_EXCEPTION();
+        }
+        TraceLoggingWrite(g_hRemotingProvider,
+                          "Peasant_RequestIdentifyWindows",
+                          TraceLoggingUInt64(GetID(), "peasantID", "Our ID"),
+                          TraceLoggingBoolean(successfullyNotified, "successfullyNotified", "true if we successfully notified the monarch"),
+                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+    }
+
+    void Peasant::RequestRename(const winrt::Microsoft::Terminal::Remoting::RenameRequestArgs& args)
+    {
+        bool successfullyNotified = false;
+        const auto oldName{ _WindowName };
+        try
+        {
+            // Try/catch this, because the other side of this event is handled
+            // by the monarch. The monarch might have died. If they have, this
+            // will throw an exception. Just eat it, the election thread will
+            // handle hooking up the new one.
+            _RenameRequestedHandlers(*this, args);
+            if (args.Succeeded())
+            {
+                _WindowName = args.NewName();
+            }
+            successfullyNotified = true;
+        }
+        catch (...)
+        {
+            LOG_CAUGHT_EXCEPTION();
+        }
+        TraceLoggingWrite(g_hRemotingProvider,
+                          "Peasant_RequestRename",
+                          TraceLoggingUInt64(GetID(), "peasantID", "Our ID"),
+                          TraceLoggingWideString(oldName.c_str(), "oldName", "Our old name"),
+                          TraceLoggingWideString(args.NewName().c_str(), "newName", "The proposed name"),
+                          TraceLoggingBoolean(args.Succeeded(), "succeeded", "true if the monarch ok'd this new name for us."),
+                          TraceLoggingBoolean(successfullyNotified, "successfullyNotified", "true if we successfully notified the monarch"),
+                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+    }
 }

src/cascadia/Remoting/Peasant.h

@@ -5,6 +5,7 @@
 
 #include "Peasant.g.h"
 #include "../cascadia/inc/cppwinrt_utils.h"
+#include "RenameRequestArgs.h"
 
 namespace RemotingUnitTests
 {
@@ -22,12 +23,20 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
 
         bool ExecuteCommandline(const winrt::Microsoft::Terminal::Remoting::CommandlineArgs& args);
         void ActivateWindow(const winrt::Microsoft::Terminal::Remoting::WindowActivatedArgs& args);
+        void RequestIdentifyWindows();
+        void DisplayWindowId();
+        void RequestRename(const winrt::Microsoft::Terminal::Remoting::RenameRequestArgs& args);
 
         winrt::Microsoft::Terminal::Remoting::WindowActivatedArgs GetLastActivatedArgs();
 
         winrt::Microsoft::Terminal::Remoting::CommandlineArgs InitialArgs();
+        WINRT_PROPERTY(winrt::hstring, WindowName);
+
         TYPED_EVENT(WindowActivated, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::WindowActivatedArgs);
         TYPED_EVENT(ExecuteCommandlineRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::CommandlineArgs);
+        TYPED_EVENT(IdentifyWindowsRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+        TYPED_EVENT(DisplayWindowIdRequested, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable);
+        TYPED_EVENT(RenameRequested, winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Remoting::RenameRequestArgs);
 
     private:
         Peasant(const uint64_t testPID);

src/cascadia/Remoting/Peasant.idl

@@ -13,6 +13,13 @@ namespace Microsoft.Terminal.Remoting
         String CurrentDirectory();
     };
 
+    runtimeclass RenameRequestArgs
+    {
+        RenameRequestArgs(String newName);
+        String NewName { get; };
+        Boolean Succeeded;
+    };
+
     runtimeclass WindowActivatedArgs
     {
         WindowActivatedArgs(UInt64 peasantID, Guid desktopID, Windows.Foundation.DateTime activatedTime);
@@ -33,9 +40,17 @@ namespace Microsoft.Terminal.Remoting
         Boolean ExecuteCommandline(CommandlineArgs args);
         void ActivateWindow(WindowActivatedArgs args);
         WindowActivatedArgs GetLastActivatedArgs();
+        String WindowName { get; };
+        void RequestIdentifyWindows(); // Tells us to raise a IdentifyWindowsRequested
+        void DisplayWindowId(); // Tells us to display its own ID (which causes a DisplayWindowIdRequested to be raised)
+
+        void RequestRename(RenameRequestArgs args); // Tells us to raise a RenameRequested
 
         event Windows.Foundation.TypedEventHandler<Object, WindowActivatedArgs> WindowActivated;
         event Windows.Foundation.TypedEventHandler<Object, CommandlineArgs> ExecuteCommandlineRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Object> IdentifyWindowsRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Object> DisplayWindowIdRequested;
+        event Windows.Foundation.TypedEventHandler<Object, RenameRequestArgs> RenameRequested;
     };
 
     [default_interface] runtimeclass Peasant : IPeasant

src/cascadia/Remoting/ProposeCommandlineResult.h

@@ -26,8 +26,9 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     struct ProposeCommandlineResult : public ProposeCommandlineResultT<ProposeCommandlineResult>
     {
     public:
-        GETSET_PROPERTY(Windows::Foundation::IReference<uint64_t>, Id);
-        GETSET_PROPERTY(bool, ShouldCreateWindow, true);
+        WINRT_PROPERTY(Windows::Foundation::IReference<uint64_t>, Id);
+        WINRT_PROPERTY(winrt::hstring, WindowName);
+        WINRT_PROPERTY(bool, ShouldCreateWindow, true);
 
     public:
         ProposeCommandlineResult(bool shouldCreateWindow) :

src/cascadia/Remoting/RenameRequestArgs.cpp

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

src/cascadia/Remoting/RenameRequestArgs.h

@@ -0,0 +1,30 @@
+/*++
+Copyright (c) Microsoft Corporation
+Licensed under the MIT license.
+
+Class Name:
+- RenameRequestArgs.h
+
+--*/
+#pragma once
+
+#include "RenameRequestArgs.g.h"
+#include "../cascadia/inc/cppwinrt_utils.h"
+
+namespace winrt::Microsoft::Terminal::Remoting::implementation
+{
+    struct RenameRequestArgs : public RenameRequestArgsT<RenameRequestArgs>
+    {
+        WINRT_PROPERTY(winrt::hstring, NewName);
+        WINRT_PROPERTY(bool, Succeeded, false);
+
+    public:
+        RenameRequestArgs(winrt::hstring newName) :
+            _NewName{ newName } {};
+    };
+}
+
+namespace winrt::Microsoft::Terminal::Remoting::factory_implementation
+{
+    BASIC_FACTORY(RenameRequestArgs);
+}

src/cascadia/Remoting/WindowActivatedArgs.h

@@ -27,10 +27,10 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
     };
     struct WindowActivatedArgs : public WindowActivatedArgsT<WindowActivatedArgs>
     {
-        GETSET_PROPERTY(uint64_t, PeasantID, 0);
-        GETSET_PROPERTY(winrt::guid, DesktopID);
-        GETSET_PROPERTY(winrt::Windows::Foundation::DateTime, ActivatedTime, {});
-        GETSET_PROPERTY(uint64_t, Hwnd, 0);
+        WINRT_PROPERTY(uint64_t, PeasantID, 0);
+        WINRT_PROPERTY(winrt::guid, DesktopID);
+        WINRT_PROPERTY(winrt::Windows::Foundation::DateTime, ActivatedTime, {});
+        WINRT_PROPERTY(uint64_t, Hwnd, 0);
 
     public:
         WindowActivatedArgs(uint64_t peasantID,

src/cascadia/Remoting/WindowManager.cpp

@@ -5,6 +5,8 @@
 #include "WindowManager.h"
 #include "MonarchFactory.h"
 #include "CommandlineArgs.h"
+#include "../inc/WindowingBehavior.h"
+#include "FindTargetWindowArgs.h"
 
 #include "WindowManager.g.cpp"
 #include "../../types/inc/utils.hpp"
@@ -38,7 +40,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                 // stay in this jail until we do.
                 TraceLoggingWrite(g_hRemotingProvider,
                                   "WindowManager_ExceptionInCtor",
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
         }
     }
@@ -69,6 +72,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         // Otherwise, the King will tell us if we should make a new window
         _shouldCreateWindow = _isKing;
         std::optional<uint64_t> givenID;
+        winrt::hstring givenName{};
         if (!_isKing)
         {
             // The monarch may respond back "you should be a new
@@ -86,7 +90,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             {
                 givenID = result.Id().Value();
             }
-
+            givenName = result.WindowName();
             // TraceLogging doesn't have a good solution for logging an
             // optional. So we have to repeat the calls here:
             if (givenID)
@@ -95,7 +99,9 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                   "WindowManager_ProposeCommandline",
                                   TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
                                   TraceLoggingUInt64(givenID.value(), "Id", "The ID we should assign our peasant"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingWideString(givenName.c_str(), "Name", "The name we should assign this window"),
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
             else
             {
@@ -103,24 +109,72 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                   "WindowManager_ProposeCommandline",
                                   TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
                                   TraceLoggingPointer(nullptr, "Id", "No ID provided"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingWideString(givenName.c_str(), "Name", "The name we should assign this window"),
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
             }
         }
         else
         {
             // We're the monarch, we don't need to propose anything. We're just
             // going to do it.
-            TraceLoggingWrite(g_hRemotingProvider,
-                              "WindowManager_ProposeCommandline_AsMonarch",
-                              TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
-                              TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+            //
+            // However, we _do_ need to ask what our name should be. It's
+            // possible someone started the _first_ wt with something like `wt
+            // -w king` as the commandline - we want to make sure we set our
+            // name to "king".
+            //
+            // The FindTargetWindow event is the WindowManager's way of saying
+            // "I do not know how to figure out how to turn this list of args
+            // into a window ID/name. Whoever's listening to this event does, so
+            // I'll ask them". It's a convoluted way of hooking the
+            // WindowManager up to AppLogic without actually telling it anything
+            // about TerminalApp (or even WindowsTerminal)
+            auto findWindowArgs{ winrt::make_self<Remoting::implementation::FindTargetWindowArgs>(args) };
+            _raiseFindTargetWindowRequested(nullptr, *findWindowArgs);
+
+            const auto responseId = findWindowArgs->ResultTargetWindow();
+            if (responseId > 0)
+            {
+                givenID = ::base::saturated_cast<uint64_t>(responseId);
+
+                TraceLoggingWrite(g_hRemotingProvider,
+                                  "WindowManager_ProposeCommandline_AsMonarch",
+                                  TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
+                                  TraceLoggingUInt64(givenID.value(), "Id", "The ID we should assign our peasant"),
+                                  TraceLoggingWideString(givenName.c_str(), "Name", "The name we should assign this window"),
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
+            }
+            else if (responseId == WindowingBehaviorUseName)
+            {
+                givenName = findWindowArgs->ResultTargetWindowName();
+
+                TraceLoggingWrite(g_hRemotingProvider,
+                                  "WindowManager_ProposeCommandline_AsMonarch",
+                                  TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
+                                  TraceLoggingUInt64(0, "Id", "The ID we should assign our peasant"),
+                                  TraceLoggingWideString(givenName.c_str(), "Name", "The name we should assign this window"),
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
+            }
+            else
+            {
+                TraceLoggingWrite(g_hRemotingProvider,
+                                  "WindowManager_ProposeCommandline_AsMonarch",
+                                  TraceLoggingBoolean(_shouldCreateWindow, "CreateWindow", "true iff we should create a new window"),
+                                  TraceLoggingUInt64(0, "Id", "The ID we should assign our peasant"),
+                                  TraceLoggingWideString(L"", "Name", "The name we should assign this window"),
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
+            }
         }
 
         if (_shouldCreateWindow)
         {
             // If we should create a new window, then instantiate our Peasant
             // instance, and tell that peasant to handle that commandline.
-            _createOurPeasant({ givenID });
+            _createOurPeasant({ givenID }, givenName);
 
             // Spawn a thread to wait on the monarch, and handle the election
             if (!_isKing)
@@ -180,7 +234,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                           "WindowManager_ConnectedToMonarch",
                           TraceLoggingUInt64(_monarch.GetPID(), "monarchPID", "The PID of the new Monarch"),
                           TraceLoggingBoolean(_isKing, "isKing", "true if we are the new monarch"),
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
         if (_peasant)
         {
@@ -208,13 +263,17 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         return (ourPID == kingPID);
     }
 
-    Remoting::IPeasant WindowManager::_createOurPeasant(std::optional<uint64_t> givenID)
+    Remoting::IPeasant WindowManager::_createOurPeasant(std::optional<uint64_t> givenID,
+                                                        const winrt::hstring& givenName)
     {
         auto p = winrt::make_self<Remoting::implementation::Peasant>();
         if (givenID)
         {
             p->AssignID(givenID.value());
         }
+
+        // If the name wasn't specified, this will be an empty string.
+        p->WindowName(givenName);
         _peasant = *p;
 
         // Try to add us to the monarch. If that fails, try to find a monarch
@@ -242,7 +301,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         TraceLoggingWrite(g_hRemotingProvider,
                           "WindowManager_CreateOurPeasant",
                           TraceLoggingUInt64(_peasant.GetID(), "peasantID", "The ID of our new peasant"),
-                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
         return _peasant;
     }
@@ -317,7 +377,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                       "WindowManager_FailedToOpenMonarch",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
                                       TraceLoggingUInt64(gle, "lastError", "The result of GetLastError"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
 
                     exitThreadRequested = _performElection();
                     continue;
@@ -333,7 +394,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                     TraceLoggingWrite(g_hRemotingProvider,
                                       "WindowManager_MonarchDied",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     // Connect to the new monarch, which might be us!
                     // If we become the monarch, then we'll return true and exit this thread.
                     exitThreadRequested = _performElection();
@@ -344,7 +406,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                     TraceLoggingWrite(g_hRemotingProvider,
                                       "WindowManager_MonarchWaitInterrupted",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     exitThreadRequested = true;
                     break;
 
@@ -353,7 +416,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                     TraceLoggingWrite(g_hRemotingProvider,
                                       "WindowManager_MonarchWaitTimeout",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     exitThreadRequested = true;
                     break;
 
@@ -365,7 +429,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                                       "WindowManager_WaitFailed",
                                       TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
                                       TraceLoggingUInt64(gle, "lastError", "The result of GetLastError"),
-                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                      TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                      TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     ExitProcess(0);
                 }
                 }
@@ -389,7 +454,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                 TraceLoggingWrite(g_hRemotingProvider,
                                   "WindowManager_ExceptionInWaitThread",
                                   TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                  TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                  TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                 bool foundNewMonarch = false;
                 while (!foundNewMonarch)
                 {
@@ -409,7 +475,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
                         TraceLoggingWrite(g_hRemotingProvider,
                                           "WindowManager_ExceptionInNestedWaitThread",
                                           TraceLoggingUInt64(peasantID, "peasantID", "Our peasant ID"),
-                                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE));
+                                          TraceLoggingLevel(WINEVENT_LEVEL_VERBOSE),
+                                          TraceLoggingKeyword(TIL_KEYWORD_TRACE));
                     }
                 }
             }

src/cascadia/Remoting/WindowManager.h

@@ -54,7 +54,8 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void _createMonarch();
         void _createMonarchAndCallbacks();
         bool _areWeTheKing();
-        winrt::Microsoft::Terminal::Remoting::IPeasant _createOurPeasant(std::optional<uint64_t> givenID);
+        winrt::Microsoft::Terminal::Remoting::IPeasant _createOurPeasant(std::optional<uint64_t> givenID,
+                                                                         const winrt::hstring& givenName);
 
         bool _performElection();
         void _createPeasantThread();

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

@@ -33,7 +33,7 @@
   <!-- ========================= Misc Files ======================== -->
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="Microsoft.Terminal.Remoting.def" />
+    <None Include="$(ProjectName).def" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->
   <ItemGroup>

src/cascadia/ShellExtension/OpenTerminalHere.cpp

@@ -4,11 +4,11 @@
 #include "pch.h"
 #include "OpenTerminalHere.h"
 #include "../WinRTUtils/inc/WtExeUtils.h"
+#include "../WinRTUtils/inc/LibraryResources.h"
+
+#include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include <ShlObj.h>
 
-// TODO GH#6112: Localize these strings
-static constexpr std::wstring_view VerbDisplayName{ L"Open in Windows Terminal" };
-static constexpr std::wstring_view VerbDevBuildDisplayName{ L"Open in Windows Terminal (Dev Build)" };
 static constexpr std::wstring_view VerbName{ L"WindowsTerminalOpenHere" };
 
 // This code is aggressively copied from
@@ -87,8 +87,15 @@ HRESULT OpenTerminalHere::GetTitle(IShellItemArray* /*psiItemArray*/,
 {
     // Change the string we return depending on if we're running from the dev
     // build package or not.
-    const bool isDevBuild = IsDevBuild();
-    return SHStrDup(isDevBuild ? VerbDevBuildDisplayName.data() : VerbDisplayName.data(), ppszName);
+    const auto resource =
+#if defined(WT_BRANDING_RELEASE)
+        RS_(L"ShellExtension_OpenInTerminalMenuItem");
+#elif defined(WT_BRANDING_PREVIEW)
+        RS_(L"ShellExtension_OpenInTerminalMenuItem_Preview");
+#else
+        RS_(L"ShellExtension_OpenInTerminalMenuItem_Dev");
+#endif
+    return SHStrDup(resource.data(), ppszName);
 }
 
 HRESULT OpenTerminalHere::GetState(IShellItemArray* /*psiItemArray*/,

src/cascadia/ShellExtension/WindowsTerminalShellExt.vcxproj

@@ -31,7 +31,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="WindowsTerminalShellExt.def" />
+    <None Include="$(ProjectName).def" />
   </ItemGroup>
   <!-- ========================= Project References ======================== -->
   <ItemGroup>

src/cascadia/ShellExtension/dllmain.cpp

@@ -4,6 +4,8 @@
 #include "pch.h"
 #include "OpenTerminalHere.h"
 
+#include "../WinRTUtils/inc/LibraryResources.h"
+
 using namespace Microsoft::WRL;
 
 STDAPI DllCanUnloadNow()
@@ -30,3 +32,6 @@ DllMain(_In_opt_ HINSTANCE hinst, DWORD reason, _In_opt_ void*)
     }
     return TRUE;
 }
+
+// Usurp the TerminalApp's resource group.
+UTILS_DEFINE_LIBRARY_RESOURCE_SCOPE(L"TerminalApp/Resources")

src/cascadia/TerminalApp/ActionPaletteItem.h

@@ -14,7 +14,7 @@ namespace winrt::TerminalApp::implementation
         ActionPaletteItem() = default;
         ActionPaletteItem(Microsoft::Terminal::Settings::Model::Command const& command);
 
-        GETSET_PROPERTY(Microsoft::Terminal::Settings::Model::Command, Command, nullptr);
+        WINRT_PROPERTY(Microsoft::Terminal::Settings::Model::Command, Command, nullptr);
 
     private:
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _commandChangedRevoker;

src/cascadia/TerminalApp/App.xaml

@@ -1,52 +1,63 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-the MIT License. See LICENSE in the project root for license information. -->
-<Toolkit:XamlApplication
-    x:Class="TerminalApp.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:TerminalApp"
-    xmlns:Toolkit="using:Microsoft.Toolkit.Win32.UI.XamlHost"
-    xmlns:TA="using:TerminalApp"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-    <!-- If you want to prove this works, then add `RequestedTheme="Light"` to
-    the properties on the XamlApplication -->
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+    the MIT License. See LICENSE in the project root for license information.
+-->
+<Toolkit:XamlApplication x:Class="TerminalApp.App"
+                         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                         xmlns:TA="using:TerminalApp"
+                         xmlns:Toolkit="using:Microsoft.Toolkit.Win32.UI.XamlHost"
+                         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                         xmlns:local="using:TerminalApp"
+                         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                         mc:Ignorable="d">
+    <!--
+        If you want to prove this works, then add `RequestedTheme="Light"` to
+        the properties on the XamlApplication
+    -->
     <Toolkit:XamlApplication.Resources>
 
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <!-- Include the MUX Controls resources -->
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
+                <!--  Include the MUX Controls resources  -->
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
                 <ResourceDictionary>
 
-                    <!-- We're going to apply this style to the root Grid acting
-                    as the tab row, because we need to be able to set its
-                    `Background` property to "{ThemeResource
-                    ApplicationPageBackgroundThemeBrush}" so it will be colored
-                    appropriately for the theme, regardless of what we set the
-                    RequestedTheme to -->
-                    <Style x:Name="BackgroundGridThemeStyle" TargetType="Grid">
+                    <!--
+                        We're going to apply this style to the root Grid acting
+                        as the tab row, because we need to be able to set its
+                        `Background` property to "{ThemeResource
+                        ApplicationPageBackgroundThemeBrush}" so it will be colored
+                        appropriately for the theme, regardless of what we set the
+                        RequestedTheme to
+                    -->
+                    <Style x:Name="BackgroundGridThemeStyle"
+                           TargetType="Grid">
                         <Setter Property="Background" Value="{ThemeResource ApplicationPageBackgroundThemeBrush}" />
                     </Style>
 
-                    <!-- We need to manually create the error text brush as a
-                    theme-dependent brush. SystemControlErrorTextForegroundBrush
-                    is unfortunately static. -->
-                    <SolidColorBrush x:Name="ErrorTextBrush" Color="{ThemeResource SystemErrorTextColor}" />
+                    <!--
+                        We need to manually create the error text brush as a
+                        theme-dependent brush. SystemControlErrorTextForegroundBrush
+                        is unfortunately static.
+                    -->
+                    <SolidColorBrush x:Name="ErrorTextBrush"
+                                     Color="{ThemeResource SystemErrorTextColor}" />
 
                     <!--  Suppress top padding  -->
                     <Thickness x:Key="TabViewHeaderPadding">8,0,8,0</Thickness>
 
                     <ResourceDictionary.ThemeDictionaries>
                         <ResourceDictionary x:Key="Dark">
-                            <!-- Define resources for Dark mode here -->
-                            <SolidColorBrush x:Key="TabViewBackground" Color="#FF333333" />
+                            <!--  Define resources for Dark mode here  -->
+                            <SolidColorBrush x:Key="TabViewBackground"
+                                             Color="#FF333333" />
                         </ResourceDictionary>
 
                         <ResourceDictionary x:Key="Light">
-                            <!-- Define resources for Light mode here -->
-                            <SolidColorBrush x:Key="TabViewBackground" Color="#FFCCCCCC" />
+                            <!--  Define resources for Light mode here  -->
+                            <SolidColorBrush x:Key="TabViewBackground"
+                                             Color="#FFCCCCCC" />
                         </ResourceDictionary>
 
                     </ResourceDictionary.ThemeDictionaries>

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -17,7 +17,7 @@ using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace ::TerminalApp;
 
@@ -39,7 +39,7 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleDuplicateTab(const IInspectable& /*sender*/,
                                            const ActionEventArgs& args)
     {
-        _DuplicateTabViewItem();
+        _DuplicateFocusedTab();
         args.Handled(true);
     }
 
@@ -89,15 +89,23 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleNextTab(const IInspectable& /*sender*/,
                                       const ActionEventArgs& args)
     {
-        _SelectNextTab(true);
-        args.Handled(true);
+        const auto& realArgs = args.ActionArgs().try_as<NextTabArgs>();
+        if (realArgs)
+        {
+            _SelectNextTab(true, realArgs.SwitcherMode());
+            args.Handled(true);
+        }
     }
 
     void TerminalPage::_HandlePrevTab(const IInspectable& /*sender*/,
                                       const ActionEventArgs& args)
     {
-        _SelectNextTab(false);
-        args.Handled(true);
+        const auto& realArgs = args.ActionArgs().try_as<PrevTabArgs>();
+        if (realArgs)
+        {
+            _SelectNextTab(false, realArgs.SwitcherMode());
+            args.Handled(true);
+        }
     }
 
     void TerminalPage::_HandleSendInput(const IInspectable& /*sender*/,
@@ -109,9 +117,11 @@ namespace winrt::TerminalApp::implementation
         }
         else if (const auto& realArgs = args.ActionArgs().try_as<SendInputArgs>())
         {
-            const auto termControl = _GetActiveControl();
-            termControl.SendInput(realArgs.Input());
-            args.Handled(true);
+            if (const auto termControl{ _GetActiveControl() })
+            {
+                termControl.SendInput(realArgs.Input());
+                args.Handled(true);
+            }
         }
     }
 
@@ -300,9 +310,11 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto& realArgs = args.ActionArgs().try_as<AdjustFontSizeArgs>())
         {
-            const auto termControl = _GetActiveControl();
-            termControl.AdjustFontSize(realArgs.Delta());
-            args.Handled(true);
+            if (const auto& termControl{ _GetActiveControl() })
+            {
+                termControl.AdjustFontSize(realArgs.Delta());
+                args.Handled(true);
+            }
         }
     }
 
@@ -316,17 +328,21 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleResetFontSize(const IInspectable& /*sender*/,
                                             const ActionEventArgs& args)
     {
-        const auto termControl = _GetActiveControl();
-        termControl.ResetFontSize();
-        args.Handled(true);
+        if (const auto& termControl{ _GetActiveControl() })
+        {
+            termControl.ResetFontSize();
+            args.Handled(true);
+        }
     }
 
     void TerminalPage::_HandleToggleShaderEffects(const IInspectable& /*sender*/,
                                                   const ActionEventArgs& args)
     {
-        const auto termControl = _GetActiveControl();
-        termControl.ToggleShaderEffects();
-        args.Handled(true);
+        if (const auto& termControl{ _GetActiveControl() })
+        {
+            termControl.ToggleShaderEffects();
+            args.Handled(true);
+        }
     }
 
     void TerminalPage::_HandleToggleFocusMode(const IInspectable& /*sender*/,
@@ -376,7 +392,7 @@ namespace winrt::TerminalApp::implementation
                     if (const auto scheme = _settings.GlobalSettings().ColorSchemes().TryLookup(realArgs.SchemeName()))
                     {
                         auto controlSettings = activeControl.Settings().as<TerminalSettings>();
-                        controlSettings->ApplyColorScheme(scheme);
+                        controlSettings.ApplyColorScheme(scheme);
                         activeControl.UpdateSettings();
                         args.Handled(true);
                     }
@@ -490,7 +506,7 @@ namespace winrt::TerminalApp::implementation
                 return;
             }
 
-            // Since _RemoveTab is asynchronous, create a snapshot of the  tabs we want to remove
+            // Since _RemoveTabs is asynchronous, create a snapshot of the  tabs we want to remove
             std::vector<winrt::TerminalApp::TabBase> tabsToRemove;
             if (index > 0)
             {
@@ -529,7 +545,7 @@ namespace winrt::TerminalApp::implementation
                 return;
             }
 
-            // Since _RemoveTab is asynchronous, create a snapshot of the  tabs we want to remove
+            // Since _RemoveTabs is asynchronous, create a snapshot of the  tabs we want to remove
             std::vector<winrt::TerminalApp::TabBase> tabsToRemove;
             std::copy(begin(_tabs) + index + 1, end(_tabs), std::back_inserter(tabsToRemove));
             _RemoveTabs(tabsToRemove);
@@ -544,8 +560,8 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    void TerminalPage::_HandleOpenTabSearch(const IInspectable& /*sender*/,
-                                            const ActionEventArgs& args)
+    void TerminalPage::_HandleTabSearch(const IInspectable& /*sender*/,
+                                        const ActionEventArgs& args)
     {
         CommandPalette().SetTabs(_tabs, _mruTabs);
         CommandPalette().EnableTabSearchMode();
@@ -598,8 +614,8 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     // Important: Don't take the param by reference, since we'll be doing work
     // on another thread.
-    fire_and_forget _OpenNewWindow(const bool elevate,
-                                   const NewTerminalArgs newTerminalArgs)
+    fire_and_forget TerminalPage::_OpenNewWindow(const bool elevate,
+                                                 const NewTerminalArgs newTerminalArgs)
     {
         // Hop to the BG thread
         co_await winrt::resume_background();
@@ -658,9 +674,8 @@ namespace winrt::TerminalApp::implementation
             newTerminalArgs = NewTerminalArgs();
         }
 
-        auto [profileGuid, settings] = TerminalSettings::BuildSettings(_settings,
-                                                                       newTerminalArgs,
-                                                                       *_bindings);
+        const auto profileGuid{ _settings.GetProfileForArgs(newTerminalArgs) };
+        const auto settings{ TerminalSettings::CreateWithNewTerminalArgs(_settings, newTerminalArgs, *_bindings) };
 
         // Manually fill in the evaluated profile.
         newTerminalArgs.Profile(::Microsoft::Console::Utils::GuidToString(profileGuid));
@@ -668,4 +683,81 @@ namespace winrt::TerminalApp::implementation
         actionArgs.Handled(true);
     }
 
+    // Method Description:
+    // - Raise a IdentifyWindowsRequested event. This will bubble up to the
+    //   AppLogic, to the AppHost, to the Peasant, to the Monarch, then get
+    //   distributed down to _all_ the Peasants, as to display info about the
+    //   window in _every_ Peasant window.
+    // - This action is also buggy right now, because TeachingTips behave
+    //   weird in XAML Islands. See microsoft-ui-xaml#4382
+    // Arguments:
+    // - <unused>
+    // Return Value:
+    // - <none>
+    void TerminalPage::_HandleIdentifyWindows(const IInspectable& /*sender*/,
+                                              const ActionEventArgs& args)
+    {
+        _IdentifyWindowsRequestedHandlers(*this, nullptr);
+        args.Handled(true);
+    }
+
+    // Method Description:
+    // - Display the "Toast" with the name and ID of this window.
+    // - Unlike _HandleIdentifyWindow**s**, this event just displays the window
+    //   ID and name in the current window. It does not involve any bubbling
+    //   up/down the page/logic/host/manager/peasant/monarch.
+    // Arguments:
+    // - <unused>
+    // Return Value:
+    // - <none>
+    void TerminalPage::_HandleIdentifyWindow(const IInspectable& /*sender*/,
+                                             const ActionEventArgs& args)
+    {
+        IdentifyWindow();
+        args.Handled(true);
+    }
+
+    void TerminalPage::_HandleRenameWindow(const IInspectable& /*sender*/,
+                                           const ActionEventArgs& args)
+    {
+        if (args)
+        {
+            if (const auto& realArgs = args.ActionArgs().try_as<RenameWindowArgs>())
+            {
+                const auto newName = realArgs.Name();
+                const auto request = winrt::make_self<implementation::RenameWindowRequestedArgs>(newName);
+                _RenameWindowRequestedHandlers(*this, *request);
+                args.Handled(true);
+            }
+        }
+    }
+
+    void TerminalPage::_HandleOpenWindowRenamer(const IInspectable& /*sender*/,
+                                                const ActionEventArgs& args)
+    {
+        if (WindowRenamer() == nullptr)
+        {
+            // We need to use FindName to lazy-load this object
+            if (MUX::Controls::TeachingTip tip{ FindName(L"WindowRenamer").try_as<MUX::Controls::TeachingTip>() })
+            {
+                tip.Closed({ get_weak(), &TerminalPage::_FocusActiveControl });
+            }
+        }
+
+        _UpdateTeachingTipTheme(WindowRenamer().try_as<winrt::Windows::UI::Xaml::FrameworkElement>());
+        WindowRenamer().IsOpen(true);
+
+        // PAIN: We can't immediately focus the textbox in the TeachingTip. It's
+        // not technically focusable until it is opened. However, it doesn't
+        // provide an event to tell us when it is opened. That's tracked in
+        // microsoft/microsoft-ui-xaml#1607. So for now, the user _needs_ to
+        // click on the text box manually.
+        //
+        // We're also not using a ContentDialog for this, because in Xaml
+        // Islands a text box in a ContentDialog won't receive _any_ keypresses.
+        // Fun!
+        // WindowRenamerTextBox().Focus(FocusState::Programmatic);
+
+        args.Handled(true);
+    }
 }

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -185,9 +185,9 @@ void AppCommandlineArgs::_buildParser()
     maximized->excludes(fullscreen);
     focus->excludes(fullscreen);
 
-    _app.add_option<std::optional<int>, int>("-w,--window",
-                                             _windowTarget,
-                                             RS_A(L"CmdWindowTargetArgDesc"));
+    _app.add_option("-w,--window",
+                    _windowTarget,
+                    RS_A(L"CmdWindowTargetArgDesc"));
 
     // Subcommands
     _buildNewTabParser();
@@ -255,6 +255,10 @@ void AppCommandlineArgs::_buildSplitPaneParser()
         auto* sizeOpt = subcommand.subcommand->add_option("-s,--size",
                                                           _splitPaneSize,
                                                           RS_A(L"CmdSplitPaneSizeArgDesc"));
+
+        subcommand._duplicateOption = subcommand.subcommand->add_flag("-D,--duplicate",
+                                                                      _splitDuplicate,
+                                                                      RS_A(L"CmdSplitPaneDuplicateArgDesc"));
         sizeOpt->check(CLI::Range(0.01f, 0.99f));
 
         // When ParseCommand is called, if this subcommand was provided, this
@@ -283,7 +287,8 @@ void AppCommandlineArgs::_buildSplitPaneParser()
                     style = SplitState::Vertical;
                 }
             }
-            SplitPaneArgs args{ style, _splitPaneSize, terminalArgs };
+            const auto splitMode{ subcommand._duplicateOption && _splitDuplicate ? SplitType::Duplicate : SplitType::Manual };
+            SplitPaneArgs args{ splitMode, style, _splitPaneSize, terminalArgs };
             splitPaneActionAndArgs.Args(args);
             _startupActions.push_back(splitPaneActionAndArgs);
         });
@@ -417,6 +422,14 @@ void AppCommandlineArgs::_addNewTerminalArgs(AppCommandlineArgs::NewTerminalSubc
                                                                   _startingTabColor,
                                                                   RS_A(L"CmdTabColorArgDesc"));
 
+    subcommand.suppressApplicationTitleOption = subcommand.subcommand->add_flag(
+        "--suppressApplicationTitle,!--useApplicationTitle",
+        _suppressApplicationTitle,
+        RS_A(L"CmdSuppressApplicationTitleDesc"));
+
+    subcommand.colorSchemeOption = subcommand.subcommand->add_option("--colorScheme",
+                                                                     _startingColorScheme,
+                                                                     RS_A(L"CmdColorSchemeArgDesc"));
     // Using positionals_at_end allows us to support "wt new-tab -d wsl -d Ubuntu"
     // without CLI11 thinking that we've specified -d twice.
     // There's an alternate construction where we make all subcommands "prefix commands",
@@ -480,8 +493,28 @@ NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewT
 
     if (*subcommand.tabColorOption)
     {
-        const auto tabColor = Microsoft::Console::Utils::ColorFromHexString(_startingTabColor);
-        args.TabColor(static_cast<winrt::Windows::UI::Color>(tabColor));
+        try
+        {
+            // This is gonna throw whenever the string that's currently being parsed
+            // isn't a valid hex string. Let's just eat anything this throws because
+            // we should only lock in the TabColor arg when the user gives a valid hex
+            // str, and we shouldn't crash when the user gives us anything else.
+            const auto tabColor = Microsoft::Console::Utils::ColorFromHexString(_startingTabColor);
+            args.TabColor(static_cast<winrt::Windows::UI::Color>(tabColor));
+        }
+        catch (...)
+        {
+        }
+    }
+
+    if (*subcommand.suppressApplicationTitleOption)
+    {
+        args.SuppressApplicationTitle(_suppressApplicationTitle);
+    }
+
+    if (*subcommand.colorSchemeOption)
+    {
+        args.ColorScheme(winrt::to_hstring(_startingColorScheme));
     }
 
     return args;
@@ -522,10 +555,12 @@ void AppCommandlineArgs::_resetStateToDefault()
     _startingTitle.clear();
     _startingTabColor.clear();
     _commandline.clear();
+    _suppressApplicationTitle = false;
 
     _splitVertical = false;
     _splitHorizontal = false;
     _splitPaneSize = 0.5f;
+    _splitDuplicate = false;
 
     _focusTabIndex = -1;
     _focusNextTab = false;
@@ -673,6 +708,18 @@ std::vector<ActionAndArgs>& AppCommandlineArgs::GetStartupActions()
     return _startupActions;
 }
 
+// Method Description:
+// - Returns whether we should start listening for inbound PTY connections
+//   coming from the operating system default application feature.
+// Arguments:
+// - <none>
+// Return Value:
+// - True if the listener should be started. False otherwise.
+bool AppCommandlineArgs::IsHandoffListener() const noexcept
+{
+    return _isHandoffListener;
+}
+
 // Method Description:
 // - Get the string of text that should be displayed to the user on exit. This
 //   is usually helpful for cases where the user entered some sort of invalid
@@ -715,17 +762,23 @@ bool AppCommandlineArgs::ShouldExitEarly() const noexcept
 // - <none>
 void AppCommandlineArgs::ValidateStartupCommands()
 {
-    // If we parsed no commands, or the first command we've parsed is not a new
-    // tab action, prepend a new-tab command to the front of the list.
-    if (_startupActions.empty() ||
-        _startupActions.front().Action() != ShortcutAction::NewTab)
+    // Only check over the actions list for the potential to add a new-tab
+    // command if we are not starting for the purposes of receiving an inbound
+    // handoff connection from the operating system.
+    if (!_isHandoffListener)
     {
-        // Build the NewTab action from the values we've parsed on the commandline.
-        NewTerminalArgs newTerminalArgs{};
-        NewTabArgs args{ newTerminalArgs };
-        ActionAndArgs newTabAction{ ShortcutAction::NewTab, args };
-        // push the arg onto the front
-        _startupActions.insert(_startupActions.begin(), 1, newTabAction);
+        // If we parsed no commands, or the first command we've parsed is not a new
+        // tab action, prepend a new-tab command to the front of the list.
+        if (_startupActions.empty() ||
+            _startupActions.front().Action() != ShortcutAction::NewTab)
+        {
+            // Build the NewTab action from the values we've parsed on the commandline.
+            NewTerminalArgs newTerminalArgs{};
+            NewTabArgs args{ newTerminalArgs };
+            ActionAndArgs newTabAction{ ShortcutAction::NewTab, args };
+            // push the arg onto the front
+            _startupActions.insert(_startupActions.begin(), 1, newTabAction);
+        }
     }
 }
 
@@ -749,6 +802,15 @@ 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)
 {
+    for (const auto& arg : args)
+    {
+        if (arg == L"-Embedding")
+        {
+            _isHandoffListener = true;
+            return 0;
+        }
+    }
+
     auto commands = ::TerminalApp::AppCommandlineArgs::BuildCommands(args);
 
     for (auto& cmdBlob : commands)
@@ -853,17 +915,12 @@ void AppCommandlineArgs::FullResetState()
     _startupActions.clear();
     _exitMessage = "";
     _shouldExitEarly = false;
+    _isHandoffListener = false;
 
-    _windowTarget = std::nullopt;
+    _windowTarget = {};
 }
 
-std::optional<int> AppCommandlineArgs::GetTargetWindow() const noexcept
+std::string_view AppCommandlineArgs::GetTargetWindow() const noexcept
 {
-    // If the user provides _any_ negative number, then treat it as -1, for "use a new window".
-    if (_windowTarget.has_value() && *_windowTarget < 0)
-    {
-        return { -1 };
-    }
-
     return _windowTarget;
 }

src/cascadia/TerminalApp/AppCommandlineArgs.h

@@ -35,6 +35,7 @@ public:
 
     void ValidateStartupCommands();
     std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs>& GetStartupActions();
+    bool IsHandoffListener() const noexcept;
     const std::string& GetExitMessage();
     bool ShouldExitEarly() const noexcept;
 
@@ -44,7 +45,7 @@ public:
     void DisableHelpInExitMessage();
     void FullResetState();
 
-    std::optional<int> GetTargetWindow() const noexcept;
+    std::string_view GetTargetWindow() const noexcept;
 
 private:
     static const std::wregex _commandDelimiterRegex;
@@ -61,12 +62,15 @@ private:
         CLI::Option* startingDirectoryOption;
         CLI::Option* titleOption;
         CLI::Option* tabColorOption;
+        CLI::Option* suppressApplicationTitleOption;
+        CLI::Option* colorSchemeOption;
     };
 
     struct NewPaneSubcommand : public NewTerminalSubcommand
     {
         CLI::Option* _horizontalOption;
         CLI::Option* _verticalOption;
+        CLI::Option* _duplicateOption;
     };
 
     // --- Subcommands ---
@@ -85,6 +89,8 @@ private:
     std::string _startingDirectory;
     std::string _startingTitle;
     std::string _startingTabColor;
+    std::string _startingColorScheme;
+    bool _suppressApplicationTitle{ false };
 
     winrt::Microsoft::Terminal::Settings::Model::FocusDirection _moveFocusDirection{ winrt::Microsoft::Terminal::Settings::Model::FocusDirection::None };
 
@@ -93,6 +99,7 @@ private:
 
     bool _splitVertical{ false };
     bool _splitHorizontal{ false };
+    bool _splitDuplicate{ false };
     float _splitPaneSize{ 0.5f };
 
     int _focusTabIndex{ -1 };
@@ -102,11 +109,12 @@ private:
 
     const Commandline* _currentCommandline{ nullptr };
     std::optional<winrt::Microsoft::Terminal::Settings::Model::LaunchMode> _launchMode{ std::nullopt };
+    bool _isHandoffListener{ false };
     std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs> _startupActions;
     std::string _exitMessage;
     bool _shouldExitEarly{ false };
 
-    std::optional<int> _windowTarget{ std::nullopt };
+    std::string _windowTarget{};
     // Are you adding more args or attributes here? If they are not reset in _resetStateToDefault, make sure to reset them in FullResetState
 
     winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs _getNewTerminalArgs(NewTerminalSubcommand& subcommand);

src/cascadia/TerminalApp/AppKeyBindings.cpp

@@ -8,7 +8,7 @@
 
 using namespace winrt::Microsoft::Terminal;
 using namespace winrt::TerminalApp;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 
 namespace winrt::TerminalApp::implementation
 {

src/cascadia/TerminalApp/AppKeyBindings.h

@@ -19,7 +19,7 @@ namespace winrt::TerminalApp::implementation
     {
         AppKeyBindings() = default;
 
-        bool TryKeyChord(winrt::Microsoft::Terminal::TerminalControl::KeyChord const& kc);
+        bool TryKeyChord(winrt::Microsoft::Terminal::Control::KeyChord const& kc);
 
         void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
         void SetKeyMapping(const Microsoft::Terminal::Settings::Model::KeyMapping& keymap);

src/cascadia/TerminalApp/AppKeyBindings.idl

@@ -4,7 +4,7 @@ import "ShortcutActionDispatch.idl";
 
 namespace TerminalApp
 {
-    [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.TerminalControl.IKeyBindings
+    [default_interface] runtimeclass AppKeyBindings : Microsoft.Terminal.Control.IKeyBindings
     {
         AppKeyBindings();
 

src/cascadia/TerminalApp/AppLogic.cpp

@@ -5,6 +5,7 @@
 #include "AppLogic.h"
 #include "../inc/WindowingBehavior.h"
 #include "AppLogic.g.cpp"
+#include "FindTargetWindowResult.g.cpp"
 #include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
 
 #include <LibraryResources.h>
@@ -16,7 +17,7 @@ using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::System;
 using namespace winrt::Microsoft::Terminal;
-using namespace winrt::Microsoft::Terminal::TerminalControl;
+using namespace winrt::Microsoft::Terminal::Control;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace ::TerminalApp;
 
@@ -576,9 +577,9 @@ namespace winrt::TerminalApp::implementation
         }
 
         // Use the default profile to determine how big of a window we need.
-        const auto [_, settings] = TerminalSettings::BuildSettings(_settings, nullptr, nullptr);
+        const auto settings{ TerminalSettings::CreateWithNewTerminalArgs(_settings, nullptr, nullptr) };
 
-        auto proposedSize = TermControl::GetProposedDimensions(settings, dpi);
+        auto proposedSize = TermControl::GetProposedDimensions(settings.DefaultSettings(), dpi);
 
         const float scale = static_cast<float>(dpi) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
 
@@ -1035,7 +1036,7 @@ namespace winrt::TerminalApp::implementation
     void AppLogic::_ApplyTheme(const Windows::UI::Xaml::ElementTheme& newTheme)
     {
         // Propagate the event to the host layer, so it can update its own UI
-        _requestedThemeChangedHandlers(*this, newTheme);
+        _RequestedThemeChangedHandlers(*this, newTheme);
     }
 
     UIElement AppLogic::GetRoot() noexcept
@@ -1185,6 +1186,17 @@ namespace winrt::TerminalApp::implementation
             _hasCommandLineArguments = args.size() > 1;
             _appArgs.ValidateStartupCommands();
             _root->SetStartupActions(_appArgs.GetStartupActions());
+
+            // Check if we were started as a COM server for inbound connections of console sessions
+            // coming out of the operating system default application feature. If so,
+            // tell TerminalPage to start the listener as we have to make sure it has the chance
+            // to register a handler to hear about the requests first and is all ready to receive
+            // them before the COM server registers itself. Otherwise, the request might come
+            // in and be routed to an event with no handlers or a non-ready Page.
+            if (_appArgs.IsHandoffListener())
+            {
+                _root->SetInboundListener();
+            }
         }
 
         return result;
@@ -1239,14 +1251,20 @@ namespace winrt::TerminalApp::implementation
     // - WindowingBehaviorUseAnyExisting: We should handle the args "in the current
     //   window ON ANY DESKTOP"
     // - anything else: We should handle the commandline in the window with the given ID.
-    int32_t AppLogic::FindTargetWindow(array_view<const winrt::hstring> args)
+    TerminalApp::FindTargetWindowResult AppLogic::FindTargetWindow(array_view<const winrt::hstring> args)
     {
+        if (!_loadedInitialSettings)
+        {
+            // Load settings if we haven't already
+            LoadSettings();
+        }
+
         return AppLogic::_doFindTargetWindow(args, _settings.GlobalSettings().WindowingBehavior());
     }
 
     // The main body of this function is a static helper, to facilitate unit-testing
-    int32_t AppLogic::_doFindTargetWindow(array_view<const winrt::hstring> args,
-                                          const Microsoft::Terminal::Settings::Model::WindowingMode& windowingBehavior)
+    TerminalApp::FindTargetWindowResult AppLogic::_doFindTargetWindow(array_view<const winrt::hstring> args,
+                                                                      const Microsoft::Terminal::Settings::Model::WindowingMode& windowingBehavior)
     {
         ::TerminalApp::AppCommandlineArgs appArgs;
         const auto result = appArgs.ParseArgs(args);
@@ -1254,31 +1272,70 @@ namespace winrt::TerminalApp::implementation
         {
             if (!appArgs.GetExitMessage().empty())
             {
-                return WindowingBehaviorUseNew;
+                return winrt::make<FindTargetWindowResult>(WindowingBehaviorUseNew);
             }
 
-            const auto parsedTarget = appArgs.GetTargetWindow();
-            if (parsedTarget.has_value())
+            const std::string parsedTarget{ appArgs.GetTargetWindow() };
+
+            // If the user did not provide any value on the commandline,
+            // then lookup our windowing behavior to determine what to do
+            // now.
+            if (parsedTarget.empty())
             {
-                // parsedTarget might be -1, if the user explicitly requested -1
-                // (or any other negative number) on the commandline. So the set
-                // of possible values here is {-1, 0, ℤ+}
-                return *parsedTarget;
-            }
-            else
-            {
-                // If the user did not provide any value on the commandline,
-                // then lookup our windowing behavior to determine what to do
-                // now.
+                int32_t windowId = WindowingBehaviorUseNew;
                 switch (windowingBehavior)
                 {
-                case WindowingMode::UseExisting:
-                    return WindowingBehaviorUseExisting;
-                case WindowingMode::UseAnyExisting:
-                    return WindowingBehaviorUseAnyExisting;
                 case WindowingMode::UseNew:
-                default:
-                    return WindowingBehaviorUseNew;
+                    windowId = WindowingBehaviorUseNew;
+                    break;
+                case WindowingMode::UseExisting:
+                    windowId = WindowingBehaviorUseExisting;
+                    break;
+                case WindowingMode::UseAnyExisting:
+                    windowId = WindowingBehaviorUseAnyExisting;
+                    break;
+                }
+                return winrt::make<FindTargetWindowResult>(windowId);
+            }
+
+            // Here, the user _has_ provided a window-id on the commandline.
+            // What is it? Let's start by checking if it's an int, for the
+            // window's ID:
+            try
+            {
+                int32_t windowId = ::base::saturated_cast<int32_t>(std::stoi(parsedTarget));
+
+                // If the user provides _any_ negative number, then treat it as
+                // -1, for "use a new window".
+                if (windowId < 0)
+                {
+                    windowId = -1;
+                }
+
+                // Hooray! This is a valid integer. The set of possible values
+                // here is {-1, 0, ℤ+}. Let's return that window ID.
+                return winrt::make<FindTargetWindowResult>(windowId);
+            }
+            catch (...)
+            {
+                // Value was not a valid int. It could be any other string to
+                // use as a title though!
+                //
+                // First, check the reserved keywords:
+                if (parsedTarget == "new")
+                {
+                    return winrt::make<FindTargetWindowResult>(WindowingBehaviorUseNew);
+                }
+                else if (parsedTarget == "last")
+                {
+                    return winrt::make<FindTargetWindowResult>(WindowingBehaviorUseExisting);
+                }
+                else
+                {
+                    // The string they provided wasn't an int, it wasn't "new"
+                    // or "last", so whatever it is, that's the name they get.
+                    winrt::hstring winrtName{ til::u8u16(parsedTarget) };
+                    return winrt::make<FindTargetWindowResult>(WindowingBehaviorUseName, winrtName);
                 }
             }
         }
@@ -1294,7 +1351,7 @@ namespace winrt::TerminalApp::implementation
         // create a new window. Then, in that new window, we'll try to  set the
         // StartupActions, which will again fail, returning the correct error
         // message.
-        return WindowingBehaviorUseNew;
+        return winrt::make<FindTargetWindowResult>(WindowingBehaviorUseNew);
     }
 
     // Method Description:
@@ -1343,8 +1400,43 @@ namespace winrt::TerminalApp::implementation
         return _root ? _root->AlwaysOnTop() : false;
     }
 
-    // -------------------------------- WinRT Events ---------------------------------
-    // Winrt events need a method for adding a callback to the event and removing the callback.
-    // These macros will define them both for you.
-    DEFINE_EVENT_WITH_TYPED_EVENT_HANDLER(AppLogic, RequestedThemeChanged, _requestedThemeChangedHandlers, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::ElementTheme);
+    void AppLogic::IdentifyWindow()
+    {
+        if (_root)
+        {
+            _root->IdentifyWindow();
+        }
+    }
+
+    winrt::hstring AppLogic::WindowName()
+    {
+        return _root ? _root->WindowName() : L"";
+    }
+    void AppLogic::WindowName(const winrt::hstring& name)
+    {
+        if (_root)
+        {
+            _root->WindowName(name);
+        }
+    }
+    uint64_t AppLogic::WindowId()
+    {
+        return _root ? _root->WindowId() : 0;
+    }
+    void AppLogic::WindowId(const uint64_t& id)
+    {
+        if (_root)
+        {
+            _root->WindowId(id);
+        }
+    }
+
+    void AppLogic::RenameFailed()
+    {
+        if (_root)
+        {
+            _root->RenameFailed();
+        }
+    }
+
 }

src/cascadia/TerminalApp/AppLogic.h

@@ -4,6 +4,7 @@
 #pragma once
 
 #include "AppLogic.g.h"
+#include "FindTargetWindowResult.g.h"
 #include "TerminalPage.h"
 #include "Jumplist.h"
 #include "../../cascadia/inc/cppwinrt_utils.h"
@@ -18,6 +19,19 @@ namespace TerminalAppLocalTests
 
 namespace winrt::TerminalApp::implementation
 {
+    struct FindTargetWindowResult : FindTargetWindowResultT<FindTargetWindowResult>
+    {
+        WINRT_PROPERTY(int32_t, WindowId, -1);
+        WINRT_PROPERTY(winrt::hstring, WindowName, L"");
+
+    public:
+        FindTargetWindowResult(const int32_t id, const winrt::hstring& name) :
+            _WindowId{ id }, _WindowName{ name } {};
+
+        FindTargetWindowResult(const int32_t id) :
+            FindTargetWindowResult(id, L""){};
+    };
+
     struct AppLogic : AppLogicT<AppLogic, IInitializeWithWindow>
     {
     public:
@@ -38,7 +52,7 @@ namespace winrt::TerminalApp::implementation
 
         int32_t SetStartupCommandline(array_view<const winrt::hstring> actions);
         int32_t ExecuteCommandline(array_view<const winrt::hstring> actions, const winrt::hstring& cwd);
-        int32_t FindTargetWindow(array_view<const winrt::hstring> actions);
+        TerminalApp::FindTargetWindowResult FindTargetWindow(array_view<const winrt::hstring> actions);
         winrt::hstring ParseCommandlineMessage();
         bool ShouldExitEarly();
 
@@ -46,6 +60,13 @@ namespace winrt::TerminalApp::implementation
         bool Fullscreen() const;
         bool AlwaysOnTop() const;
 
+        void IdentifyWindow();
+        void RenameFailed();
+        winrt::hstring WindowName();
+        void WindowName(const winrt::hstring& name);
+        uint64_t WindowId();
+        void WindowId(const uint64_t& id);
+
         Windows::Foundation::Size GetLaunchDimensions(uint32_t dpi);
         bool CenterOnLaunch();
         TerminalApp::InitialPosition GetInitialPosition(int64_t defaultInitialX, int64_t defaultInitialY);
@@ -69,7 +90,7 @@ namespace winrt::TerminalApp::implementation
         winrt::Windows::Foundation::IAsyncOperation<winrt::Windows::UI::Xaml::Controls::ContentDialogResult> ShowDialog(winrt::Windows::UI::Xaml::Controls::ContentDialog dialog);
 
         // -------------------------------- WinRT Events ---------------------------------
-        DECLARE_EVENT_WITH_TYPED_EVENT_HANDLER(RequestedThemeChanged, _requestedThemeChangedHandlers, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::ElementTheme);
+        TYPED_EVENT(RequestedThemeChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::UI::Xaml::ElementTheme);
 
     private:
         bool _isUwp{ false };
@@ -98,8 +119,8 @@ namespace winrt::TerminalApp::implementation
         ::TerminalApp::AppCommandlineArgs _appArgs;
         ::TerminalApp::AppCommandlineArgs _settingsAppArgs;
         int _ParseArgs(winrt::array_view<const hstring>& args);
-        static int32_t _doFindTargetWindow(winrt::array_view<const hstring> args,
-                                           const Microsoft::Terminal::Settings::Model::WindowingMode& windowingBehavior);
+        static TerminalApp::FindTargetWindowResult _doFindTargetWindow(winrt::array_view<const hstring> args,
+                                                                       const Microsoft::Terminal::Settings::Model::WindowingMode& windowingBehavior);
 
         void _ShowLoadErrorsDialog(const winrt::hstring& titleKey, const winrt::hstring& contentKey, HRESULT settingsLoadedResult);
         void _ShowLoadWarningsDialog();
@@ -135,6 +156,8 @@ namespace winrt::TerminalApp::implementation
         FORWARDED_TYPED_EVENT(AlwaysOnTopChanged, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, AlwaysOnTopChanged);
         FORWARDED_TYPED_EVENT(RaiseVisualBell, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, RaiseVisualBell);
         FORWARDED_TYPED_EVENT(SetTaskbarProgress, winrt::Windows::Foundation::IInspectable, winrt::Windows::Foundation::IInspectable, _root, SetTaskbarProgress);
+        FORWARDED_TYPED_EVENT(IdentifyWindowsRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, IdentifyWindowsRequested);
+        FORWARDED_TYPED_EVENT(RenameWindowRequested, Windows::Foundation::IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs, _root, RenameWindowRequested);
 
 #ifdef UNIT_TESTING
         friend class TerminalAppLocalTests::CommandlineTest;

src/cascadia/TerminalApp/AppLogic.idl

@@ -13,6 +13,12 @@ namespace TerminalApp
         Int64 Y;
     };
 
+    [default_interface] runtimeclass FindTargetWindowResult
+    {
+        Int32 WindowId { get; };
+        String WindowName { get; };
+    };
+
     [default_interface] runtimeclass AppLogic : IDirectKeyListener, IDialogPresenter
     {
         AppLogic();
@@ -42,6 +48,11 @@ namespace TerminalApp
         Boolean Fullscreen { get; };
         Boolean AlwaysOnTop { get; };
 
+        void IdentifyWindow();
+        String WindowName;
+        UInt64 WindowId;
+        void RenameFailed();
+
         Windows.Foundation.Size GetLaunchDimensions(UInt32 dpi);
         Boolean CenterOnLaunch { get; };
 
@@ -57,7 +68,7 @@ namespace TerminalApp
         UInt64 GetLastActiveControlTaskbarState();
         UInt64 GetLastActiveControlTaskbarProgress();
 
-        Int32 FindTargetWindow(String[] args);
+        FindTargetWindowResult FindTargetWindow(String[] args);
 
         // See IDialogPresenter and TerminalPage's DialogPresenter for more
         // information.
@@ -72,5 +83,7 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, Object> AlwaysOnTopChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> RaiseVisualBell;
         event Windows.Foundation.TypedEventHandler<Object, Object> SetTaskbarProgress;
+        event Windows.Foundation.TypedEventHandler<Object, Object> IdentifyWindowsRequested;
+        event Windows.Foundation.TypedEventHandler<Object, RenameWindowRequestedArgs> RenameWindowRequested;
     }
 }

src/cascadia/TerminalApp/ColorPickupFlyout.xaml

@@ -1,146 +1,193 @@
-<Flyout
-    x:Class="TerminalApp.ColorPickupFlyout"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:TerminalApp"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
+<Flyout x:Class="TerminalApp.ColorPickupFlyout"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="using:TerminalApp"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d">
     <Flyout.FlyoutPresenterStyle>
         <Style TargetType="FlyoutPresenter">
-            <Setter Property="MinWidth" Value="0"/>
+            <Setter Property="MinWidth" Value="0" />
         </Style>
     </Flyout.FlyoutPresenterStyle>
     <StackPanel Orientation="Horizontal">
         <StackPanel XYFocusKeyboardNavigation="Enabled">
-            <VariableSizedWrapGrid Orientation="Horizontal" MaximumRowsOrColumns="4" HorizontalAlignment="Center" Margin="0, 3, 0, 0">
+            <VariableSizedWrapGrid Margin="0,3,0,0"
+                                   HorizontalAlignment="Center"
+                                   MaximumRowsOrColumns="4"
+                                   Orientation="Horizontal">
                 <VariableSizedWrapGrid.Resources>
                     <Style TargetType="Rectangle">
-                        <Setter Property="Width" Value="30"/>
-                        <Setter Property="Height" Value="30"/>
+                        <Setter Property="Width" Value="30" />
+                        <Setter Property="Height" Value="30" />
                     </Style>
                     <Style TargetType="Button">
-                        <Setter Property="Padding" Value="0"/>
-                        <Setter Property="Margin" Value="2"/>
+                        <Setter Property="Padding" Value="0" />
+                        <Setter Property="Margin" Value="2" />
                     </Style>
                 </VariableSizedWrapGrid.Resources>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="Crimson" x:Uid="CrimsonColorButton">
+                <Button x:Uid="CrimsonColorButton"
+                        AutomationProperties.Name="Crimson"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="Crimson"/>
+                        <Rectangle Fill="Crimson" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="SteelBlue" x:Uid="SteelBlueColorButton">
+                <Button x:Uid="SteelBlueColorButton"
+                        AutomationProperties.Name="SteelBlue"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="SteelBlue"/>
+                        <Rectangle Fill="SteelBlue" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="MediumSeaGreen" x:Uid="MediumSeaGreenColorButton">
+                <Button x:Uid="MediumSeaGreenColorButton"
+                        AutomationProperties.Name="MediumSeaGreen"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="MediumSeaGreen"/>
+                        <Rectangle Fill="MediumSeaGreen" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="DarkOrange" x:Uid="DarkOrangeColorButton">
+                <Button x:Uid="DarkOrangeColorButton"
+                        AutomationProperties.Name="DarkOrange"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="DarkOrange"/>
+                        <Rectangle Fill="DarkOrange" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="MediumVioletRed" x:Uid="MediumVioletRedColorButton">
+                <Button x:Uid="MediumVioletRedColorButton"
+                        AutomationProperties.Name="MediumVioletRed"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="MediumVioletRed"/>
+                        <Rectangle Fill="MediumVioletRed" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="DodgerBlue" x:Uid="DodgerBlueColorButton">
+                <Button x:Uid="DodgerBlueColorButton"
+                        AutomationProperties.Name="DodgerBlue"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="DodgerBlue"/>
+                        <Rectangle Fill="DodgerBlue" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="LimeGreen" x:Uid="LimeGreenColorButton">
+                <Button x:Uid="LimeGreenColorButton"
+                        AutomationProperties.Name="LimeGreen"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="LimeGreen"/>
+                        <Rectangle Fill="LimeGreen" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="Yellow" x:Uid="YellowColorButton">
+                <Button x:Uid="YellowColorButton"
+                        AutomationProperties.Name="Yellow"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="Yellow"/>
+                        <Rectangle Fill="Yellow" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="BlueViolet" x:Uid="BlueVioletColorButton">
+                <Button x:Uid="BlueVioletColorButton"
+                        AutomationProperties.Name="BlueViolet"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="BlueViolet"/>
+                        <Rectangle Fill="BlueViolet" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="SlateBlue" x:Uid="SlateBlueColorButton">
+                <Button x:Uid="SlateBlueColorButton"
+                        AutomationProperties.Name="SlateBlue"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="SlateBlue"/>
+                        <Rectangle Fill="SlateBlue" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="Lime" x:Uid="LimeColorButton">
+                <Button x:Uid="LimeColorButton"
+                        AutomationProperties.Name="Lime"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="Lime"/>
+                        <Rectangle Fill="Lime" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="Tan" x:Uid="TanColorButton">
+                <Button x:Uid="TanColorButton"
+                        AutomationProperties.Name="Tan"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="Tan"/>
+                        <Rectangle Fill="Tan" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="Magenta" x:Uid="MagentaColorButton">
+                <Button x:Uid="MagentaColorButton"
+                        AutomationProperties.Name="Magenta"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="Magenta"/>
+                        <Rectangle Fill="Magenta" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="Cyan" x:Uid="CyanColorButton">
+                <Button x:Uid="CyanColorButton"
+                        AutomationProperties.Name="Cyan"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="Cyan"/>
+                        <Rectangle Fill="Cyan" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="SkyBlue" x:Uid="SkyBlueColorButton">
+                <Button x:Uid="SkyBlueColorButton"
+                        AutomationProperties.Name="SkyBlue"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="SkyBlue"/>
+                        <Rectangle Fill="SkyBlue" />
                     </Button.Content>
                 </Button>
-                <Button Click="ColorButton_Click" AutomationProperties.Name="DarkGray" x:Uid="DarkGrayColorButton">
+                <Button x:Uid="DarkGrayColorButton"
+                        AutomationProperties.Name="DarkGray"
+                        Click="ColorButton_Click">
                     <Button.Content>
-                        <Rectangle Fill="DarkGray"/>
+                        <Rectangle Fill="DarkGray" />
                     </Button.Content>
                 </Button>
             </VariableSizedWrapGrid>
-            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+            <StackPanel HorizontalAlignment="Center"
+                        Orientation="Horizontal">
                 <StackPanel.Resources>
                     <Style TargetType="Button">
                         <Setter Property="Margin" Value="2" />
                         <Setter Property="HorizontalAlignment" Value="Stretch" />
                     </Style>
                 </StackPanel.Resources>
-                <Button Padding="5"
-                    Click="ClearColorButton_Click"
-                    x:Name="ClearColorButton" x:Uid="TabColorClearButton" CornerRadius="2" Content="Reset">
-                </Button>
-                <Button Padding="5"
-                    Click="ShowColorPickerButton_Click"
-                    x:Name="CustomColorButton" x:Uid="TabColorCustomButton" CornerRadius="2" Content="Custom...">
-                </Button>
+                <Button x:Name="ClearColorButton"
+                        x:Uid="TabColorClearButton"
+                        Padding="5"
+                        Click="ClearColorButton_Click"
+                        Content="Reset"
+                        CornerRadius="2" />
+                <Button x:Name="CustomColorButton"
+                        x:Uid="TabColorCustomButton"
+                        Padding="5"
+                        Click="ShowColorPickerButton_Click"
+                        Content="Custom..."
+                        CornerRadius="2" />
             </StackPanel>
         </StackPanel>
-        <Grid Visibility="Collapsed" x:Name="customColorPanel" Margin="5">
+        <Grid x:Name="customColorPanel"
+              Margin="5"
+              Visibility="Collapsed">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <ColorPicker x:Name="customColorPicker"
-                     IsMoreButtonVisible="True"
-                     IsColorSliderVisible="True"
-                     IsColorChannelTextInputVisible="True"
-                     IsHexInputVisible="True"
-                     IsAlphaEnabled="False"
-                     IsAlphaSliderVisible="False"
-                     IsAlphaTextInputVisible="False"
-                     FontSize="10"
-                     Grid.Row="0"
-                     ColorChanged="ColorPicker_ColorChanged"
-                     >
-            </ColorPicker>
-            <Button x:Name="OkButton" Click="CustomColorButton_Click" Grid.Row="1" HorizontalAlignment="Center" MinWidth="130" MinHeight="12" Margin="0, 5, 0, 0" x:Uid="OkButton" Content="**OK**"/>
+                         Grid.Row="0"
+                         ColorChanged="ColorPicker_ColorChanged"
+                         FontSize="10"
+                         IsAlphaEnabled="False"
+                         IsAlphaSliderVisible="False"
+                         IsAlphaTextInputVisible="False"
+                         IsColorChannelTextInputVisible="True"
+                         IsColorSliderVisible="True"
+                         IsHexInputVisible="True"
+                         IsMoreButtonVisible="True" />
+            <Button x:Name="OkButton"
+                    x:Uid="OkButton"
+                    Grid.Row="1"
+                    MinWidth="130"
+                    MinHeight="12"
+                    Margin="0,5,0,0"
+                    HorizontalAlignment="Center"
+                    Click="CustomColorButton_Click"
+                    Content="**OK**" />
         </Grid>
     </StackPanel>
 </Flyout>

src/cascadia/TerminalApp/CommandLinePaletteItem.h

@@ -14,7 +14,7 @@ namespace winrt::TerminalApp::implementation
         CommandLinePaletteItem() = default;
         CommandLinePaletteItem(winrt::hstring const& commandLine);
 
-        GETSET_PROPERTY(winrt::hstring, CommandLine);
+        WINRT_PROPERTY(winrt::hstring, CommandLine);
     };
 }
 

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -14,6 +14,7 @@ using namespace winrt;
 using namespace winrt::TerminalApp;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Xaml;
+using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::System;
 using namespace winrt::Windows::Foundation;
 using namespace winrt::Windows::Foundation::Collections;
@@ -256,7 +257,7 @@ namespace winrt::TerminalApp::implementation
         // a really widely used keyboard navigation key.
         if (_currentMode == CommandPaletteMode::TabSwitchMode && _keymap)
         {
-            winrt::Microsoft::Terminal::TerminalControl::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast<int32_t>(key) };
+            winrt::Microsoft::Terminal::Control::KeyChord kc{ ctrlDown, altDown, shiftDown, static_cast<int32_t>(key) };
             const auto action = _keymap.TryLookup(kc);
             if (action)
             {
@@ -311,6 +312,13 @@ namespace winrt::TerminalApp::implementation
         }
         else if (key == VirtualKey::Enter)
         {
+            if (const auto& button = e.OriginalSource().try_as<Button>())
+            {
+                // Let the button handle the Enter key so an eventually attached click handler will be called
+                e.Handled(false);
+                return;
+            }
+
             const auto selectedCommand = _filteredActionsView().SelectedItem();
             const auto filteredCommand = selectedCommand.try_as<winrt::TerminalApp::FilteredCommand>();
             _dispatchCommand(filteredCommand);
@@ -503,6 +511,7 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_moveBackButtonClicked(Windows::Foundation::IInspectable const& /*sender*/,
                                                 Windows::UI::Xaml::RoutedEventArgs const&)
     {
+        _PreviewActionHandlers(*this, nullptr);
         _nestedActionStack.Clear();
         ParentCommandName(L"");
         _currentNestedCommands.Clear();
@@ -629,7 +638,13 @@ namespace winrt::TerminalApp::implementation
                     // palette like the Tab Switcher will be able to have the last laugh.
                     _close();
 
-                    _DispatchCommandRequestedHandlers(*this, actionPaletteItem.Command());
+                    // But make an exception for the Toggle Command Palette action: we don't want the dispatch
+                    // make the command palette - that was just closed - visible again.
+                    // All other actions can just be dispatched.
+                    if (actionPaletteItem.Command().ActionAndArgs().Action() != ShortcutAction::ToggleCommandPalette)
+                    {
+                        _DispatchCommandRequestedHandlers(*this, actionPaletteItem.Command());
+                    }
 
                     TraceLoggingWrite(
                         g_hTerminalAppProvider, // handle to TerminalApp tracelogging provider
@@ -927,6 +942,10 @@ namespace winrt::TerminalApp::implementation
         ParsedCommandLineText(L"");
         _searchBox().Text(L"");
         _searchBox().Select(_searchBox().Text().size(), 0);
+
+        _nestedActionStack.Clear();
+        ParentCommandName(L"");
+        _currentNestedCommands.Clear();
         // Leaving this block of code outside the above if-statement
         // guarantees that the correct text is shown for the mode
         // whenever _switchToMode is called.

src/cascadia/TerminalApp/CommandPalette.h

@@ -48,12 +48,12 @@ namespace winrt::TerminalApp::implementation
         void EnableTabSearchMode();
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, SearchBoxPlaceholderText, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, PrefixCharacter, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ControlName, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ParentCommandName, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, ParsedCommandLineText, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, NoMatchesText, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, SearchBoxPlaceholderText, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, PrefixCharacter, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, ControlName, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, ParentCommandName, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, ParsedCommandLineText, _PropertyChangedHandlers);
 
         TYPED_EVENT(SwitchToTabRequested, winrt::TerminalApp::CommandPalette, winrt::TerminalApp::TabBase);
         TYPED_EVENT(CommandLineExecutionRequested, winrt::TerminalApp::CommandPalette, winrt::hstring);

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -1,490 +1,500 @@
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
-the MIT License. See LICENSE in the project root for license information. -->
-<UserControl
-    x:Class="TerminalApp.CommandPalette"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:TerminalApp"
-    xmlns:model="using:Microsoft.Terminal.Settings.Model"
-    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"
-    xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
-    xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
-    TabNavigation="Cycle"
-    IsTabStop="True"
-    AllowFocusOnInteraction="True"
-    PointerPressed="_rootPointerPressed"
-    PreviewKeyDown="_previewKeyDownHandler"
-    PreviewKeyUp="_keyUpHandler"
-    LostFocus="_lostFocusHandler"
-    mc:Ignorable="d"
-    AutomationProperties.Name="{x:Bind ControlName, Mode=OneWay}">
-
-    <UserControl.Resources>
-        <ResourceDictionary>
-
-            <!-- ThemeShadow is only on 18362. This "Windows10version1903" bit
-            adds it conditionally -->
-            <Windows10version1903:ThemeShadow x:Name="CommandPaletteShadow" />
-
-            <!-- This creates an instance of our CommandKeyChordVisibilityConverter we can reference below -->
-            <local:EmptyStringVisibilityConverter x:Key="CommandKeyChordVisibilityConverter"/>
-            <local:EmptyStringVisibilityConverter x:Key="ParsedCommandLineTextVisibilityConverter"/>
-            <local:EmptyStringVisibilityConverter x:Key="ParentCommandVisibilityConverter"/>
-            <model:IconPathConverter x:Key="IconSourceConverter"/>
-
-            <DataTemplate x:Key="ListItemTemplate" x:DataType="local:FilteredCommand">
-                <ListViewItem HorizontalContentAlignment="Stretch"
-                                  AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
-                                  AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}"/>
-            </DataTemplate>
-
-            <DataTemplate x:Key="GeneralItemTemplate" x:DataType="local:FilteredCommand">
-                <Grid HorizontalAlignment="Stretch" ColumnSpacing="8">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="16"/>
-                        <!-- icon -->
-                        <ColumnDefinition Width="Auto"/>
-                        <!-- command label -->
-                        <ColumnDefinition Width="*"/>
-                        <!-- key chord -->
-                        <ColumnDefinition Width="16"/>
-                        <!-- gutter for scrollbar -->
-                    </Grid.ColumnDefinitions>
-
-                    <IconSourceElement
-                                Grid.Column="0"
-                                Width="16"
-                                Height="16"
-                                IconSource="{x:Bind Item.Icon,
-                                                    Mode=OneWay,
-                                                    Converter={StaticResource IconSourceConverter}}"/>
-
-                    <local:HighlightedTextControl
-                                Grid.Column="1"
-                                HorizontalAlignment="Left"
-                                Text="{x:Bind HighlightedName, Mode=OneWay}"/>
-
-                    <!-- The block for the key chord is only visible
-                            when there's actual text set as the label. See
-                            CommandKeyChordVisibilityConverter for details.
-                            We're setting the accessibility view on the
-                            border and text block to Raw because otherwise,
-                            Narrator will read out the key chord. Problem is,
-                            it already did that because it was the list item's
-                            "AcceleratorKey". It's redundant. -->
-                    <Border
-                                Grid.Column="2"
-                                Visibility="{x:Bind Item.KeyChordText,
-                                                Mode=OneWay,
-                                                Converter={StaticResource CommandKeyChordVisibilityConverter}}"
-                                Style="{ThemeResource KeyChordBorderStyle}"
-                                Padding="2,0,2,0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                AutomationProperties.AccessibilityView="Raw">
-
-                        <TextBlock
-                                    Style="{ThemeResource KeyChordTextBlockStyle}"
-                                    FontSize="12"
-                                    Text="{x:Bind Item.KeyChordText, Mode=OneWay}"
-                                    AutomationProperties.AccessibilityView="Raw" />
-                    </Border>
-                </Grid>
-            </DataTemplate>
-
-            <DataTemplate x:Key="NestedItemTemplate" x:DataType="local:FilteredCommand">
-                <Grid HorizontalAlignment="Stretch" ColumnSpacing="8">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="16"/>
-                        <!-- icon -->
-                        <ColumnDefinition Width="Auto"/>
-                        <!-- command label -->
-                        <ColumnDefinition Width="*"/>
-                        <!-- key chord -->
-                        <ColumnDefinition Width="16"/>
-                        <!-- gutter for scrollbar -->
-                    </Grid.ColumnDefinitions>
-
-                    <IconSourceElement
-                                Grid.Column="0"
-                                Width="16"
-                                Height="16"
-                                IconSource="{x:Bind Item.Icon,
-                                                    Mode=OneWay,
-                                                    Converter={StaticResource IconSourceConverter}}"/>
-
-                    <local:HighlightedTextControl
-                                Grid.Column="1"
-                                HorizontalAlignment="Left"
-                                Text="{x:Bind HighlightedName, Mode=OneWay}"/>
-
-                    <!-- The block for the key chord is only visible
-                            when there's actual text set as the label. See
-                            CommandKeyChordVisibilityConverter for details.
-                            We're setting the accessibility view on the
-                            border and text block to Raw because otherwise,
-                            Narrator will read out the key chord. Problem is,
-                            it already did that because it was the list item's
-                            "AcceleratorKey". It's redundant. -->
-                    <Border
-                                Grid.Column="2"
-                                Visibility="{x:Bind Item.KeyChordText,
-                                                Mode=OneWay,
-                                                Converter={StaticResource CommandKeyChordVisibilityConverter}}"
-                                Style="{ThemeResource KeyChordBorderStyle}"
-                                Padding="2,0,2,0"
-                                HorizontalAlignment="Right"
-                                VerticalAlignment="Center"
-                                AutomationProperties.AccessibilityView="Raw">
-
-                        <TextBlock
-                                    Style="{ThemeResource KeyChordTextBlockStyle}"
-                                    FontSize="12"
-                                    Text="{x:Bind Item.KeyChordText, Mode=OneWay}"
-                                    AutomationProperties.AccessibilityView="Raw" />
-                    </Border>
-
-                    <!-- xE70E is ChevronUp. Rotated 90 degrees, it's _ChevronRight_ -->
-                    <FontIcon
-                                FontFamily="Segoe MDL2 Assets"
-                                Glyph="&#xE70E;"
-                                HorizontalAlignment="Right"
-                                Grid.Column="2">
-
-                        <FontIcon.RenderTransform>
-                            <RotateTransform CenterX="0.5" CenterY="0.5" Angle="90"/>
-                        </FontIcon.RenderTransform>
-                    </FontIcon>
-
-                </Grid>
-            </DataTemplate>
-
-            <DataTemplate x:Key="TabItemTemplate" x:DataType="local:FilteredCommand">
-                <Grid HorizontalAlignment="Stretch" ColumnSpacing="8" AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="16"/>
-                        <!-- icon / progress -->
-                        <ColumnDefinition Width="Auto"/>
-                        <!-- command label -->
-                        <ColumnDefinition Width="*"/>
-                        <!-- gutter for indicators -->
-                        <ColumnDefinition Width="Auto"/>
-                        <!-- Indicators -->
-                        <ColumnDefinition Width="16"/>
-                        <!-- gutter for scrollbar -->
-                    </Grid.ColumnDefinitions>
-
-                    <mux:ProgressRing
-                        Grid.Column="0"
-                        IsActive="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsProgressRingActive, Mode=OneWay}"
-                        Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsProgressRingActive, Mode=OneWay}"
-                        IsIndeterminate="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsProgressRingIndeterminate, Mode=OneWay}"
-                        Value="{x:Bind Item.(local:TabPaletteItem.TabStatus).ProgressValue, Mode=OneWay}"
-                        MinHeight="0"
-                        MinWidth="0"
-                        Height="15"
-                        Width="15"/>
-
-                    <IconSourceElement
-                                Grid.Column="0"
-                                Width="16"
-                                Height="16"
-                                IconSource="{x:Bind Item.Icon,
-                                                    Mode=OneWay,
-                                                    Converter={StaticResource IconSourceConverter}}"/>
-
-                    <local:HighlightedTextControl
-                                Grid.Column="1"
-                                HorizontalAlignment="Left"
-                                Text="{x:Bind HighlightedName, Mode=OneWay}"/>
-
-                    <StackPanel
-                        Grid.Column="2"
-                        VerticalAlignment="Center"
-                        HorizontalAlignment="Right"
-                        Orientation="Horizontal">
-
-                        <FontIcon
-                            FontFamily="Segoe MDL2 Assets"
-                            Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).BellIndicator, Mode=OneWay}"
-                            Glyph="&#xEA8F;"
-                            FontSize="12"
-                            Margin="0,0,8,0"/>
-
-                        <FontIcon
-                            FontFamily="Segoe MDL2 Assets"
-                            Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsPaneZoomed, Mode=OneWay}"
-                            Glyph="&#xE8A3;"
-                            FontSize="12"
-                            Margin="0,0,8,0"/>
-
-                        <FontIcon x:Name="HeaderLockIcon"
-                            FontFamily="Segoe MDL2 Assets"
-                            Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsReadOnlyActive, Mode=OneWay}"
-                            Glyph="&#xE72E;"
-                            FontSize="12"
-                            Margin="0,0,8,0"/>
-
-                    </StackPanel>
-                </Grid>
-            </DataTemplate>
-
-            <local:PaletteItemTemplateSelector x:Key="PaletteItemTemplateSelector"
-                                               TabItemTemplate="{StaticResource TabItemTemplate}"
-                                               GeneralItemTemplate="{StaticResource GeneralItemTemplate}"
-                                               NestedItemTemplate="{StaticResource NestedItemTemplate}"/>
-
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Dark">
-                    <Style x:Key="CommandPaletteBackground" TargetType="Grid">
-                        <Setter Property="Background" Value="#333333" />
-                    </Style>
-                    <!-- TextBox colors !-->
-                    <SolidColorBrush x:Key="TextControlBackground" Color="#333333"/>
-                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#B5B5B5"/>
-                    <SolidColorBrush x:Key="TextControlForeground" Color="#B5B5B5"/>
-                    <SolidColorBrush x:Key="TextControlBorderBrush" Color="#404040"/>
-                    <SolidColorBrush x:Key="TextControlButtonForeground" Color="#B5B5B5"/>
-
-                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#404040"/>
-                    <SolidColorBrush x:Key="TextControlForegroundPointerOver" Color="#FFFFFF"/>
-                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#404040"/>
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver" Color="#FF4343"/>
-
-                    <SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#333333"/>
-                    <SolidColorBrush x:Key="TextControlForegroundFocused" Color="#FFFFFF"/>
-                    <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#404040"/>
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed" Color="#FFFFFF"/>
-                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed" Color="#FF4343"/>
-
-                    <!--  KeyChordText styles  -->
-                    <Style x:Key="KeyChordBorderStyle" TargetType="Border">
-                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
-                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-                    <Style x:Key="KeyChordTextBlockStyle" TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-
-                    <!--  ParsedCommandLineText styles  -->
-                    <Style x:Key="ParsedCommandLineBorderStyle" TargetType="Border">
-                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
-                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-                    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Light">
-                    <Style x:Key="CommandPaletteBackground" TargetType="Grid">
-                        <Setter Property="Background" Value="#CCCCCC" />
-                    </Style>
-                    <!-- TextBox colors !-->
-                    <SolidColorBrush x:Key="TextControlBackground" Color="#CCCCCC"/>
-                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush" Color="#636363"/>
-                    <SolidColorBrush x:Key="TextControlBorderBrush" Color="#636363"/>
-                    <SolidColorBrush x:Key="TextControlButtonForeground" Color="#636363"/>
-
-                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#DADADA"/>
-                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#636363"/>
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver" Color="#FF4343"/>
-
-                    <SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#CCCCCC"/>
-                    <SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#636363"/>
-                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed" Color="#FFFFFF"/>
-                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed" Color="#FF4343"/>
-
-                    <!--  KeyChordText styles  -->
-                    <Style x:Key="KeyChordBorderStyle" TargetType="Border">
-                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
-                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-                    <Style x:Key="KeyChordTextBlockStyle" TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-
-                    <!--  ParsedCommandLineText styles  -->
-                    <Style x:Key="ParsedCommandLineBorderStyle" TargetType="Border">
-                        <Setter Property="BorderThickness" Value="1" />
-                        <Setter Property="CornerRadius" Value="1" />
-                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
-                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-                    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock">
-                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
-                    </Style>
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-                    <Style x:Key="CommandPaletteBackground" TargetType="Grid">
-                        <Setter Property="Background" Value="{ThemeResource SystemColorWindowColor}" />
-                    </Style>
-
-                    <!--  KeyChordText styles (use XAML defaults for High Contrast theme) -->
-                    <Style x:Key="KeyChordBorderStyle" TargetType="Border"/>
-                    <Style x:Key="KeyChordTextBlockStyle" TargetType="TextBlock"/>
-
-                    <!--  ParsedCommandLineText styles (use XAML defaults for High Contrast theme) -->
-                    <Style x:Key="ParsedCommandLineBorderStyle" TargetType="Border"/>
-                    <Style x:Key="ParsedCommandLineTextBlockStyle" TargetType="TextBlock"/>
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-        </ResourceDictionary>
-    </UserControl.Resources>
-
-    <Grid>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*" />
-            <ColumnDefinition Width="6*" />
-            <ColumnDefinition Width="2*" />
-        </Grid.ColumnDefinitions>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="8*"/>
-            <RowDefinition Height="2*"/>
-        </Grid.RowDefinitions>
-
-        <!-- Setting the row/col span of this shadow backdrop is a bit of a hack. In
-        order to receive pointer events, an element needs to be _not_ transparent.
-        However, we want to be able to eat all the clicks outside the immediate
-        bounds of the command palette, and we don't want a semi-transparent overlay
-        over all of the UI. Fortunately, if we make this _shadowBackdrop the size of
-        the entire page, then it can be mostly transparent, and cause the root grid
-        to receive clicks _anywhere_ in its bounds. -->
-
-        <Grid
-            x:Name="_shadowBackdrop"
-            Background="Transparent"
-            Grid.Column="0"
-            Grid.Row="0"
-            Grid.ColumnSpan="3"
-            Grid.RowSpan="2"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Stretch">
-        </Grid>
-
-        <Grid
-            x:Name="_backdrop"
-            Style="{ThemeResource CommandPaletteBackground}"
-            CornerRadius="{ThemeResource ControlCornerRadius}"
-            PointerPressed="_backdropPointerPressed"
-            Margin="8"
-            Grid.Column="1"
-            Grid.Row="0"
-            Windows10version1903:Shadow="{StaticResource CommandPaletteShadow}"
-            HorizontalAlignment="Stretch"
-            VerticalAlignment="Top">
-
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="*"/>
-            </Grid.RowDefinitions>
-
-            <TextBox
-                Grid.Row="0"
-                x:Name="_searchBox"
-                Margin="8"
-                Padding="18,8,8,8"
-                IsSpellCheckEnabled="False"
-                TextChanged="_filterTextChanged"
-                PlaceholderText="{x:Bind SearchBoxPlaceholderText, Mode=OneWay}"
-                Text="">
-            </TextBox>
-
-            <TextBlock
-                Grid.Row="0"
-                x:Name="_prefixCharacter"
-                Margin="16,16,0,-8"
-                FontSize="14"
-                HorizontalAlignment="Left"
-                Visibility="{x:Bind PrefixCharacter,
-                             Mode=OneWay,
-                             Converter={StaticResource ParentCommandVisibilityConverter}}"
-                Text="{x:Bind PrefixCharacter, Mode=OneWay}"
-                >
-            </TextBlock>
-
-            <StackPanel Orientation="Horizontal"
-                    Padding="16, 0, 16, 4"
-                    Grid.Row="1"
-                    Visibility="{x:Bind ParentCommandName,
-                                 Mode=OneWay,
-                                 Converter={StaticResource ParentCommandVisibilityConverter}}">
-
-                <Button
-                    Background="Transparent"
-                    x:Name="_parentCommandBackButton"
-                    x:Uid="ParentCommandBackButton"
-                    Click="_moveBackButtonClicked"
-                    ClickMode="Press"
-                    VerticalAlignment="Center">
-                    <FontIcon
-                        FontSize="12"
-                        FontFamily="Segoe MDL2 Assets"
-                        Glyph="&#xE76b;">
-                    </FontIcon>
-                </Button>
-
-                <TextBlock
-                    Padding="16, 0, 16, 4"
-                    x:Name="_parentCommandText"
-                    FontStyle="Italic"
-                    Grid.Row="1"
-                    Text="{x:Bind ParentCommandName, Mode=OneWay}"
-                    VerticalAlignment="Center">
-                </TextBlock>
-            </StackPanel>
-
-            <TextBlock
-                Padding="16"
-                x:Name="_noMatchesText"
-                FontStyle="Italic"
-                Visibility="Collapsed"
-                Grid.Row="1"
-                Text="{x:Bind NoMatchesText, Mode=OneWay}">
-            </TextBlock>
-
-            <Border
-                Grid.Row="1"
-                Visibility="{x:Bind ParsedCommandLineText, Mode=OneWay, Converter={StaticResource ParsedCommandLineTextVisibilityConverter}}"
-                Style="{ThemeResource ParsedCommandLineBorderStyle}"
-		        Padding="16"
-		        HorizontalAlignment="Stretch"
-                VerticalAlignment="Center">
-
-                <ScrollViewer MaxHeight="200" VerticalScrollBarVisibility="Auto">
-                    <TextBlock
-                        FontStyle="Italic"
-                        TextWrapping="Wrap"
-                        Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"/>
-                </ScrollViewer>
-            </Border>
-
-            <ListView
-                Grid.Row="2"
-                x:Name="_filteredActionsView"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Stretch"
-                SelectionMode="Single"
-                CanReorderItems="False"
-                AllowDrop="False"
-                IsItemClickEnabled="True"
-                ItemClick="_listItemClicked"
-                ChoosingItemContainer="_choosingItemContainer"
-                ContainerContentChanging="_containerContentChanging"
-                ItemsSource="{x:Bind FilteredActions}">
-            </ListView>
-
-        </Grid>
-
-
-    </Grid>
-</UserControl>
+<!--
+    Copyright (c) Microsoft Corporation. All rights reserved. Licensed under
+    the MIT License. See LICENSE in the project root for license information.
+-->
+<UserControl x:Class="TerminalApp.CommandPalette"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:SettingsModel="using:Microsoft.Terminal.Settings.Model"
+             xmlns:Windows10version1903="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract, 8)"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="using:TerminalApp"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:model="using:Microsoft.Terminal.Settings.Model"
+             xmlns:mux="using:Microsoft.UI.Xaml.Controls"
+             AllowFocusOnInteraction="True"
+             AutomationProperties.Name="{x:Bind ControlName, Mode=OneWay}"
+             IsTabStop="True"
+             LostFocus="_lostFocusHandler"
+             PointerPressed="_rootPointerPressed"
+             PreviewKeyDown="_previewKeyDownHandler"
+             PreviewKeyUp="_keyUpHandler"
+             TabNavigation="Cycle"
+             mc:Ignorable="d">
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+
+            <!--
+                ThemeShadow is only on 18362. This "Windows10version1903" bit
+                adds it conditionally
+            -->
+            <Windows10version1903:ThemeShadow x:Name="CommandPaletteShadow" />
+
+            <!--  This creates an instance of our CommandKeyChordVisibilityConverter we can reference below  -->
+            <local:EmptyStringVisibilityConverter x:Key="CommandKeyChordVisibilityConverter" />
+            <local:EmptyStringVisibilityConverter x:Key="ParsedCommandLineTextVisibilityConverter" />
+            <local:EmptyStringVisibilityConverter x:Key="ParentCommandVisibilityConverter" />
+            <model:IconPathConverter x:Key="IconSourceConverter" />
+
+            <DataTemplate x:Key="ListItemTemplate"
+                          x:DataType="local:FilteredCommand">
+                <ListViewItem HorizontalContentAlignment="Stretch"
+                              AutomationProperties.AcceleratorKey="{x:Bind Item.KeyChordText, Mode=OneWay}"
+                              AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}" />
+            </DataTemplate>
+
+            <DataTemplate x:Key="GeneralItemTemplate"
+                          x:DataType="local:FilteredCommand">
+                <Grid HorizontalAlignment="Stretch"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="16" />
+                        <!--  icon  -->
+                        <ColumnDefinition Width="Auto" />
+                        <!--  command label  -->
+                        <ColumnDefinition Width="*" />
+                        <!--  key chord  -->
+                        <ColumnDefinition Width="16" />
+                        <!--  gutter for scrollbar  -->
+                    </Grid.ColumnDefinitions>
+
+                    <IconSourceElement Grid.Column="0"
+                                       Width="16"
+                                       Height="16"
+                                       IconSource="{x:Bind Item.Icon, Mode=OneWay, Converter={StaticResource IconSourceConverter}}" />
+
+                    <local:HighlightedTextControl Grid.Column="1"
+                                                  HorizontalAlignment="Left"
+                                                  Text="{x:Bind HighlightedName, Mode=OneWay}" />
+
+                    <!--
+                        The block for the key chord is only visible
+                        when there's actual text set as the label. See
+                        CommandKeyChordVisibilityConverter for details.
+                        We're setting the accessibility view on the
+                        border and text block to Raw because otherwise,
+                        Narrator will read out the key chord. Problem is,
+                        it already did that because it was the list item's
+                        "AcceleratorKey". It's redundant.
+                    -->
+                    <Border Grid.Column="2"
+                            Padding="2,0,2,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Style="{ThemeResource KeyChordBorderStyle}"
+                            Visibility="{x:Bind Item.KeyChordText, Mode=OneWay, Converter={StaticResource CommandKeyChordVisibilityConverter}}">
+
+                        <TextBlock AutomationProperties.AccessibilityView="Raw"
+                                   FontSize="12"
+                                   Style="{ThemeResource KeyChordTextBlockStyle}"
+                                   Text="{x:Bind Item.KeyChordText, Mode=OneWay}" />
+                    </Border>
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="NestedItemTemplate"
+                          x:DataType="local:FilteredCommand">
+                <Grid HorizontalAlignment="Stretch"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="16" />
+                        <!--  icon  -->
+                        <ColumnDefinition Width="Auto" />
+                        <!--  command label  -->
+                        <ColumnDefinition Width="*" />
+                        <!--  key chord  -->
+                        <ColumnDefinition Width="16" />
+                        <!--  gutter for scrollbar  -->
+                    </Grid.ColumnDefinitions>
+
+                    <IconSourceElement Grid.Column="0"
+                                       Width="16"
+                                       Height="16"
+                                       IconSource="{x:Bind Item.Icon, Mode=OneWay, Converter={StaticResource IconSourceConverter}}" />
+
+                    <local:HighlightedTextControl Grid.Column="1"
+                                                  HorizontalAlignment="Left"
+                                                  Text="{x:Bind HighlightedName, Mode=OneWay}" />
+
+                    <!--
+                        The block for the key chord is only visible
+                        when there's actual text set as the label. See
+                        CommandKeyChordVisibilityConverter for details.
+                        We're setting the accessibility view on the
+                        border and text block to Raw because otherwise,
+                        Narrator will read out the key chord. Problem is,
+                        it already did that because it was the list item's
+                        "AcceleratorKey". It's redundant.
+                    -->
+                    <Border Grid.Column="2"
+                            Padding="2,0,2,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            AutomationProperties.AccessibilityView="Raw"
+                            Style="{ThemeResource KeyChordBorderStyle}"
+                            Visibility="{x:Bind Item.KeyChordText, Mode=OneWay, Converter={StaticResource CommandKeyChordVisibilityConverter}}">
+
+                        <TextBlock AutomationProperties.AccessibilityView="Raw"
+                                   FontSize="12"
+                                   Style="{ThemeResource KeyChordTextBlockStyle}"
+                                   Text="{x:Bind Item.KeyChordText, Mode=OneWay}" />
+                    </Border>
+
+                    <!--  xE70E is ChevronUp. Rotated 90 degrees, it's _ChevronRight_  -->
+                    <FontIcon Grid.Column="2"
+                              HorizontalAlignment="Right"
+                              FontFamily="Segoe MDL2 Assets"
+                              Glyph="&#xE70E;">
+
+                        <FontIcon.RenderTransform>
+                            <RotateTransform Angle="90" CenterX="0.5" CenterY="0.5" />
+                        </FontIcon.RenderTransform>
+                    </FontIcon>
+
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="TabItemTemplate"
+                          x:DataType="local:FilteredCommand">
+                <Grid HorizontalAlignment="Stretch"
+                      AutomationProperties.Name="{x:Bind Item.Name, Mode=OneWay}"
+                      ColumnSpacing="8">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="16" />
+                        <!--  icon / progress  -->
+                        <ColumnDefinition Width="Auto" />
+                        <!--  command label  -->
+                        <ColumnDefinition Width="*" />
+                        <!--  gutter for indicators  -->
+                        <ColumnDefinition Width="Auto" />
+                        <!--  Indicators  -->
+                        <ColumnDefinition Width="16" />
+                        <!--  gutter for scrollbar  -->
+                    </Grid.ColumnDefinitions>
+
+                    <mux:ProgressRing Grid.Column="0"
+                                      Width="15"
+                                      Height="15"
+                                      MinWidth="0"
+                                      MinHeight="0"
+                                      IsActive="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsProgressRingActive, Mode=OneWay}"
+                                      IsIndeterminate="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsProgressRingIndeterminate, Mode=OneWay}"
+                                      Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsProgressRingActive, Mode=OneWay}"
+                                      Value="{x:Bind Item.(local:TabPaletteItem.TabStatus).ProgressValue, Mode=OneWay}" />
+
+                    <IconSourceElement Grid.Column="0"
+                                       Width="16"
+                                       Height="16"
+                                       IconSource="{x:Bind Item.Icon, Mode=OneWay, Converter={StaticResource IconSourceConverter}}" />
+
+                    <local:HighlightedTextControl Grid.Column="1"
+                                                  HorizontalAlignment="Left"
+                                                  Text="{x:Bind HighlightedName, Mode=OneWay}" />
+
+                    <StackPanel Grid.Column="2"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Orientation="Horizontal">
+
+                        <FontIcon Margin="0,0,8,0"
+                                  FontFamily="Segoe MDL2 Assets"
+                                  FontSize="12"
+                                  Glyph="&#xEA8F;"
+                                  Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).BellIndicator, Mode=OneWay}" />
+
+                        <FontIcon Margin="0,0,8,0"
+                                  FontFamily="Segoe MDL2 Assets"
+                                  FontSize="12"
+                                  Glyph="&#xE8A3;"
+                                  Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsPaneZoomed, Mode=OneWay}" />
+
+                        <FontIcon x:Name="HeaderLockIcon"
+                                  Margin="0,0,8,0"
+                                  FontFamily="Segoe MDL2 Assets"
+                                  FontSize="12"
+                                  Glyph="&#xE72E;"
+                                  Visibility="{x:Bind Item.(local:TabPaletteItem.TabStatus).IsReadOnlyActive, Mode=OneWay}" />
+
+                    </StackPanel>
+                </Grid>
+            </DataTemplate>
+
+            <local:PaletteItemTemplateSelector x:Key="PaletteItemTemplateSelector"
+                                               GeneralItemTemplate="{StaticResource GeneralItemTemplate}"
+                                               NestedItemTemplate="{StaticResource NestedItemTemplate}"
+                                               TabItemTemplate="{StaticResource TabItemTemplate}" />
+
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+                    <Style x:Key="CommandPaletteBackground"
+                           TargetType="Grid">
+                        <Setter Property="Background" Value="#333333" />
+                    </Style>
+                    <!--  TextBox colors !  -->
+                    <SolidColorBrush x:Key="TextControlBackground"
+                                     Color="#333333" />
+                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
+                                     Color="#B5B5B5" />
+                    <SolidColorBrush x:Key="TextControlForeground"
+                                     Color="#B5B5B5" />
+                    <SolidColorBrush x:Key="TextControlBorderBrush"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForeground"
+                                     Color="#B5B5B5" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlForegroundPointerOver"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
+                                     Color="#FF4343" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
+                                     Color="#333333" />
+                    <SolidColorBrush x:Key="TextControlForegroundFocused"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
+                                     Color="#404040" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
+                                     Color="#FF4343" />
+
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+
+                    <!--  ParsedCommandLineText styles  -->
+                    <Style x:Key="ParsedCommandLineBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                    <Style x:Key="ParsedCommandLineTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+                    <Style x:Key="CommandPaletteBackground"
+                           TargetType="Grid">
+                        <Setter Property="Background" Value="#CCCCCC" />
+                    </Style>
+                    <!--  TextBox colors !  -->
+                    <SolidColorBrush x:Key="TextControlBackground"
+                                     Color="#CCCCCC" />
+                    <SolidColorBrush x:Key="TextBoxPlaceholderTextThemeBrush"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlBorderBrush"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForeground"
+                                     Color="#636363" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundPointerOver"
+                                     Color="#DADADA" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushPointerOver"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPointerOver"
+                                     Color="#FF4343" />
+
+                    <SolidColorBrush x:Key="TextControlBackgroundFocused"
+                                     Color="#CCCCCC" />
+                    <SolidColorBrush x:Key="TextControlBorderBrushFocused"
+                                     Color="#636363" />
+                    <SolidColorBrush x:Key="TextControlButtonForegroundPressed"
+                                     Color="#FFFFFF" />
+                    <SolidColorBrush x:Key="TextControlButtonBackgroundPressed"
+                                     Color="#FF4343" />
+
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+
+                    <!--  ParsedCommandLineText styles  -->
+                    <Style x:Key="ParsedCommandLineBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="1" />
+                        <Setter Property="Background" Value="{ThemeResource SystemAltMediumLowColor}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                    <Style x:Key="ParsedCommandLineTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+                    <Style x:Key="CommandPaletteBackground"
+                           TargetType="Grid">
+                        <Setter Property="Background" Value="{ThemeResource SystemColorWindowColor}" />
+                    </Style>
+
+                    <!--  KeyChordText styles (use XAML defaults for High Contrast theme)  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border" />
+                    <Style x:Key="KeyChordTextBlockStyle"
+                           TargetType="TextBlock" />
+
+                    <!--  ParsedCommandLineText styles (use XAML defaults for High Contrast theme)  -->
+                    <Style x:Key="ParsedCommandLineBorderStyle"
+                           TargetType="Border" />
+                    <Style x:Key="ParsedCommandLineTextBlockStyle"
+                           TargetType="TextBlock" />
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="6*" />
+            <ColumnDefinition Width="2*" />
+        </Grid.ColumnDefinitions>
+
+        <Grid.RowDefinitions>
+            <RowDefinition Height="8*" />
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+
+        <!--
+            Setting the row/col span of this shadow backdrop is a bit of a hack. In
+            order to receive pointer events, an element needs to be _not_ transparent.
+            However, we want to be able to eat all the clicks outside the immediate
+            bounds of the command palette, and we don't want a semi-transparent overlay
+            over all of the UI. Fortunately, if we make this _shadowBackdrop the size of
+            the entire page, then it can be mostly transparent, and cause the root grid
+            to receive clicks _anywhere_ in its bounds.
+        -->
+
+        <Grid x:Name="_shadowBackdrop"
+              Grid.Row="0"
+              Grid.RowSpan="2"
+              Grid.Column="0"
+              Grid.ColumnSpan="3"
+              HorizontalAlignment="Stretch"
+              VerticalAlignment="Stretch"
+              Background="Transparent" />
+
+        <Grid x:Name="_backdrop"
+              Grid.Row="0"
+              Grid.Column="1"
+              Margin="8"
+              HorizontalAlignment="Stretch"
+              VerticalAlignment="Top"
+              Windows10version1903:Shadow="{StaticResource CommandPaletteShadow}"
+              CornerRadius="{ThemeResource ControlCornerRadius}"
+              PointerPressed="_backdropPointerPressed"
+              Style="{ThemeResource CommandPaletteBackground}">
+
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <TextBox x:Name="_searchBox"
+                     Grid.Row="0"
+                     Margin="8"
+                     Padding="18,8,8,8"
+                     IsSpellCheckEnabled="False"
+                     PlaceholderText="{x:Bind SearchBoxPlaceholderText, Mode=OneWay}"
+                     Text=""
+                     TextChanged="_filterTextChanged" />
+
+            <TextBlock x:Name="_prefixCharacter"
+                       Grid.Row="0"
+                       Margin="16,16,0,-8"
+                       HorizontalAlignment="Left"
+                       FontSize="14"
+                       Text="{x:Bind PrefixCharacter, Mode=OneWay}"
+                       Visibility="{x:Bind PrefixCharacter, Mode=OneWay, Converter={StaticResource ParentCommandVisibilityConverter}}" />
+
+            <StackPanel Grid.Row="1"
+                        Padding="16,0,16,4"
+                        Orientation="Horizontal"
+                        Visibility="{x:Bind ParentCommandName, Mode=OneWay, Converter={StaticResource ParentCommandVisibilityConverter}}">
+
+                <Button x:Name="_parentCommandBackButton"
+                        x:Uid="ParentCommandBackButton"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        Click="_moveBackButtonClicked"
+                        ClickMode="Press">
+                    <FontIcon FontFamily="Segoe MDL2 Assets"
+                              FontSize="12"
+                              Glyph="&#xE76b;" />
+                </Button>
+
+                <TextBlock x:Name="_parentCommandText"
+                           Grid.Row="1"
+                           Padding="16,0,16,4"
+                           VerticalAlignment="Center"
+                           FontStyle="Italic"
+                           Text="{x:Bind ParentCommandName, Mode=OneWay}" />
+            </StackPanel>
+
+            <TextBlock x:Name="_noMatchesText"
+                       Grid.Row="1"
+                       Padding="16"
+                       FontStyle="Italic"
+                       Text="{x:Bind NoMatchesText, Mode=OneWay}"
+                       Visibility="Collapsed" />
+
+            <Border Grid.Row="1"
+                    Padding="16"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Center"
+                    Style="{ThemeResource ParsedCommandLineBorderStyle}"
+                    Visibility="{x:Bind ParsedCommandLineText, Mode=OneWay, Converter={StaticResource ParsedCommandLineTextVisibilityConverter}}">
+
+                <ScrollViewer MaxHeight="200"
+                              VerticalScrollBarVisibility="Auto">
+                    <TextBlock FontStyle="Italic"
+                               Text="{x:Bind ParsedCommandLineText, Mode=OneWay}"
+                               TextWrapping="Wrap" />
+                </ScrollViewer>
+            </Border>
+
+            <ListView x:Name="_filteredActionsView"
+                      Grid.Row="2"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      AllowDrop="False"
+                      CanReorderItems="False"
+                      ChoosingItemContainer="_choosingItemContainer"
+                      ContainerContentChanging="_containerContentChanging"
+                      IsItemClickEnabled="True"
+                      ItemClick="_listItemClicked"
+                      ItemsSource="{x:Bind FilteredActions}"
+                      SelectionMode="Single" />
+
+        </Grid>
+
+
+    </Grid>
+</UserControl>

src/cascadia/TerminalApp/FilteredCommand.h

@@ -25,10 +25,10 @@ namespace winrt::TerminalApp::implementation
         static int Compare(winrt::TerminalApp::FilteredCommand const& first, winrt::TerminalApp::FilteredCommand const& second);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
-        OBSERVABLE_GETSET_PROPERTY(winrt::TerminalApp::PaletteItem, Item, _PropertyChangedHandlers, nullptr);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, Filter, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(winrt::TerminalApp::HighlightedText, HighlightedName, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(int, Weight, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::TerminalApp::PaletteItem, Item, _PropertyChangedHandlers, nullptr);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, Filter, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::TerminalApp::HighlightedText, HighlightedName, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(int, Weight, _PropertyChangedHandlers);
 
     private:
         winrt::TerminalApp::HighlightedText _computeHighlightedName();

src/cascadia/TerminalApp/HighlightedText.h

@@ -17,8 +17,8 @@ namespace winrt::TerminalApp::implementation
         HighlightedTextSegment(winrt::hstring const& text, bool isHighlighted);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
-        OBSERVABLE_GETSET_PROPERTY(winrt::hstring, TextSegment, _PropertyChangedHandlers);
-        OBSERVABLE_GETSET_PROPERTY(bool, IsHighlighted, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(winrt::hstring, TextSegment, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(bool, IsHighlighted, _PropertyChangedHandlers);
     };
 
     struct HighlightedText : HighlightedTextT<HighlightedText>
@@ -27,7 +27,7 @@ namespace winrt::TerminalApp::implementation
         HighlightedText(Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::HighlightedTextSegment> const& segments);
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
-        OBSERVABLE_GETSET_PROPERTY(Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::HighlightedTextSegment>, Segments, _PropertyChangedHandlers);
+        WINRT_OBSERVABLE_PROPERTY(Windows::Foundation::Collections::IObservableVector<winrt::TerminalApp::HighlightedTextSegment>, Segments, _PropertyChangedHandlers);
     };
 }
 

src/cascadia/TerminalApp/HighlightedTextControl.xaml

@@ -1,13 +1,11 @@
-<UserControl
-    x:Class="TerminalApp.HighlightedTextControl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:TerminalApp"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d"
-    Background="Transparent">
+<UserControl x:Class="TerminalApp.HighlightedTextControl"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="using:TerminalApp"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             Background="Transparent"
+             mc:Ignorable="d">
 
-    <TextBlock
-        x:Name="_textView"/>
+    <TextBlock x:Name="_textView" />
 </UserControl>