wip

PackageES is deprecated by known scourge-on-earth OneBranch, and is now
the cause of some non-compliance.

I got permission from them to open-source it, so that's coming next.

For now, we can just depend on a package based on our code based on
theirs.

Tested and working for C++ (DLL, EXE), C#, NuGet and MSIX.

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

@@ -9,7 +9,6 @@ CMMI
 colorbrewer
 consvc
 copyable
-CText
 dalet
 dcs
 deselection
@@ -21,7 +20,6 @@ dze
 dzhe
 Emacspeak
 Fitt
-flac
 FTCS
 gantt
 ghe
@@ -57,7 +55,6 @@ ptys
 pwn
 pwshw
 qof
-QOL
 qps
 quickfix
 rclt
@@ -76,7 +73,6 @@ slnt
 stakeholders
 sustainability
 sxn
-Tencent
 TLDR
 tonos
 toolset

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

@@ -96,7 +96,6 @@ IGraphics
 IImage
 IInheritable
 IMap
-imm
 IMonarch
 IObject
 iosfwd
@@ -175,6 +174,7 @@ PALLOC
 PATINVERT
 PEXPLICIT
 PICKFOLDERS
+PINPUT
 pmr
 ptstr
 QUERYENDSESSION
@@ -285,5 +285,4 @@ xtree
 xutility
 YIcon
 YMax
-zstring
 zwstring

.github/actions/spelling/expect/04cdb9b77d6827c0202f51acd4205b017015bfff.txt

@@ -0,0 +1,5 @@
+EOB
+swrapped
+wordi
+wordiswrapped
+wrappe

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

@@ -16,8 +16,6 @@ ADDALIAS
 ADDREF
 ADDSTRING
 ADDTOOL
-adml
-admx
 AFill
 AFX
 AHelper
@@ -87,7 +85,6 @@ autoscrolling
 Autowrap
 AVerify
 awch
-AZCOPY
 azurecr
 AZZ
 backgrounded
@@ -215,7 +212,6 @@ codepages
 codepath
 coinit
 colorizing
-COLORONCOLOR
 COLORREFs
 colorschemes
 colorspec
@@ -343,7 +339,6 @@ CXVIRTUALSCREEN
 CXVSCROLL
 CYFRAME
 CYFULLSCREEN
-cygdrive
 CYHSCROLL
 CYMIN
 CYPADDEDBORDER
@@ -569,7 +564,6 @@ entrypoints
 ENU
 ENUMLOGFONT
 ENUMLOGFONTEX
-EOB
 EOK
 EPres
 EQU
@@ -788,7 +782,6 @@ HIWORD
 HKCU
 hkey
 hkl
-HKLM
 hlocal
 hlsl
 HMB
@@ -871,7 +864,6 @@ INLINEPREFIX
 inproc
 Inputkeyinfo
 Inputreadhandledata
-INPUTSCOPE
 INSERTMODE
 INTERACTIVITYBASE
 INTERCEPTCOPYPASTE
@@ -921,6 +913,7 @@ Keymapping
 keyscan
 keystate
 keyups
+Kickstart
 KILLACTIVE
 KILLFOCUS
 kinda
@@ -1160,8 +1153,6 @@ nfe
 NLSMODE
 nnn
 NOACTIVATE
-NOACTIVATEKEYBOARDLAYOUT
-NOACTIVATETIP
 NOAPPLYNOW
 NOCLIP
 NOCOMM
@@ -1299,7 +1290,6 @@ parms
 PATCOPY
 pathcch
 PATTERNID
-pbstr
 pcb
 pcch
 PCCHAR
@@ -1385,11 +1375,9 @@ POSTCHARBREAKS
 POSX
 POSXSCROLL
 POSYSCROLL
-ppbstr
 PPEB
 ppf
 ppidl
-pprg
 PPROC
 ppropvar
 ppsi
@@ -1430,7 +1418,6 @@ propvar
 propvariant
 propvarutil
 psa
-PSCRED
 PSECURITY
 pseudoconsole
 pseudoterminal
@@ -1601,6 +1588,7 @@ scrolllock
 scrolloffset
 SCROLLSCALE
 SCROLLSCREENBUFFER
+scursor
 sddl
 SDKDDK
 securityappcontainer
@@ -1692,7 +1680,6 @@ SMARTQUOTE
 SMTO
 snapcx
 snapcy
-snk
 SOLIDBOX
 Solutiondir
 somefile
@@ -1706,7 +1693,6 @@ srcsrv
 SRCSRVTRG
 srctool
 srect
-SRGS
 srvinit
 srvpipe
 ssa
@@ -1744,7 +1730,6 @@ swapchain
 swapchainpanel
 SWMR
 SWP
-swrapped
 SYMED
 SYNCPAINT
 syscalls
@@ -1817,12 +1802,10 @@ TEXTMETRICW
 textmode
 texttests
 TFunction
-TFCAT
 THUMBPOSITION
 THUMBTRACK
 TIcon
 tilunittests
-TIPCAP
 titlebars
 TITLEISLINKNAME
 TJson
@@ -1856,6 +1839,7 @@ triaging
 TRIMZEROHEADINGS
 trx
 tsa
+tsattrs
 tsgr
 tsm
 TStr
@@ -1885,8 +1869,6 @@ UIACCESS
 uiacore
 uiautomationcore
 uielem
-UIELEMENTENABLED
-UIELEMENTENABLEDONLY
 UINTs
 ul
 uld
@@ -1985,8 +1967,10 @@ vswhere
 vtapp
 VTE
 VTID
+vtio
 vtmode
 vtpipeterm
+vtpt
 VTRGB
 VTRGBTo
 vtseq
@@ -2091,8 +2075,6 @@ WNDCLASSW
 Wndproc
 WNegative
 WNull
-wordi
-wordiswrapped
 workarea
 WOutside
 WOWARM
@@ -2106,7 +2088,6 @@ WPrep
 WPresent
 wprp
 wprpi
-wrappe
 wregex
 writeback
 WRITECONSOLE

NuGet.Config

@@ -4,7 +4,7 @@
         <clear />
         <!-- Dependencies that we can turn on to force override for testing purposes before uploading. -->
         <!--<add key="Static Package Dependencies" value="dep\packages" />-->
-        <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/shine-oss/terminal/_packaging/TerminalDependencies%40Local/nuget/v3/index.json" />
+        <add key="TerminalDependencies" value="https://pkgs.dev.azure.com/shine-oss/terminal/_packaging/TerminalDependencies/nuget/v3/index.json" />
     </packageSources>
     <disabledPackageSources>
         <clear />

build/config/esrp.build.batch.wpfdotnet.json

@@ -6,20 +6,6 @@
         ],
         "SigningInfo": {
             "Operations": [
-                {
-                    "KeyCode": "CP-233904-SN",
-                    "OperationSetCode": "StrongNameSign",
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0",
-                    "Parameters": []
-                },
-                {
-                    "KeyCode": "CP-233904-SN",
-                    "OperationSetCode": "StrongNameVerify",
-                    "ToolName": "sign",
-                    "ToolVersion": "1.0",
-                    "Parameters": []
-                },
                 {
                     "KeyCode": "CP-230012",
                     "OperationSetCode": "SigntoolSign",

build/config/tsa.json

@@ -1,6 +1,6 @@
 {
     "instanceUrl": "https://microsoft.visualstudio.com",
     "projectName": "OS",
-    "areaPath": "OS\\Windows Client and Services\\WinPD\\DFX-Developer Fundamentals and Experiences\\DEFT\\SHINE\\Terminal",
+    "areaPath": "OS\\Windows Client and Services\\ADEPT\\E4D-Engineered for Developers\\SHINE\\Terminal",
     "notificationAliases": ["condev@microsoft.com", "duhowett@microsoft.com"]
 }

build/packages.config

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="MUXCustomBuildTasks" version="1.0.48" targetFramework="native" />
   <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
   <package id="Microsoft.Debugging.Tools.PdbStr" version="20220617.1556.0" targetFramework="native" />

build/pgo/Terminal.PGO.props

@@ -9,7 +9,7 @@
 
   <PropertyGroup>
     <!-- Optional, defaults to main.  Name of the branch which will be used for calculating branch point. -->
-    <PGOBranch>release-1.22</PGOBranch>
+    <PGOBranch>main</PGOBranch>
 
     <!-- Mandatory.  Name of the NuGet package which will contain PGO databases for consumption by build system. -->
     <PGOPackageName>Microsoft.Internal.Windows.Terminal.PGODatabase</PGOPackageName>

build/pipelines/ob-nightly.yml

@@ -37,8 +37,6 @@ extends:
       akvName: $(SigningAKVName)
       authCertName: $(SigningAuthCertName)
       signCertName: $(SigningSignCertName)
-      useManagedIdentity: $(SigningUseManagedIdentity)
-      clientId: $(SigningOriginalClientId)
     publishSymbolsToPublic: true
     publishVpackToWindows: false
     symbolExpiryTime: 15

build/pipelines/ob-release.yml

@@ -85,8 +85,6 @@ extends:
       akvName: $(SigningAKVName)
       authCertName: $(SigningAuthCertName)
       signCertName: $(SigningSignCertName)
-      useManagedIdentity: $(SigningUseManagedIdentity)
-      clientId: $(SigningOriginalClientId)
     terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
     publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
     publishVpackToWindows: ${{ parameters.publishVpackToWindows }}

build/pipelines/templates-v2/job-deploy-to-azure-storage.yml

@@ -75,13 +75,18 @@ jobs:
       }
     displayName: "Wrangle Unpackaged builds into place, rename"
 
-  - task: AzurePowerShell@5
+  - powershell: |-
+      Get-PackageProvider -Name NuGet -ForceBootstrap
+      Install-Module -Verbose -AllowClobber -Force Az.Accounts, Az.Storage, Az.Network, Az.Resources, Az.Compute
+    displayName: Install Azure Module Dependencies
+
+  - task: AzureFileCopy@6
     displayName: Publish to Storage Account
     inputs:
+      sourcePath: _out/*
+      Destination: AzureBlob
       azureSubscription: ${{ parameters.subscription }}
-      azurePowerShellVersion: LatestVersion
-      pwsh: true
-      ScriptType: InlineScript
-      Inline: |-
-        $Env:AZCOPY_AUTO_LOGIN_TYPE="PSCRED"
-        & AzCopy copy "_out\*" "https://${{ parameters.storageAccount }}.blob.core.windows.net/${{ parameters.storageContainer }}/" --content-type application/octet-stream
+      storage: ${{ parameters.storageAccount }}
+      ContainerName: ${{ parameters.storageContainer }}
+      AdditionalArgumentsForBlobCopy: "--content-type application/octet-stream"
+

build/pipelines/templates-v2/job-merge-msix-into-bundle.yml

@@ -147,10 +147,6 @@ jobs:
         ValidateSignature: true
         Verbosity: 'Verbose'
 
-  - pwsh: |-
-      tar -c -v --format=zip -f "$(JobOutputDirectory)/GroupPolicyTemplates_$(XES_APPXMANIFESTVERSION).zip" -C "$(Build.SourcesDirectory)/policies" *
-    displayName: Package GPO Templates
-
   - ${{ parameters.afterBuildSteps }}
 
   - ${{ if eq(parameters.publishArtifacts, true) }}:

build/pipelines/templates-v2/job-publish-symbols-using-symbolrequestprod-api.yml

@@ -52,6 +52,11 @@ jobs:
       itemPattern: '**/*.pdb'
       targetPath: '$(Build.SourcesDirectory)/bin'
 
+  - powershell: |-
+      Get-PackageProvider -Name NuGet -ForceBootstrap
+      Install-Module -Verbose -AllowClobber -Force Az.Accounts, Az.Storage, Az.Network, Az.Resources, Az.Compute
+    displayName: Install Azure Module Dependencies
+
   # Transit the Azure token from the Service Connection into a secret variable for the rest of the pipeline to use.
   - task: AzurePowerShell@5
     displayName: Generate an Azure Token
@@ -61,7 +66,7 @@ jobs:
       pwsh: true
       ScriptType: InlineScript
       Inline: |-
-        $AzToken = (Get-AzAccessToken -AsSecureString -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token | ConvertFrom-SecureString -AsPlainText
+        $AzToken = (Get-AzAccessToken -ResourceUrl api://30471ccf-0966-45b9-a979-065dbedb24c1).Token
         Write-Host "##vso[task.setvariable variable=SymbolAccessToken;issecret=true]$AzToken"
 
 

build/pipelines/templates-v2/job-submit-windows-vpack.yml

@@ -69,3 +69,10 @@ jobs:
       artifact: $(JobOutputArtifactName)
       displayName: 'Publish VPack Manifest to Drop'
 
+  - task: PkgESFCIBGit@12
+    displayName: 'Submit VPack Manifest to Windows'
+    inputs:
+      configPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
+      artifactsDirectory: $(XES_VPACKMANIFESTDIRECTORY)
+      prTimeOut: 5
+

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

@@ -78,9 +78,7 @@ extends:
     template: v2/Microsoft.NonOfficial.yml@templates
   parameters:
     featureFlags:
-      WindowsHostVersion:
-        Version: 2022
-        Network: R1
+      WindowsHostVersion: 1ESWindows2022
     platform:
       name: 'windows_undocked'
       product: 'Windows Terminal'

build/pipelines/templates-v2/steps-ensure-nuget-version.yml

@@ -1,12 +1,5 @@
 steps:
-- ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
-  - pwsh: |-
-      Write-Host "Assuming NuGet is already installed..."
-      & nuget.exe help
-    displayName: Assume NuGet is fine
-
-- ${{ else }}:
-  - task: NuGetToolInstaller@1
-    displayName: Use NuGet 6.6.1
-    inputs:
-      versionSpec: 6.6.1
+- task: NuGetToolInstaller@1
+  displayName: Use NuGet 6.6.1
+  inputs:
+    versionSpec: 6.6.1

build/pipelines/templates-v2/steps-esrp-signing.yml

@@ -19,6 +19,4 @@ steps:
       AuthAKVName: ${{ parameters.signingIdentity.akvName }}
       AuthCertName: ${{ parameters.signingIdentity.authCertName }}
       AuthSignCertName: ${{ parameters.signingIdentity.signCertName }}
-      UseMSIAuthentication: ${{ coalesce(parameters.signingIdentity.useManagedIdentity, 'false') }}
-      EsrpClientId: ${{ parameters.signingIdentity.clientId }}
       ${{ insert }}: ${{ parameters.inputs }}

build/scripts/Set-LatestVCToolsVersion.ps1

@@ -1,28 +1,8 @@
 $VSInstances = ([xml](& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -include packages -format xml))
 $VSPackages = $VSInstances.instances.instance.packages.package
-$LatestVCPackage = ($VSPackages | ? { $_.id -eq "Microsoft.VisualCpp.Tools.Core" })
+$LatestVCPackage = ($VSInstances.instances.instance.packages.package | ? { $_.id -eq "Microsoft.VisualCpp.CRT.Source" })
 $LatestVCToolsVersion = $LatestVCPackage.version;
 
-$VSRoot = (& 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe' -latest -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property 'resolvedInstallationPath')
-$VCToolsRoot = Join-Path $VSRoot "VC\Tools\MSVC"
-
-# We have observed a few instances where the VC tools package version actually
-# differs from the version on the files themselves. We might as well check
-# whether the version we just found _actually exists_ before we use it.
-# We'll use whichever highest version exists.
-$PackageVCToolPath = Join-Path $VCToolsRoot $LatestVCToolsVersion
-If ($Null -Eq (Get-Item $PackageVCToolPath -ErrorAction:Ignore)) {
-    $VCToolsVersions = Get-ChildItem $VCToolsRoot | ForEach-Object {
-        [Version]$_.Name
-    } | Sort -Descending
-    $LatestActualVCToolsVersion = $VCToolsVersions | Select -First 1
-
-    If ([Version]$LatestVCToolsVersion -Ne $LatestActualVCToolsVersion) {
-        Write-Output "VC Tools Mismatch: Directory = $LatestActualVCToolsVersion, Package = $LatestVCToolsVersion"
-        $LatestVCToolsVersion = $LatestActualVCToolsVersion.ToString(3)
-    }
-}
-
 Write-Output "Latest VCToolsVersion: $LatestVCToolsVersion"
 Write-Output "Updating VCToolsVersion environment variable for job"
 Write-Output "##vso[task.setvariable variable=VCToolsVersion]$LatestVCToolsVersion"

custom.props

@@ -5,10 +5,7 @@
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
     <XesBaseYearForStoreVersion>2024</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>22</VersionMinor>
+    <VersionMinor>23</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
-    <VersionInfoCulture>1033</VersionInfoCulture>
-    <!-- The default has a spacing problem -->
-    <VersionInfoCopyRight>\xa9 Microsoft Corporation. All rights reserved.</VersionInfoCopyRight>
   </PropertyGroup>
 </Project>

dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch

@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88c12148..967b53dd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -260,7 +260,7 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
-   join(netfxpath
-        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
-        ".NETFramework\\v4.0")
--  file(WRITE run-msbuild.bat "
-+  file(WRITE "${CMAKE_BINARY_DIR}/run-msbuild.bat" "
-     ${MSBUILD_SETUP}
-     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
- endif ()

dep/vcpkg-overlay-ports/fmt/portfile.cmake

@@ -1,38 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO fmtlib/fmt
-    REF "${VERSION}"
-    SHA512 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
-    HEAD_REF master
-    PATCHES
-        fix-write-batch.patch
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DFMT_CMAKE_DIR=share/fmt
-        -DFMT_TEST=OFF
-        -DFMT_DOC=OFF
-        -DFMT_PEDANTIC=ON
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup()
-vcpkg_fixup_pkgconfig()
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h"
-        "defined(FMT_SHARED)"
-        "1"
-    )
-endif()
-
-file(REMOVE_RECURSE
-    "${CURRENT_PACKAGES_DIR}/debug/include"
-    "${CURRENT_PACKAGES_DIR}/debug/share"
-)
-
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

dep/vcpkg-overlay-ports/fmt/usage

@@ -1,8 +0,0 @@
-The package fmt provides CMake targets:
-
-    find_package(fmt CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE fmt::fmt)
-
-    # Or use the header-only version
-    find_package(fmt CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE fmt::fmt-header-only)

dep/vcpkg-overlay-ports/fmt/vcpkg.json

@@ -1,17 +0,0 @@
-{
-  "name": "fmt",
-  "version": "11.1.4",
-  "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
-  "homepage": "https://github.com/fmtlib/fmt",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}

doc/cascadia/Unittesting-CppWinRT-Xaml.md

@@ -380,7 +380,7 @@ Here's the AppxManifest we're using:
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22621.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>
@@ -517,7 +517,7 @@ This is because of a few key lines we already put in the appxmanifest:
 
 ```xml
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.18362.0" MaxVersionTested="10.0.22621.0" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug" MinVersion="14.0.27023.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
     <PackageDependency Name="Microsoft.VCLibs.140.00.Debug.UWPDesktop" MinVersion="14.0.27027.1" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" />
   </Dependencies>

doc/cascadia/profiles.schema.json

@@ -35,8 +35,7 @@
       "enum": [
         "Windows.Terminal.Wsl",
         "Windows.Terminal.Azure",
-        "Windows.Terminal.PowershellCore",
-        "Windows.Terminal.VisualStudio"
+        "Windows.Terminal.PowershellCore"
       ],
       "type": "string"
     },
@@ -2356,25 +2355,11 @@
           "description": "When set to true, the terminal will focus the pane on mouse hover.",
           "type": "boolean"
         },
-        "compatibility.allowHeadless": {
-          "default": false,
-          "description": "When set to true, Windows Terminal will run in the background. This allows globalSummon and quakeMode actions to work even when no windows are open.",
-          "type": "boolean"
-        },
         "compatibility.isolatedMode": {
           "default": false,
           "description": "When set to true, Terminal windows will not be able to interact with each other (including global hotkeys, tab drag/drop, running commandlines in existing windows, etc.). This is a compatibility escape hatch for users who are running into certain windowing issues.",
           "type": "boolean"
         },
-        "compatibility.textMeasurement": {
-          "default": "graphemes",
-          "description": "This changes the way incoming text is grouped into cells. The \"graphemes\" option is the most modern and Unicode-correct way to do so, while \"wcswidth\" is a common approach on UNIX, and \"console\" replicates the way it used to work on Windows.",
-          "enum": [
-            "graphemes",
-            "wcswidth",
-            "console"
-          ]
-        },
         "copyFormatting": {
           "default": true,
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",
@@ -2473,6 +2458,11 @@
           "minimum": 1,
           "type": "integer"
         },
+        "startOnUserLogin": {
+          "default": false,
+          "description": "When set to true, this enables the launch of Terminal at startup. Setting this to false will disable the startup task entry. If the Terminal startup task entry is disabled either by org policy or by user action this setting will have no effect.",
+          "type": "boolean"
+        },
         "firstWindowPreference": {
           "default": "defaultProfile",
           "description": "Defines what behavior the terminal takes when it starts. \"defaultProfile\" will have the terminal launch with one tab of the default profile, and \"persistedWindowLayout\" will cause the terminal to save its layout on close and reload it on open.",
@@ -2709,16 +2699,6 @@
           "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
           "type": "boolean"
         },
-        "compatibility.allowDECRQCRA": {
-          "default": false,
-          "description": "When set to true, the terminal will support the DECRQCRA (Request Checksum of Rectangular Area) escape sequence.",
-          "type": "boolean"
-        },
-        "compatibility.allowOSC52": {
-          "default": true,
-          "description": "When set to true, VT applications will be allowed to set the contents of the local clipboard using OSC 52 (Manipulate Selection Data).",
-          "type": "boolean"
-        },
         "unfocusedAppearance": {
           "$ref": "#/$defs/AppearanceConfig",
           "description": "Sets the appearance of the terminal when it is unfocused.",
@@ -3099,17 +3079,6 @@
           "default": false,
           "description": "When set to true, the window will have an acrylic material background. When set to false, the window will have a plain, untextured background.",
           "type": "boolean"
-        },
-        "pathTranslationStyle": {
-          "default": "none",
-          "description": "Controls how file paths are transformed when they are dragged and dropped on the terminal. Possible values are \"none\", \"wsl\", \"cygwin\" and \"msys2\".",
-          "enum": [
-            "none",
-            "wsl",
-            "cygwin",
-            "msys2"
-          ],
-          "type": "string"
         }
       }
     },

doc/theme_colors.html

@@ -0,0 +1,527 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Theme Color Quality Tests</title>
+    <script src="https://colorjs.io/dist/color.global.min.js"></script>
+    <script src="https://cdn.plot.ly/plotly-2.34.0.min.js"></script>
+    <style>
+        html {
+            background: #000;
+            color: #fff;
+        }
+
+        h2 {
+            font-family: monospace;
+        }
+
+        h2 > button {
+            float: right;
+        }
+
+        #container {
+            display: flex;
+            gap: 20px;
+            flex-wrap: wrap;
+        }
+
+        #container > div {
+            width: 418px;
+        }
+
+        .swatch {
+            display: grid;
+            grid-template-columns: repeat(8, 50px);
+            gap: 2px;
+            border: 2px solid black;
+            background: black;
+        }
+
+        .swatch > div {
+            width: 50px;
+            height: 50px;
+        }
+
+        .swatch span {
+            display: block;
+            font-family: monospace;
+            line-height: 2;
+            text-align: center;
+        }
+    </style>
+</head>
+<body>
+<div id="container"></div>
+<script>(() => {
+    const themes = {
+        // Find the optimal selection color (e.g. #92a4fd):
+        //
+        // theme = ["#000000", "#be2c21", "#3fae3a", "#be9a4a", "#204dbe", "#bb54be", "#00a7b2", "#bebebe", "#808080", "#ff3e30", "#58ea51", "#ffd166", "#2f6aff", "#fc74ff", "#00e1f0", "#ffffff"]
+        // theme = theme.map(t => Color.to(t, "oklab"))
+        //
+        // optD = 0;
+        // opt = null;
+        //
+        // for (let h = 264-10; h <= 264+10; h += 1) {
+        //     for (let c = 10; c <= 100; c += 1) {
+        //         for (let l = 40; l <= 90; l += 1) {
+        //             const col = Color.to(`color(--okhsl ${h} ${c}% ${l}%)`, "oklab");
+        //         }
+        //     }
+        // }
+        "Prototype Bright": (() => {
+            const bright_red = new Color(`color(--okhsl ${Color.to("#f00", "okhsl").h} 100% 60.15%)`);
+            const bright_green = new Color(`color(--okhsl ${Color.to("#0f0", "okhsl").h} 92.5% 80%)`);
+            const bright_blue = new Color(`color(--okhsl ${Color.to("#00f", "okhsl").h} 100% 51.2%)`);
+
+            const mixOpts = { space: "oklab", outputSpace: "okhsl" };
+            const bright_yellow = new Color(`color(--okhsl ${bright_red.mix(bright_green, 0.5, mixOpts).h} 100% 84%)`);
+            const bright_purple = new Color(`color(--okhsl ${bright_blue.mix(bright_red, 0.5, mixOpts).h} 100% 73%)`);
+            const bright_cyan = new Color(`color(--okhsl ${bright_green.mix(bright_blue, 0.5, mixOpts).h} 100% 80%)`);
+
+            const bright = [
+                new Color("oklch(60% 0 0)"),
+                bright_red,
+                bright_green,
+                bright_yellow,
+                bright_blue,
+                bright_purple,
+                bright_cyan,
+                new Color("oklch(100% 0 0)"),
+            ];
+            const dark = [
+                new Color("oklch(0% 0 0)"),
+                ...bright.slice(1, 8).map(c => c.mix("#000", 0.2, { space: "oklab" })),
+            ];
+            return dark.concat(...bright).map(c => c.to("sRGB").toString({
+                format: "hex",
+                collapse: false
+            }))
+        })(),
+        // https://oklch.com/
+        "Prototype Symmetric": [
+            new Color("oklch(0% 0 0)"), // Black
+            new Color("oklch(60% 0.098 30)"), // Red
+            new Color("oklch(60% 0.098 150)"), // Green
+            new Color("oklch(60% 0.098 90)"), // Yellow
+            new Color("oklch(60% 0.098 270)"), // Blue
+            new Color("oklch(60% 0.098 330)"), // Purple
+            new Color("oklch(60% 0.098 210)"), // Cyan
+            new Color("oklch(80% 0 0)"), // White
+
+            new Color("oklch(40% 0 0)"), // Bright Black
+            new Color("oklch(80% 0.098 30)"), // Bright Red
+            new Color("oklch(80% 0.098 150)"), // Bright Green
+            new Color("oklch(80% 0.098 90)"), // Bright Yellow
+            new Color("oklch(80% 0.098 270)"), // Bright Blue
+            new Color("oklch(80% 0.098 330)"), // Bright Purple
+            new Color("oklch(80% 0.098 210)"), // Bright Cyan
+            new Color("oklch(100% 0 0)"), // Bright White
+        ].map(c => c.to("sRGB").toString({ format: "hex", collapse: false })),
+        "Terminal.app": [
+            "#000000",
+            "#990000",
+            "#00a600",
+            "#999900",
+            "#0000b2",
+            "#b200b2",
+            "#00a6b2",
+            "#bfbfbf",
+            "#666666",
+            "#e50000",
+            "#00d900",
+            "#e5e500",
+            "#0000ff",
+            "#e500e5",
+            "#00e5e5",
+            "#e5e5e5",
+        ],
+        "Windows NT": [
+            "#000000",
+            "#800000",
+            "#008000",
+            "#808000",
+            "#000080",
+            "#800080",
+            "#008080",
+            "#C0C0C0",
+            "#808080",
+            "#FF0000",
+            "#00FF00",
+            "#FFFF00",
+            "#0000FF",
+            "#FF00FF",
+            "#00FFFF",
+            "#FFFFFF",
+        ],
+        "Windows XP": [
+            "#000000",
+            "#A80000",
+            "#00A800",
+            "#A85400",
+            "#0000A8",
+            "#A800A8",
+            "#61D6D6",
+            "#A8A8A8",
+            "#545454",
+            "#FF0000",
+            "#00FF00",
+            "#FFFF00",
+            "#0000FF",
+            "#FF00FF",
+            "#00FFFF",
+            "#FFFFFF",
+        ],
+        "URXVT": [
+            "#000000",
+            "#BE0000",
+            "#00BE00",
+            "#BEBE00",
+            "#0000BE",
+            "#BE00BE",
+            "#00BEBE",
+            "#BEBEBE",
+            "#424242",
+            "#FF0000",
+            "#00FF00",
+            "#FFFF00",
+            "#0000FF",
+            "#FF00FF",
+            "#00FFFF",
+            "#FFFFFF",
+        ],
+        "Campbell": [
+            "#0C0C0C",
+            "#C50F1F",
+            "#13A10E",
+            "#C19C00",
+            "#0037DA",
+            "#881798",
+            "#3A96DD",
+            "#CCCCCC",
+            "#767676",
+            "#E74856",
+            "#16C60C",
+            "#F9F1A5",
+            "#3B78FF",
+            "#B4009E",
+            "#61D6D6",
+            "#F2F2F2",
+        ],
+        "Campbell Powershell": [
+            "#0C0C0C",
+            "#C50F1F",
+            "#13A10E",
+            "#C19C00",
+            "#0037DA",
+            "#881798",
+            "#3A96DD",
+            "#CCCCCC",
+            "#767676",
+            "#E74856",
+            "#16C60C",
+            "#F9F1A5",
+            "#3B78FF",
+            "#B4009E",
+            "#61D6D6",
+            "#F2F2F2",
+        ],
+        "One Half Dark": [
+            "#282C34",
+            "#E06C75",
+            "#98C379",
+            "#E5C07B",
+            "#61AFEF",
+            "#C678DD",
+            "#56B6C2",
+            "#DCDFE4",
+            "#5A6374",
+            "#E06C75",
+            "#98C379",
+            "#E5C07B",
+            "#61AFEF",
+            "#C678DD",
+            "#56B6C2",
+            "#DCDFE4",
+        ],
+        "One Half Light": [
+            "#383A42",
+            "#E45649",
+            "#50A14F",
+            "#C18301",
+            "#0184BC",
+            "#A626A4",
+            "#0997B3",
+            "#FAFAFA",
+            "#4F525D",
+            "#DF6C75",
+            "#98C379",
+            "#E4C07A",
+            "#61AFEF",
+            "#C577DD",
+            "#56B5C1",
+            "#FFFFFF",
+        ],
+        "Solarized Dark": [
+            "#002B36",
+            "#DC322F",
+            "#859900",
+            "#B58900",
+            "#268BD2",
+            "#D33682",
+            "#2AA198",
+            "#EEE8D5",
+            "#073642",
+            "#CB4B16",
+            "#586E75",
+            "#657B83",
+            "#839496",
+            "#6C71C4",
+            "#93A1A1",
+            "#FDF6E3",
+        ],
+        "Solarized Light": [
+            "#002B36",
+            "#DC322F",
+            "#859900",
+            "#B58900",
+            "#268BD2",
+            "#D33682",
+            "#2AA198",
+            "#EEE8D5",
+            "#073642",
+            "#CB4B16",
+            "#586E75",
+            "#657B83",
+            "#839496",
+            "#6C71C4",
+            "#93A1A1",
+            "#FDF6E3",
+        ],
+        "Tango Dark": [
+            "#000000",
+            "#CC0000",
+            "#4E9A06",
+            "#C4A000",
+            "#3465A4",
+            "#75507B",
+            "#06989A",
+            "#D3D7CF",
+            "#555753",
+            "#EF2929",
+            "#8AE234",
+            "#FCE94F",
+            "#729FCF",
+            "#AD7FA8",
+            "#34E2E2",
+            "#EEEEEC",
+        ],
+        "Tango Light": [
+            "#000000",
+            "#CC0000",
+            "#4E9A06",
+            "#C4A000",
+            "#3465A4",
+            "#75507B",
+            "#06989A",
+            "#D3D7CF",
+            "#555753",
+            "#EF2929",
+            "#8AE234",
+            "#FCE94F",
+            "#729FCF",
+            "#AD7FA8",
+            "#34E2E2",
+            "#EEEEEC",
+        ],
+        "Dark+": [
+            "#000000",
+            "#cd3131",
+            "#0dbc79",
+            "#e5e510",
+            "#2472c8",
+            "#bc3fbc",
+            "#11a8cd",
+            "#e5e5e5",
+            "#666666",
+            "#f14c4c",
+            "#23d18b",
+            "#f5f543",
+            "#3b8eea",
+            "#d670d6",
+            "#29b8db",
+            "#e5e5e5",
+        ],
+        "CGA": [
+            "#000000",
+            "#AA0000",
+            "#00AA00",
+            "#AA5500",
+            "#0000AA",
+            "#AA00AA",
+            "#00AAAA",
+            "#AAAAAA",
+            "#555555",
+            "#FF5555",
+            "#55FF55",
+            "#FFFF55",
+            "#5555FF",
+            "#FF55FF",
+            "#55FFFF",
+            "#FFFFFF",
+        ],
+        "IBM 5153": [
+            "#000000",
+            "#AA0000",
+            "#00AA00",
+            "#C47E00",
+            "#0000AA",
+            "#AA00AA",
+            "#00AAAA",
+            "#AAAAAA",
+            "#555555",
+            "#FF5555",
+            "#55FF55",
+            "#FFFF55",
+            "#5555FF",
+            "#FF55FF",
+            "#55FFFF",
+            "#FFFFFF",
+        ],
+    };
+
+    Object.entries(themes).forEach(([name, srgb]) => {
+        const oklch = srgb.map(c => Color.to(c, "Oklch"));
+
+        const title = document.createElement("h2");
+        title.innerText = name;
+
+        const download = document.createElement("button");
+        download.type = "button";
+        download.innerText = "Copy";
+        download.onclick = () => {
+            navigator.clipboard.writeText(JSON.stringify({
+                name,
+                background: srgb[0],
+                foreground: srgb[7],
+                cursorColor: "#ffffff",
+                black: srgb[0],
+                red: srgb[1],
+                green: srgb[2],
+                yellow: srgb[3],
+                blue: srgb[4],
+                purple: srgb[5],
+                cyan: srgb[6],
+                white: srgb[7],
+                brightBlack: srgb[8],
+                brightRed: srgb[9],
+                brightGreen: srgb[10],
+                brightYellow: srgb[11],
+                brightBlue: srgb[12],
+                brightPurple: srgb[13],
+                brightCyan: srgb[14],
+                brightWhite: srgb[15],
+            }, null, 4));
+
+            download.innerText = "Copied!";
+            download.disabled = true;
+
+            setTimeout(() => {
+                download.innerText = "Copy";
+                download.disabled = false;
+            }, 1000);
+        }
+        title.appendChild(download);
+
+        const swatch = document.createElement("div");
+        swatch.className = "swatch";
+
+        for (let i = 0; i < 16; ++i) {
+            const span = document.createElement("span");
+            span.innerText = oklch[i].l.toFixed(3);
+            span.style.color = srgb[i];
+            span.style.background = srgb[0];
+
+            const div = document.createElement("div");
+            div.style.background = srgb[i];
+            div.appendChild(span);
+
+            swatch.appendChild(div);
+        }
+
+        const plot = document.createElement("div");
+        Plotly.newPlot(plot, [{
+            type: "scatterpolar",
+            mode: "lines",
+            hoverinfo: "skip",
+            showlegend: false,
+            theta: Array.from({ length: 360 }, (x, i) => i),
+            // Pre-calculated max. chroma per hue for sRGB colors.
+            r: [0.260, 0.258, 0.258, 0.257, 0.257, 0.257, 0.256, 0.256, 0.256, 0.255, 0.254, 0.253, 0.252, 0.251, 0.251, 0.251, 0.252, 0.252, 0.252, 0.252, 0.253, 0.253, 0.253, 0.254, 0.254, 0.255, 0.255, 0.255, 0.255, 0.255, 0.252, 0.246, 0.242, 0.237, 0.233, 0.229, 0.226, 0.221, 0.219, 0.214, 0.213, 0.209, 0.207, 0.204, 0.201, 0.200, 0.196, 0.196, 0.193, 0.190, 0.190, 0.187, 0.185, 0.185, 0.182, 0.182, 0.181, 0.179, 0.179, 0.177, 0.175, 0.176, 0.174, 0.173, 0.174, 0.172, 0.171, 0.172, 0.171, 0.170, 0.171, 0.170, 0.169, 0.170, 0.169, 0.168, 0.170, 0.169, 0.168, 0.170, 0.169, 0.170, 0.171, 0.170, 0.172, 0.172, 0.171, 0.173, 0.173, 0.175, 0.175, 0.175, 0.177, 0.178, 0.180, 0.180, 0.182, 0.183, 0.184, 0.186, 0.187, 0.189, 0.192, 0.193, 0.196, 0.197, 0.200, 0.201, 0.204, 0.208, 0.209, 0.210, 0.212, 0.211, 0.213, 0.215, 0.217, 0.216, 0.218, 0.220, 0.221, 0.223, 0.225, 0.228, 0.228, 0.231, 0.234, 0.234, 0.237, 0.241, 0.244, 0.245, 0.249, 0.253, 0.255, 0.259, 0.264, 0.266, 0.271, 0.276, 0.280, 0.286, 0.289, 0.287, 0.278, 0.271, 0.265, 0.258, 0.251, 0.245, 0.239, 0.234, 0.228, 0.223, 0.219, 0.215, 0.211, 0.209, 0.205, 0.202, 0.199, 0.195, 0.192, 0.190, 0.187, 0.185, 0.182, 0.180, 0.178, 0.176, 0.175, 0.174, 0.172, 0.170, 0.169, 0.167, 0.166, 0.165, 0.163, 0.162, 0.161, 0.160, 0.159, 0.158, 0.157, 0.156, 0.157, 0.157, 0.156, 0.155, 0.155, 0.154, 0.154, 0.154, 0.153, 0.153, 0.153, 0.151, 0.151, 0.149, 0.149, 0.147, 0.148, 0.147, 0.146, 0.146, 0.145, 0.145, 0.145, 0.144, 0.145, 0.144, 0.144, 0.144, 0.144, 0.144, 0.143, 0.144, 0.145, 0.144, 0.145, 0.145, 0.145, 0.147, 0.146, 0.147, 0.147, 0.148, 0.15, 0.149, 0.151, 0.151, 0.153, 0.154, 0.154, 0.156, 0.157, 0.159, 0.159, 0.162, 0.162, 0.165, 0.166, 0.169, 0.17, 0.173, 0.174, 0.178, 0.18, 0.182, 0.186, 0.189, 0.192, 0.197, 0.2, 0.204, 0.208, 0.213, 0.219, 0.224, 0.232, 0.242, 0.249, 0.262, 0.284, 0.308, 0.307, 0.307, 0.306, 0.304, 0.301, 0.301, 0.302, 0.3, 0.297, 0.297, 0.298, 0.296, 0.294, 0.294, 0.295, 0.294, 0.292, 0.292, 0.294, 0.292, 0.290, 0.292, 0.292, 0.29, 0.291, 0.292, 0.290, 0.291, 0.292, 0.291, 0.291, 0.293, 0.291, 0.293, 0.293, 0.292, 0.295, 0.294, 0.295, 0.296, 0.295, 0.298, 0.296, 0.299, 0.298, 0.301, 0.300, 0.303, 0.302, 0.305, 0.303, 0.307, 0.305, 0.308, 0.308, 0.310, 0.313, 0.311, 0.314, 0.316, 0.316, 0.319, 0.320, 0.320, 0.314, 0.312, 0.311, 0.309, 0.303, 0.302, 0.300, 0.299, 0.296, 0.292, 0.291, 0.289, 0.288, 0.287, 0.283, 0.280, 0.279, 0.278, 0.277, 0.276, 0.274, 0.271, 0.269, 0.268, 0.267, 0.266, 0.266, 0.265, 0.264, 0.262],
+            marker: {
+                color: srgb[7],
+            },
+        }, {
+            type: "scatterpolar",
+            mode: "markers+text",
+            hoverinfo: "r+theta+text",
+            showlegend: false,
+            hovertext: [
+                "Black",
+                "Red",
+                "Green",
+                "Yellow",
+                "Blue",
+                "Purple",
+                "Cyan",
+                "White",
+                "Bright Black",
+                "Bright Red",
+                "Bright Green",
+                "Bright Yellow",
+                "Bright Blue",
+                "Bright Purple",
+                "Bright Cyan",
+                "Bright White",
+            ],
+            marker: {
+                color: srgb,
+                size: 12,
+            },
+            theta: oklch.map(c => c.h),
+            r: oklch.map(c => c.c),
+        }], {
+            width: 418,
+            height: 418,
+            margin: {
+                l: 40,
+                r: 40,
+                b: 40,
+                t: 40,
+            },
+            paper_bgcolor: "#000",
+            polar: {
+                bgcolor: srgb[0],
+                angularaxis: {
+                    color: srgb[7],
+                    gridcolor: srgb[8],
+                },
+                radialaxis: {
+                    color: srgb[7],
+                    gridcolor: srgb[8],
+                    range: [0, 0.4],
+                },
+            },
+        });
+
+        const theme = document.createElement("div");
+        theme.appendChild(title);
+        theme.appendChild(swatch);
+        theme.appendChild(plot);
+
+        document.getElementById("container").appendChild(theme);
+    });
+})()</script>
+</body>
+</html>

policies/WindowsTerminal.admx

@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  (c) 2024 Microsoft Corporation  -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
-  <policyNamespaces>
-    <target prefix="terminal" namespace="Microsoft.Policies.WindowsTerminal" />
-    <using prefix="windows" namespace="Microsoft.Policies.Windows" />
-  </policyNamespaces>
-  <resources minRequiredRevision="1.0" />
-  <supportedOn>
-    <definitions>
-      <definition name="SUPPORTED_WindowsTerminal_1_21" displayName="$(string.SUPPORTED_WindowsTerminal_1_21)" />
-      <definition name="SUPPORTED_DefaultTerminalApplication" displayName="$(string.SUPPORTED_DefaultTerminalApplication)" />
-    </definitions>
-  </supportedOn>
-  <categories>
-    <category name="WindowsTerminal" displayName="$(string.WindowsTerminal)">
-      <parentCategory ref="windows:WindowsComponents" />
-    </category>
-  </categories>
-  <policies>
-    <policy name="DisabledProfileSources" class="Both" displayName="$(string.DisabledProfileSources)" explainText="$(string.DisabledProfileSourcesText)" presentation="$(presentation.DisabledProfileSources)" key="Software\Policies\Microsoft\Windows Terminal">
-      <parentCategory ref="WindowsTerminal" />
-      <supportedOn ref="SUPPORTED_WindowsTerminal_1_21" />
-      <elements>
-        <multiText id="DisabledProfileSources" valueName="DisabledProfileSources" required="true" />
-      </elements>
-    </policy>
-    <policy name="DefaultTerminalApplication" class="User" displayName="$(string.DefaultTerminalApplication)" explainText="$(string.DefaultTerminalApplicationText)" presentation="$(presentation.TermAppSelection)" key="Console\%%Startup">
-      <parentCategory ref="WindowsTerminal" />
-      <supportedOn ref="SUPPORTED_DefaultTerminalApplication" />
-      <elements>
-        <enum id="TermAppSelect" required="true" valueName="DelegationTerminal">
-          <item displayName="$(string.TermAppAutomatic)">
-            <value>
-              <string>{00000000-0000-0000-0000-000000000000}</string>
-            </value>
-            <valueList>
-              <item key="Console\%%Startup" valueName="DelegationConsole">
-                <value>
-                  <string>{00000000-0000-0000-0000-000000000000}</string>
-                </value>
-              </item>
-            </valueList>
-          </item>
-          <item displayName="$(string.TermAppConsoleHost)">
-            <value>
-              <string>{B23D10C0-E52E-411E-9D5B-C09FDF709C7D}</string>
-            </value>
-            <valueList>
-              <item key="Console\%%Startup" valueName="DelegationConsole">
-                <value>
-                  <string>{B23D10C0-E52E-411E-9D5B-C09FDF709C7D}</string>
-                </value>
-              </item>
-            </valueList>
-          </item>
-          <item displayName="$(string.TermAppWindowsTerminal)">
-            <value>
-              <string>{E12CFF52-A866-4C77-9A90-F570A7AA2C6B}</string>
-            </value>
-            <valueList>
-              <item key="Console\%%Startup" valueName="DelegationConsole">
-                <value>
-                  <string>{2EACA947-7F5F-4CFA-BA87-8F7FBEEFBE69}</string>
-                </value>
-              </item>
-            </valueList>
-          </item>
-          <item displayName="$(string.TermAppWindowsTerminalPreview)">
-            <value>
-              <string>{86633F1F-6454-40EC-89CE-DA4EBA977EE2}</string>
-            </value>
-            <valueList>
-              <item key="Console\%%Startup" valueName="DelegationConsole">
-                <value>
-                  <string>{06EC847C-C0A5-46B8-92CB-7C92F6E35CD5}</string>
-                </value>
-              </item>
-            </valueList>
-          </item>
-        </enum>
-      </elements>
-    </policy>
-  </policies>
-</policyDefinitions>

policies/en-US/WindowsTerminal.adml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  (c) 2024 Microsoft Corporation  -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
-  <displayName>Windows Terminal</displayName>
-  <description>Windows Terminal</description>
-  <resources>
-    <stringTable>
-      <string id="WindowsTerminal">Windows Terminal</string>
-      <string id="SUPPORTED_WindowsTerminal_1_21">At least Windows Terminal 1.21</string>
-      <string id="SUPPORTED_DefaultTerminalApplication">At least Windows 11 22H2 or Windows 10 22H2 (Build 19045.3031, KB5026435) with Windows Terminal 1.17</string>
-      <string id="DisabledProfileSources">Disabled Profile Sources</string>
-      <string id="DisabledProfileSourcesText">Profiles will not be generated from any sources listed here. Source names can be arbitrary strings. Potential candidates can be found as the "source" property on profile definitions in Windows Terminal's settings.json file.
-
-Common sources are:
-- Windows.Terminal.Azure
-- Windows.Terminal.PowershellCore
-- Windows.Terminal.Wsl
-
-For instance, setting this policy to Windows.Terminal.Wsl will disable the builtin WSL integration of Windows Terminal.
-
-Note: Existing profiles will disappear from Windows Terminal after adding their source to this policy.</string>
-      <string id="DefaultTerminalApplication">Default terminal application</string>
-      <string id="DefaultTerminalApplicationText">Select the default terminal application used in Windows.
-
-If you select Windows Terminal Preview and it is not installed the system will fallback to the legacy Windows Console Host. (Please note that the settings interfaces showing "Let windows decide" in this case as configuration.)</string>
-      <string id="TermAppAutomatic">Automatic selection (Windows Terminal, if available)</string>
-      <string id="TermAppConsoleHost">Windows Console Host (legacy)</string>
-      <string id="TermAppWindowsTerminal">Windows Terminal</string>
-      <string id="TermAppWindowsTerminalPreview">Windows Terminal Preview (if available)</string>
-    </stringTable>
-    <presentationTable>
-      <presentation id="DisabledProfileSources">
-        <multiTextBox refId="DisabledProfileSources">List of disabled sources (one per line)</multiTextBox>
-      </presentation>
-      <presentation id="TermAppSelection">
-        <dropdownList refId="TermAppSelect" noSort="true" defaultItem="0">Select from the following options:</dropdownList>
-      </presentation>
-    </presentationTable>
-  </resources>
-</policyDefinitionResources>

res/fonts/README.md

@@ -8,5 +8,5 @@ Please consult the [license](https://raw.githubusercontent.com/microsoft/cascadi
 
 ### Fonts Included
 
-* Cascadia Code, Cascadia Mono (2407.24)
-   * from microsoft/cascadia-code@56bcca3f2c1e4cb19458954f0e2bb4635960df91
+* Cascadia Code, Cascadia Mono (2404.23)
+   * from microsoft/cascadia-code@1034791e5fc6e060a448d2b29cd94a6c683edb36

scratch/ScratchIslandApp/Package/Package.appxmanifest

@@ -27,7 +27,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
 
   <Resources>

src/buffer/out/ImageSlice.cpp

@@ -186,20 +186,18 @@ bool ImageSlice::_copyCells(const ImageSlice& srcSlice, const til::CoordType src
     }
 
     // The used destination before and after the written area must be erased.
-    // If this results in the entire range being erased, we return true to let
-    // the caller know that the slice should be deleted.
-    if (dstUsedBegin < dstWriteBegin && _eraseCells(dstUsedBegin, dstWriteBegin))
+    if (dstUsedBegin < dstWriteBegin)
     {
-        return true;
+        _eraseCells(dstUsedBegin, dstWriteBegin);
     }
-    if (dstUsedEnd > dstWriteEnd && _eraseCells(dstWriteEnd, dstUsedEnd))
+    if (dstUsedEnd > dstWriteEnd)
     {
-        return true;
+        _eraseCells(dstWriteEnd, dstUsedEnd);
     }
 
-    // At this point, if the beginning column is not less than the end, that
-    // means this was an empty slice into which nothing was copied, so we can
-    // again return true to let the caller know it should be deleted.
+    // If the beginning column is now not less than the end, that means the
+    // content has been entirely erased, so we return true to let the caller
+    // know that the slice should be deleted.
     return _columnBegin >= _columnEnd;
 }
 
@@ -212,19 +210,10 @@ void ImageSlice::EraseBlock(TextBuffer& buffer, const til::rect rect)
     }
 }
 
-void ImageSlice::EraseCells(TextBuffer& buffer, const til::point at, const til::CoordType distance)
+void ImageSlice::EraseCells(TextBuffer& buffer, const til::point at, const size_t distance)
 {
-    auto x = at.x;
-    auto y = at.y;
-    auto distanceRemaining = distance;
-    while (distanceRemaining > 0)
-    {
-        auto& row = buffer.GetMutableRowByOffset(y);
-        EraseCells(row, x, x + distanceRemaining);
-        distanceRemaining -= (static_cast<til::CoordType>(row.size()) - x);
-        x = 0;
-        y++;
-    }
+    auto& row = buffer.GetMutableRowByOffset(at.y);
+    EraseCells(row, at.x, gsl::narrow_cast<til::CoordType>(at.x + distance));
 }
 
 void ImageSlice::EraseCells(ROW& row, const til::CoordType columnBegin, const til::CoordType columnEnd)

src/buffer/out/ImageSlice.hpp

@@ -41,7 +41,7 @@ public:
     static void CopyRow(const ROW& srcRow, ROW& dstRow);
     static void CopyCells(const ROW& srcRow, const til::CoordType srcColumn, ROW& dstRow, const til::CoordType dstColumnBegin, const til::CoordType dstColumnEnd);
     static void EraseBlock(TextBuffer& buffer, const til::rect rect);
-    static void EraseCells(TextBuffer& buffer, const til::point at, const til::CoordType distance);
+    static void EraseCells(TextBuffer& buffer, const til::point at, const size_t distance);
     static void EraseCells(ROW& row, const til::CoordType columnBegin, const til::CoordType columnEnd);
 
 private:

src/buffer/out/Row.cpp

@@ -426,7 +426,7 @@ OutputCellIterator ROW::WriteCells(OutputCellIterator it, const til::CoordType c
     THROW_HR_IF(E_INVALIDARG, limitRight.value_or(0) >= size());
 
     // If we're given a right-side column limit, use it. Otherwise, the write limit is the final column index available in the char row.
-    const auto finalColumnInRow = gsl::narrow_cast<uint16_t>(limitRight.value_or(size() - 1));
+    const auto finalColumnInRow = limitRight.value_or(size() - 1);
 
     auto currentColor = it->TextAttr();
     uint16_t colorUses = 0;
@@ -937,12 +937,12 @@ void ROW::_resizeChars(uint16_t colEndDirty, uint16_t chBegDirty, size_t chEndDi
     }
 }
 
-RowAttributes& ROW::Attributes() noexcept
+til::small_rle<TextAttribute, uint16_t, 1>& ROW::Attributes() noexcept
 {
     return _attr;
 }
 
-const RowAttributes& ROW::Attributes() const noexcept
+const til::small_rle<TextAttribute, uint16_t, 1>& ROW::Attributes() const noexcept
 {
     return _attr;
 }

src/buffer/out/Row.hpp

@@ -14,11 +14,6 @@
 class ROW;
 class TextBuffer;
 
-// Because MarkKind::Output gets set only on the actually written text,
-// most rows will end up having at least 2 runs: The start of the line
-// with MarkKind::Output and the rest of the line with MarkKind::None.
-using RowAttributes = til::small_rle<TextAttribute, uint16_t, 2>;
-
 enum class DelimiterClass
 {
     ControlChar,
@@ -153,8 +148,8 @@ public:
     void ReplaceText(RowWriteState& state);
     void CopyTextFrom(RowCopyTextFromState& state);
 
-    RowAttributes& Attributes() noexcept;
-    const RowAttributes& Attributes() const noexcept;
+    til::small_rle<TextAttribute, uint16_t, 1>& Attributes() noexcept;
+    const til::small_rle<TextAttribute, uint16_t, 1>& Attributes() const noexcept;
     TextAttribute GetAttrByColumn(til::CoordType column) const;
     std::vector<uint16_t> GetHyperlinks() const;
     ImageSlice* SetImageSlice(ImageSlice::Pointer imageSlice) noexcept;
@@ -302,7 +297,7 @@ private:
     std::span<uint16_t> _charOffsets;
     // _attr is a run-length-encoded vector of TextAttribute with a decompressed
     // length equal to _columnCount (= 1 TextAttribute per column).
-    RowAttributes _attr;
+    til::small_rle<TextAttribute, uint16_t, 1> _attr;
     // The width of the row in visual columns.
     uint16_t _columnCount = 0;
     // Stores double-width/height (DECSWL/DECDWL/DECDHL) attributes.

src/buffer/out/search.cpp

@@ -16,7 +16,7 @@ bool Search::IsStale(const Microsoft::Console::Render::IRenderData& renderData,
            _lastMutationId != renderData.GetTextBuffer().GetLastMutationId();
 }
 
-void Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse)
+bool Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse)
 {
     const auto& textBuffer = renderData.GetTextBuffer();
 
@@ -30,15 +30,15 @@ void Search::Reset(Microsoft::Console::Render::IRenderData& renderData, const st
     _results = std::move(result).value_or(std::vector<til::point_span>{});
     _index = reverse ? gsl::narrow_cast<ptrdiff_t>(_results.size()) - 1 : 0;
     _step = reverse ? -1 : 1;
+    return true;
+}
 
+void Search::MoveToCurrentSelection()
+{
     if (_renderData->IsSelectionActive())
     {
         MoveToPoint(_renderData->GetTextBuffer().ScreenToBufferPosition(_renderData->GetSelectionAnchor()));
     }
-    else if (const auto span = _renderData->GetSearchHighlightFocused())
-    {
-        MoveToPoint(_step > 0 ? span->start : span->end);
-    }
 }
 
 void Search::MoveToPoint(const til::point anchor) noexcept

src/buffer/out/search.h

@@ -36,8 +36,9 @@ public:
     Search() = default;
 
     bool IsStale(const Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags) const noexcept;
-    void Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse);
+    bool Reset(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, SearchFlag flags, bool reverse);
 
+    void MoveToCurrentSelection();
     void MoveToPoint(til::point anchor) noexcept;
     void MovePastPoint(til::point anchor) noexcept;
     void FindNext(bool reverse) noexcept;

src/buffer/out/textBuffer.cpp

@@ -451,9 +451,14 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord
         cwd.GraphemeNext(state, chars);
         col += state.width;
 
+        // If we ran out of columns, we need to always return `columnLimit` and not `cols`,
+        // because if we tried inserting a wide glyph into just 1 remaining column it will
+        // fail to fit, but that remaining column still has been used up. When the caller sees
+        // `columns == columnLimit` they will line-wrap and continue inserting into the next row.
         if (col > columnLimit)
         {
-            break;
+            columns = columnLimit;
+            return dist;
         }
 
         dist += state.len;
@@ -461,7 +466,7 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord
 
     // But if we simply ran out of text we just need to return the actual number of columns.
     columns = col;
-    return dist;
+    return chars.size();
 }
 
 // Pretend as if `position` is a regular cursor in the TextBuffer.

src/cascadia/CascadiaPackage/Package-Can.appxmanifest

@@ -38,7 +38,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -38,7 +38,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -39,7 +39,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -39,7 +39,7 @@
   </Properties>
 
   <Dependencies>
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.26100.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
 
   <Resources>

src/cascadia/CascadiaPackage/Resources/cs-CZ/Resources.resw

@@ -154,7 +154,7 @@
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
   </data>
   <data name="AppDescription" xml:space="preserve">
-    <value>Nový Terminál Windows</value>
+    <value>Nová Terminál Windows</value>
   </data>
   <data name="AppDescriptionPre" xml:space="preserve">
     <value>Terminál Windows s náhledem připravovaných funkcí</value>
@@ -164,11 +164,11 @@
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
-    <value>Otevřít &amp;náhled Terminálu</value>
+    <value>Otevřít náhled &amp;aplikace Terminal</value>
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
-    <value>Otevřít v &amp;Terminálu</value>
+    <value>Otevřít v aplikaci &amp;Terminal</value>
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
 </root>

src/cascadia/ElevateShim/elevate-shim.vcxproj

@@ -7,7 +7,6 @@
     <ProjectName>elevate-shim</ProjectName>
     <TargetName>elevate-shim</TargetName>
     <ConfigurationType>Application</ConfigurationType>
-    <VersionInfoFileDescription>Windows Terminal Administrator Launch Helper</VersionInfoFileDescription>
   </PropertyGroup>
 
   <Import Project="..\..\..\common.openconsole.props" Condition="'$(OpenConsoleDir)'==''" />

src/cascadia/ShellExtension/WindowsTerminalShellExt.vcxproj

@@ -10,7 +10,6 @@
     <SubSystem>Console</SubSystem>
     <!-- suppress a bunch of Windows Universal properties from cppwinrt.props -->
     <OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
-    <VersionInfoFileDescription>Windows Terminal Open Here Shell Extension</VersionInfoFileDescription>
   </PropertyGroup>
   <PropertyGroup Label="NuGet Dependencies">
     <TerminalCppWinrt>true</TerminalCppWinrt>

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -118,7 +118,7 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_HandleCloseWindow(const IInspectable& /*sender*/,
                                           const ActionEventArgs& args)
     {
-        CloseWindow();
+        CloseRequested.raise(nullptr, nullptr);
         args.Handled(true);
     }
 

src/cascadia/TerminalApp/AppLogic.cpp

@@ -83,6 +83,8 @@ static winrt::hstring _GetErrorText(SettingsLoadErrors error)
     return _GetMessageText(static_cast<uint32_t>(error), settingsLoadErrorsLabels);
 }
 
+static constexpr std::wstring_view StartupTaskName = L"StartTerminalOnLoginTask";
+
 namespace winrt::TerminalApp::implementation
 {
     // Function Description:
@@ -335,16 +337,8 @@ namespace winrt::TerminalApp::implementation
     void AppLogic::_ApplyLanguageSettingChange() noexcept
     try
     {
-        const auto language = _settings.GlobalSettings().Language();
-
         if (!IsPackaged())
         {
-            if (!language.empty())
-            {
-                // We cannot use the packaged app API, PrimaryLanguageOverride, but we *can* tell the resource loader
-                // to set the Language for all loaded resources to the user's preferred language.
-                winrt::Windows::ApplicationModel::Resources::Core::ResourceContext::SetGlobalQualifierValue(L"Language", language);
-            }
             return;
         }
 
@@ -352,6 +346,8 @@ namespace winrt::TerminalApp::implementation
 
         // NOTE: PrimaryLanguageOverride throws if this instance is unpackaged.
         const auto primaryLanguageOverride = ApplicationLanguages::PrimaryLanguageOverride();
+        const auto language = _settings.GlobalSettings().Language();
+
         if (primaryLanguageOverride != language)
         {
             ApplicationLanguages::PrimaryLanguageOverride(language);
@@ -359,6 +355,40 @@ namespace winrt::TerminalApp::implementation
     }
     CATCH_LOG()
 
+    safe_void_coroutine AppLogic::_ApplyStartupTaskStateChange()
+    try
+    {
+        // First, make sure we're running in a packaged context. This method
+        // won't work, and will crash mysteriously if we're running unpackaged.
+        if (!IsPackaged())
+        {
+            co_return;
+        }
+
+        const auto tryEnableStartupTask = _settings.GlobalSettings().StartOnUserLogin();
+        const auto task = co_await StartupTask::GetAsync(StartupTaskName);
+
+        switch (task.State())
+        {
+        case StartupTaskState::Disabled:
+            if (tryEnableStartupTask)
+            {
+                co_await task.RequestEnableAsync();
+            }
+            break;
+        case StartupTaskState::DisabledByUser:
+            // TODO: GH#6254: define UX for other StartupTaskStates
+            break;
+        case StartupTaskState::Enabled:
+            if (!tryEnableStartupTask)
+            {
+                task.Disable();
+            }
+            break;
+        }
+    }
+    CATCH_LOG();
+
     // Method Description:
     // - Reloads the settings from the settings.json file.
     // - When this is called the first time, this initializes our settings. See
@@ -396,7 +426,7 @@ namespace winrt::TerminalApp::implementation
                 auto ev = winrt::make_self<SettingsLoadEventArgs>(true,
                                                                   static_cast<uint64_t>(_settingsLoadedResult),
                                                                   _settingsLoadExceptionText,
-                                                                  warnings.GetView(),
+                                                                  warnings,
                                                                   _settings);
                 SettingsChanged.raise(*this, *ev);
                 return;
@@ -418,6 +448,7 @@ namespace winrt::TerminalApp::implementation
         // TerminalSettings object.
 
         _ApplyLanguageSettingChange();
+        _ApplyStartupTaskStateChange();
         _ProcessLazySettingsChanges();
 
         auto warnings{ winrt::multi_threaded_vector<SettingsLoadWarnings>() };
@@ -428,7 +459,7 @@ namespace winrt::TerminalApp::implementation
         auto ev = winrt::make_self<SettingsLoadEventArgs>(!initialLoad,
                                                           _settingsLoadedResult,
                                                           _settingsLoadExceptionText,
-                                                          warnings.GetView(),
+                                                          warnings,
                                                           _settings);
         SettingsChanged.raise(*this, *ev);
     }
@@ -444,6 +475,7 @@ namespace winrt::TerminalApp::implementation
         // Both LoadSettings and ReloadSettings are supposed to call this function,
         // but LoadSettings skips it, so that the UI starts up faster.
         // Now that the UI is present we can do them with a less significant UX impact.
+        _ApplyStartupTaskStateChange();
         _ProcessLazySettingsChanges();
 
         FILETIME creationTime, exitTime, kernelTime, userTime, now;
@@ -656,7 +688,7 @@ namespace winrt::TerminalApp::implementation
         auto ev = winrt::make_self<SettingsLoadEventArgs>(false,
                                                           _settingsLoadedResult,
                                                           _settingsLoadExceptionText,
-                                                          warnings.GetView(),
+                                                          warnings,
                                                           _settings);
 
         auto window = winrt::make_self<implementation::TerminalWindow>(*ev, _contentManager);

src/cascadia/TerminalApp/AppLogic.h

@@ -103,6 +103,7 @@ namespace winrt::TerminalApp::implementation
                                                                        const Microsoft::Terminal::Settings::Model::WindowingMode& windowingBehavior);
 
         void _ApplyLanguageSettingChange() noexcept;
+        safe_void_coroutine _ApplyStartupTaskStateChange();
 
         [[nodiscard]] HRESULT _TryLoadSettings() noexcept;
         void _ProcessLazySettingsChanges();

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -359,7 +359,7 @@ namespace winrt::TerminalApp::implementation
             _switchToMode(CommandPaletteMode::CommandlineMode);
             e.Handled(true);
         }
-        else if ((key == VirtualKey::C || key == VirtualKey::Insert) && ctrlDown)
+        else if (key == VirtualKey::C && ctrlDown)
         {
             _searchBox().CopySelectionToClipboard();
             e.Handled(true);

src/cascadia/TerminalApp/CommandPalette.xaml

@@ -23,27 +23,6 @@
 
     <UserControl.Resources>
         <ResourceDictionary>
-            <!--  KeyChordText styles  -->
-            <Style x:Key="KeyChordBorderStyle"
-                   TargetType="Border">
-                <Setter Property="BorderThickness" Value="1" />
-                <Setter Property="CornerRadius" Value="2" />
-                <Setter Property="Background" Value="Transparent" />
-                <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="{ThemeResource ControlCornerRadius}" />
-                <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
-                <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
-            </Style>
-
             <DataTemplate x:Key="ListItemTemplate"
                           x:DataType="local:FilteredCommand">
                 <ListViewItem HorizontalContentAlignment="Stretch"
@@ -90,12 +69,12 @@
                             VerticalAlignment="Center"
                             AutomationProperties.AccessibilityView="Raw"
                             Background="{ThemeResource FlyoutPresenterBackground}"
-                            Style="{StaticResource KeyChordBorderStyle}"
+                            Style="{ThemeResource KeyChordBorderStyle}"
                             Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Item.KeyChordText), Mode=OneWay}">
 
                         <TextBlock AutomationProperties.AccessibilityView="Raw"
                                    FontSize="12"
-                                   Style="{StaticResource KeyChordTextBlockStyle}"
+                                   Style="{ThemeResource KeyChordTextBlockStyle}"
                                    Text="{x:Bind Item.KeyChordText, Mode=OneWay}" />
                     </Border>
                 </Grid>
@@ -139,12 +118,12 @@
                             HorizontalAlignment="Right"
                             VerticalAlignment="Center"
                             AutomationProperties.AccessibilityView="Raw"
-                            Style="{StaticResource KeyChordBorderStyle}"
+                            Style="{ThemeResource KeyChordBorderStyle}"
                             Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Item.KeyChordText), Mode=OneWay}">
 
                         <TextBlock AutomationProperties.AccessibilityView="Raw"
                                    FontSize="12"
-                                   Style="{StaticResource KeyChordTextBlockStyle}"
+                                   Style="{ThemeResource KeyChordTextBlockStyle}"
                                    Text="{x:Bind Item.KeyChordText, Mode=OneWay}" />
                     </Border>
 
@@ -240,6 +219,79 @@
                                                GeneralItemTemplate="{StaticResource GeneralItemTemplate}"
                                                NestedItemTemplate="{StaticResource NestedItemTemplate}"
                                                TabItemTemplate="{StaticResource TabItemTemplate}" />
+
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Dark">
+
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="2" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <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="{ThemeResource ControlCornerRadius}" />
+                        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
+                    </Style>
+                    <Style x:Key="ParsedCommandLineTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Light">
+
+                    <!--  KeyChordText styles  -->
+                    <Style x:Key="KeyChordBorderStyle"
+                           TargetType="Border">
+                        <Setter Property="BorderThickness" Value="1" />
+                        <Setter Property="CornerRadius" Value="2" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <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="{ThemeResource ControlCornerRadius}" />
+                        <Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
+                        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
+                    </Style>
+                    <Style x:Key="ParsedCommandLineTextBlockStyle"
+                           TargetType="TextBlock">
+                        <Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseMediumBrush}" />
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="HighContrast">
+
+                    <!--  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>
 
@@ -323,7 +375,7 @@
                     Padding="16,12"
                     HorizontalAlignment="Stretch"
                     VerticalAlignment="Center"
-                    Style="{StaticResource ParsedCommandLineBorderStyle}"
+                    Style="{ThemeResource ParsedCommandLineBorderStyle}"
                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(ParsedCommandLineText), Mode=OneWay}">
 
                 <ScrollViewer MaxHeight="200"

src/cascadia/TerminalApp/DebugTapConnection.cpp

@@ -60,12 +60,9 @@ namespace winrt::Microsoft::TerminalApp::implementation
 
     DebugTapConnection::DebugTapConnection(ITerminalConnection wrappedConnection)
     {
-        _outputRevoker = wrappedConnection.TerminalOutput(winrt::auto_revoke, { get_weak(), &DebugTapConnection::_OutputHandler });
-        _stateChangedRevoker = wrappedConnection.StateChanged(winrt::auto_revoke, [weak = get_weak()](auto&& /*s*/, auto&& /*e*/) {
-            if (const auto self = weak.get())
-            {
-                self->StateChanged.raise(*self, nullptr);
-            }
+        _outputRevoker = wrappedConnection.TerminalOutput(winrt::auto_revoke, { this, &DebugTapConnection::_OutputHandler });
+        _stateChangedRevoker = wrappedConnection.StateChanged(winrt::auto_revoke, [this](auto&& /*s*/, auto&& /*e*/) {
+            StateChanged.raise(*this, nullptr);
         });
         _wrappedConnection = wrappedConnection;
     }

src/cascadia/TerminalApp/Jumplist.cpp

@@ -162,9 +162,10 @@ winrt::com_ptr<IShellLinkW> Jumplist::_createShellLink(const std::wstring_view n
         const std::wstring iconPath{ path.substr(0, commaPosition) };
 
         // We dont want the comma included so add 1 to its position
-        if (const auto iconIndex = til::parse_signed<int>(path.substr(commaPosition + 1)))
+        int iconIndex = til::to_int(path.substr(commaPosition + 1));
+        if (iconIndex != til::to_int_error)
         {
-            THROW_IF_FAILED(sh->SetIconLocation(iconPath.data(), *iconIndex));
+            THROW_IF_FAILED(sh->SetIconLocation(iconPath.data(), iconIndex));
         }
     }
     else if (til::ends_with(path, L"exe") || til::ends_with(path, L"dll"))

src/cascadia/TerminalApp/Pane.cpp

@@ -697,24 +697,12 @@ bool Pane::SwapPanes(std::shared_ptr<Pane> first, std::shared_ptr<Pane> second)
         // Refocus the last pane if there was a pane focused
         if (const auto focus = first->GetActivePane())
         {
-            // GH#18184: manually focus the pane and content.
-            //           _Focus() results in no-op because the pane was _lastActive
-            focus->GotFocus.raise(focus, FocusState::Programmatic);
-            if (const auto& lastContent{ focus->GetLastFocusedContent() })
-            {
-                lastContent.Focus(FocusState::Programmatic);
-            }
+            focus->_Focus();
         }
 
         if (const auto focus = second->GetActivePane())
         {
-            // GH#18184: manually focus the pane and content.
-            //           _Focus() results in no-op because the pane was _lastActive
-            focus->GotFocus.raise(focus, FocusState::Programmatic);
-            if (const auto& lastContent{ focus->GetLastFocusedContent() })
-            {
-                lastContent.Focus(FocusState::Programmatic);
-            }
+            focus->_Focus();
         }
 
         return true;
@@ -1414,13 +1402,6 @@ void Pane::_CloseChild(const bool closeFirst)
 
         // take the control, profile, id and isDefTermSession of the pane that _wasn't_ closed.
         _setPaneContent(remainingChild->_takePaneContent());
-        if (!_content)
-        {
-            // GH#18071: our content is still null after taking the other pane's content,
-            //           so just notify our parent that we're closed.
-            Closed.raise(nullptr, nullptr);
-            return;
-        }
         _id = remainingChild->Id();
 
         // Revoke the old event handlers. Remove both the handlers for the panes
@@ -2975,13 +2956,13 @@ bool Pane::ContainsReadOnly() const
 // - <none>
 void Pane::CollectTaskbarStates(std::vector<winrt::TerminalApp::TaskbarState>& states)
 {
-    if (_content)
+    if (_IsLeaf())
     {
         auto tbState{ winrt::make<winrt::TerminalApp::implementation::TaskbarState>(_content.TaskbarState(),
                                                                                     _content.TaskbarProgress()) };
         states.push_back(tbState);
     }
-    else if (_firstChild && _secondChild)
+    else
     {
         _firstChild->CollectTaskbarStates(states);
         _secondChild->CollectTaskbarStates(states);

src/cascadia/TerminalApp/Resources/cs-CZ/ContextMenu.resw

@@ -154,7 +154,7 @@
     <comment>{Locked=qps-ploc,qps-ploca,qps-plocm}</comment>
   </data>
   <data name="AppDescription" xml:space="preserve">
-    <value>Nový Terminál Windows</value>
+    <value>Nová Terminál Windows</value>
   </data>
   <data name="AppDescriptionPre" xml:space="preserve">
     <value>Terminál Windows s náhledem připravovaných funkcí</value>
@@ -164,11 +164,11 @@
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Canary version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem_Preview" xml:space="preserve">
-    <value>Otevřít &amp;náhled Terminálu</value>
+    <value>Otevřít náhled &amp;aplikace Terminal</value>
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the Preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
   <data name="ShellExtension_OpenInTerminalMenuItem" xml:space="preserve">
-    <value>Otevřít v &amp;Terminálu</value>
+    <value>Otevřít v aplikaci &amp;Terminal</value>
     <comment>This is a menu item that will be displayed in the Windows File Explorer that launches the non-preview version of Windows Terminal. Please mark one of the characters to be an accelerator key.</comment>
   </data>
 </root>

src/cascadia/TerminalApp/Resources/de-DE/Resources.resw

@@ -192,9 +192,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Schließen</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Registerkarte verschieben</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Tabs nach rechts schließen</value>
   </data>
@@ -939,10 +936,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Bereich schließen</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Nach links</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Nach rechts</value>
-  </data>
 </root>

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

@@ -193,9 +193,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Close</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Move tab</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Close tabs to the right</value>
   </data>
@@ -944,10 +941,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Close pane</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Move left</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Move right</value>
-  </data>
-</root>
+</root>

src/cascadia/TerminalApp/Resources/es-ES/Resources.resw

@@ -189,9 +189,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Cerrar</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Mover pestaña</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Cerrar las pestañas de la derecha</value>
   </data>
@@ -936,10 +933,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Cerrar panel</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Mover a la izquierda</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Mover a la derecha</value>
-  </data>
 </root>

src/cascadia/TerminalApp/Resources/fr-FR/Resources.resw

@@ -189,9 +189,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Fermer</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Déplacer l’onglet</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Fermer les onglets à droite</value>
   </data>
@@ -936,10 +933,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Fermer le volet</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Déplacer vers la gauche</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Déplacer vers la droite</value>
-  </data>
 </root>

src/cascadia/TerminalApp/Resources/it-IT/Resources.resw

@@ -189,9 +189,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Chiudi</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Sposta scheda</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Chiudi schede a destra</value>
   </data>
@@ -936,10 +933,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Chiudi il riquadro</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Sposta a sinistra</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Sposta a destra</value>
-  </data>
 </root>

src/cascadia/TerminalApp/Resources/ja-JP/Resources.resw

@@ -190,9 +190,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>閉じる</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>タブの移動</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>タブを右側に閉じる</value>
   </data>
@@ -206,7 +203,7 @@
     <value>ウィンドウを閉じる</value>
   </data>
   <data name="SplitTabText" xml:space="preserve">
-    <value>タブを分割</value>
+    <value>[分割] タブ</value>
   </data>
   <data name="SplitPaneText" xml:space="preserve">
     <value>ウィンドウを分割する</value>
@@ -224,7 +221,7 @@
     <value>リセット</value>
   </data>
   <data name="RenameTabText" xml:space="preserve">
-    <value>タブ名を変更</value>
+    <value>[名前の変更] タブ</value>
   </data>
   <data name="DuplicateTabText" xml:space="preserve">
     <value>タブを複製する</value>
@@ -937,10 +934,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>ウィンドウを閉じる</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>左へ移動</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>右へ移動</value>
-  </data>
 </root>

src/cascadia/TerminalApp/Resources/ko-KR/Resources.resw

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="InitialJsonParseErrorText" xml:space="preserve">
-    <value>파일에서 설정을 로드하지 못했습니다. 후행 쉼표를 포함하여 구문 오류가 있는지 확인합니다.</value>
+    <value>파일에서 설정을 로드 하지 못했습니다. 후행 쉼표를 포함 하 여 구문 오류가 있는지 확인 합니다.</value>
   </data>
   <data name="MissingDefaultProfileText" xml:space="preserve">
     <value>첫 번째 프로필을 사용하여 프로필 목록에서 기본 프로필을 찾을 수 없습니다. "defaultProfile"이 프로필 중 하나의 GUID와 일치하는지 확인합니다.</value>
@@ -189,9 +189,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>닫기</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>탭 이동</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>오른쪽에 있는 탭 닫기</value>
   </data>
@@ -322,7 +319,7 @@
     <value>상위 창의 백분율로 크기를 지정합니다. (0,1) 사이 값만 유효합니다.</value>
   </data>
   <data name="CmdNewTabDesc" xml:space="preserve">
-    <value>새 탭 만들기</value>
+    <value>새 작업 만들기</value>
   </data>
   <data name="CmdNTDesc" xml:space="preserve">
     <value>"new-tab" 하위 명령의 별칭입니다.</value>
@@ -527,7 +524,7 @@
     <value>경고</value>
   </data>
   <data name="CloseReadOnlyDialog.Content" xml:space="preserve">
-    <value>읽기 전용 터미널을 닫으려고 합니다. 계속하시겠습니까?</value>
+    <value>읽기 전용 터미널을 닫으려고 합니다. 계속하시겠어요?</value>
   </data>
   <data name="LargePasteDialog.CloseButtonText" xml:space="preserve">
     <value>취소</value>
@@ -619,7 +616,7 @@
     <comment>{0} will be replaced with a number.</comment>
   </data>
   <data name="CrimsonColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
-    <value>진홍</value>
+    <value>심홍</value>
   </data>
   <data name="SteelBlueColorButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>강철색</value>
@@ -936,10 +933,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>창 닫기</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>왼쪽으로 이동</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>오른쪽으로 이동</value>
-  </data>
 </root>

src/cascadia/TerminalApp/Resources/pt-BR/Resources.resw

@@ -189,9 +189,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Fechar</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Mover guia</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Fechar guias à direita</value>
   </data>
@@ -936,10 +933,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Fechar o painel</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Mover para a esquerda</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Mover para a direita</value>
-  </data>
 </root>

src/cascadia/TerminalApp/Resources/qps-ploc/Resources.resw

@@ -193,9 +193,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Ćļôŝέ !</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Μòνë ťäв !!</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Ċĺοşέ ţаъş ťό ŧђé яΐğђт !!! !!! </value>
   </data>
@@ -944,10 +941,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Ćℓǿŝé ρдʼné !!!</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Μŏνê ĺэƒť !!!</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Мóνε яίģнŧ !!!</value>
-  </data>
-</root>
+</root>

src/cascadia/TerminalApp/Resources/qps-ploca/Resources.resw

@@ -193,9 +193,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Ćļôŝέ !</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Μòνë ťäв !!</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Ċĺοşέ ţаъş ťό ŧђé яΐğђт !!! !!! </value>
   </data>
@@ -944,10 +941,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Ćℓǿŝé ρдʼné !!!</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Μŏνê ĺэƒť !!!</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Мóνε яίģнŧ !!!</value>
-  </data>
-</root>
+</root>

src/cascadia/TerminalApp/Resources/qps-plocm/Resources.resw

@@ -193,9 +193,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Ćļôŝέ !</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Μòνë ťäв !!</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Ċĺοşέ ţаъş ťό ŧђé яΐğђт !!! !!! </value>
   </data>
@@ -944,10 +941,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Ćℓǿŝé ρдʼné !!!</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Μŏνê ĺэƒť !!!</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Мóνε яίģнŧ !!!</value>
-  </data>
-</root>
+</root>

src/cascadia/TerminalApp/Resources/ru-RU/Resources.resw

@@ -189,9 +189,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>Закрыть</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>Переместить вкладку</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>Закрыть вкладки справа</value>
   </data>
@@ -936,10 +933,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Закрыть панель</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>Влево</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>Вправо</value>
-  </data>
 </root>

src/cascadia/TerminalApp/Resources/zh-CN/Resources.resw

@@ -189,9 +189,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>关闭</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>移动选项卡</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>关闭右侧标签页</value>
   </data>
@@ -936,10 +933,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>关闭窗格</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>左移</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>右移</value>
-  </data>
 </root>

src/cascadia/TerminalApp/Resources/zh-TW/Resources.resw

@@ -189,9 +189,6 @@
   <data name="TabCloseSubMenu" xml:space="preserve">
     <value>關閉</value>
   </data>
-  <data name="TabMoveSubMenu" xml:space="preserve">
-    <value>移動索引標籤</value>
-  </data>
   <data name="TabCloseAfter" xml:space="preserve">
     <value>關閉右側的索引標籤</value>
   </data>
@@ -936,10 +933,4 @@
   <data name="CloseSnippetsPaneButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>關閉窗格</value>
   </data>
-  <data name="TabMoveLeft" xml:space="preserve">
-    <value>左移</value>
-  </data>
-  <data name="TabMoveRight" xml:space="preserve">
-    <value>右移</value>
-  </data>
 </root>

src/cascadia/TerminalApp/SettingsLoadEventArgs.h

@@ -12,14 +12,14 @@ namespace winrt::TerminalApp::implementation
         WINRT_PROPERTY(bool, Reload, false);
         WINRT_PROPERTY(uint64_t, Result, S_OK);
         WINRT_PROPERTY(winrt::hstring, ExceptionText, L"");
-        WINRT_PROPERTY(winrt::Windows::Foundation::Collections::IVectorView<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings>, Warnings, nullptr);
+        WINRT_PROPERTY(winrt::Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings>, Warnings, nullptr);
         WINRT_PROPERTY(Microsoft::Terminal::Settings::Model::CascadiaSettings, NewSettings, nullptr);
 
     public:
         SettingsLoadEventArgs(bool reload,
                               uint64_t result,
                               winrt::hstring exceptionText,
-                              winrt::Windows::Foundation::Collections::IVectorView<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings> warnings,
+                              winrt::Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings> warnings,
                               Microsoft::Terminal::Settings::Model::CascadiaSettings newSettings) :
             _Reload{ reload },
             _Result{ result },

src/cascadia/TerminalApp/SuggestionsControl.xaml

@@ -230,7 +230,6 @@
                               VerticalScrollMode="Enabled"
                               Visibility="Visible">
                     <TextBlock x:Name="_descriptionComment"
-                               Margin="0,0,20,0"
                                IsTextSelectionEnabled="True"
                                TextWrapping="WrapWholeWords" />
                 </ScrollViewer>

src/cascadia/TerminalApp/TabBase.cpp

@@ -7,7 +7,6 @@
 #include "TabBase.g.cpp"
 #include "Utils.h"
 #include "ColorHelper.h"
-#include "../inc/WindowingBehavior.h"
 
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
@@ -57,72 +56,10 @@ namespace winrt::TerminalApp::implementation
                 tab->RequestFocusActiveControl.raise();
             }
         });
-        _AppendMoveMenuItems(contextMenuFlyout);
         _AppendCloseMenuItems(contextMenuFlyout);
         TabViewItem().ContextFlyout(contextMenuFlyout);
     }
 
-    void TabBase::_AppendMoveMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout)
-    {
-        auto weakThis{ get_weak() };
-
-        // Move to new window
-        {
-            Controls::FontIcon moveTabToNewWindowTabSymbol;
-            moveTabToNewWindowTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
-            moveTabToNewWindowTabSymbol.Glyph(L"\xE8A7");
-
-            _moveToNewWindowMenuItem.Click([weakThis](auto&&, auto&&) {
-                if (auto tab{ weakThis.get() })
-                {
-                    MoveTabArgs args{ winrt::to_hstring(NewWindow), MoveTabDirection::Forward };
-                    ActionAndArgs actionAndArgs{ ShortcutAction::MoveTab, args };
-                    tab->_dispatch.DoAction(*tab, actionAndArgs);
-                }
-            });
-            _moveToNewWindowMenuItem.Text(RS_(L"MoveTabToNewWindowText"));
-            _moveToNewWindowMenuItem.Icon(moveTabToNewWindowTabSymbol);
-
-            const auto moveTabToNewWindowToolTip = RS_(L"MoveTabToNewWindowToolTip");
-            WUX::Controls::ToolTipService::SetToolTip(_moveToNewWindowMenuItem, box_value(moveTabToNewWindowToolTip));
-            Automation::AutomationProperties::SetHelpText(_moveToNewWindowMenuItem, moveTabToNewWindowToolTip);
-        }
-
-        // Move left
-        {
-            _moveLeftMenuItem.Click([weakThis](auto&&, auto&&) {
-                if (auto tab{ weakThis.get() })
-                {
-                    MoveTabArgs args{ hstring{}, MoveTabDirection::Backward };
-                    ActionAndArgs actionAndArgs{ ShortcutAction::MoveTab, args };
-                    tab->_dispatch.DoAction(*tab, actionAndArgs);
-                }
-            });
-            _moveLeftMenuItem.Text(RS_(L"TabMoveLeft"));
-        }
-
-        // Move right
-        {
-            _moveRightMenuItem.Click([weakThis](auto&&, auto&&) {
-                if (auto tab{ weakThis.get() })
-                {
-                    MoveTabArgs args{ hstring{}, MoveTabDirection::Forward };
-                    ActionAndArgs actionAndArgs{ ShortcutAction::MoveTab, args };
-                    tab->_dispatch.DoAction(*tab, actionAndArgs);
-                }
-            });
-            _moveRightMenuItem.Text(RS_(L"TabMoveRight"));
-        }
-
-        // Create a sub-menu for our extended move tab items.
-        Controls::MenuFlyoutSubItem moveSubMenu;
-        moveSubMenu.Text(RS_(L"TabMoveSubMenu"));
-        moveSubMenu.Items().Append(_moveToNewWindowMenuItem);
-        moveSubMenu.Items().Append(_moveRightMenuItem);
-        moveSubMenu.Items().Append(_moveLeftMenuItem);
-        flyout.Items().Append(moveSubMenu);
-    }
-
     // Method Description:
     // - Append the close menu items to the context menu flyout
     // Arguments:
@@ -138,9 +75,7 @@ namespace winrt::TerminalApp::implementation
         _closeTabsAfterMenuItem.Click([weakThis](auto&&, auto&&) {
             if (auto tab{ weakThis.get() })
             {
-                CloseTabsAfterArgs args{ tab->_TabViewIndex };
-                ActionAndArgs closeTabsAfter{ ShortcutAction::CloseTabsAfter, args };
-                tab->_dispatch.DoAction(*tab, closeTabsAfter);
+                tab->_CloseTabsAfter();
             }
         });
         _closeTabsAfterMenuItem.Text(RS_(L"TabCloseAfter"));
@@ -153,9 +88,7 @@ namespace winrt::TerminalApp::implementation
         _closeOtherTabsMenuItem.Click([weakThis](auto&&, auto&&) {
             if (auto tab{ weakThis.get() })
             {
-                CloseOtherTabsArgs args{ tab->_TabViewIndex };
-                ActionAndArgs closeOtherTabs{ ShortcutAction::CloseOtherTabs, args };
-                tab->_dispatch.DoAction(*tab, closeOtherTabs);
+                tab->_CloseOtherTabs();
             }
         });
         _closeOtherTabsMenuItem.Text(RS_(L"TabCloseOther"));
@@ -196,27 +129,33 @@ namespace winrt::TerminalApp::implementation
     }
 
     // Method Description:
-    // - Enable menu items based on tab index and total number of tabs
+    // - Enable the Close menu items based on tab index and total number of tabs
     // Arguments:
     // - <none>
     // Return Value:
     // - <none>
-    void TabBase::_EnableMenuItems()
+    void TabBase::_EnableCloseMenuItems()
     {
-        const auto tabIndex = TabViewIndex();
-        const auto numOfTabs = TabViewNumTabs();
+        // close other tabs is enabled only if there are other tabs
+        _closeOtherTabsMenuItem.IsEnabled(TabViewNumTabs() > 1);
+        // close tabs after is enabled only if there are other tabs on the right
+        _closeTabsAfterMenuItem.IsEnabled(TabViewIndex() < TabViewNumTabs() - 1);
+    }
 
-        // enabled if there are other tabs
-        _closeOtherTabsMenuItem.IsEnabled(numOfTabs > 1);
+    void TabBase::_CloseTabsAfter()
+    {
+        CloseTabsAfterArgs args{ _TabViewIndex };
+        ActionAndArgs closeTabsAfter{ ShortcutAction::CloseTabsAfter, args };
 
-        // enabled if there are other tabs on the right
-        _closeTabsAfterMenuItem.IsEnabled(tabIndex < numOfTabs - 1);
+        _dispatch.DoAction(closeTabsAfter);
+    }
 
-        // enabled if not left-most tab
-        _moveLeftMenuItem.IsEnabled(tabIndex > 0);
+    void TabBase::_CloseOtherTabs()
+    {
+        CloseOtherTabsArgs args{ _TabViewIndex };
+        ActionAndArgs closeOtherTabs{ ShortcutAction::CloseOtherTabs, args };
 
-        // enabled if not last tab
-        _moveRightMenuItem.IsEnabled(tabIndex < numOfTabs - 1);
+        _dispatch.DoAction(closeOtherTabs);
     }
 
     void TabBase::UpdateTabViewIndex(const uint32_t idx, const uint32_t numTabs)
@@ -225,7 +164,7 @@ namespace winrt::TerminalApp::implementation
 
         TabViewIndex(idx);
         TabViewNumTabs(numTabs);
-        _EnableMenuItems();
+        _EnableCloseMenuItems();
         _UpdateSwitchToTabKeyChord();
     }
 

src/cascadia/TerminalApp/TabBase.h

@@ -54,9 +54,6 @@ namespace winrt::TerminalApp::implementation
         winrt::Windows::UI::Xaml::FocusState _focusState{ winrt::Windows::UI::Xaml::FocusState::Unfocused };
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeOtherTabsMenuItem{};
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _closeTabsAfterMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveToNewWindowMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveRightMenuItem{};
-        winrt::Windows::UI::Xaml::Controls::MenuFlyoutItem _moveLeftMenuItem{};
         winrt::TerminalApp::ShortcutActionDispatch _dispatch;
         Microsoft::Terminal::Settings::Model::IActionMapView _actionMap{ nullptr };
         winrt::hstring _keyChord{};
@@ -72,9 +69,10 @@ namespace winrt::TerminalApp::implementation
 
         virtual void _MakeTabViewItem();
 
-        void _AppendMoveMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout);
         winrt::Windows::UI::Xaml::Controls::MenuFlyoutSubItem _AppendCloseMenuItems(winrt::Windows::UI::Xaml::Controls::MenuFlyout flyout);
-        void _EnableMenuItems();
+        void _EnableCloseMenuItems();
+        void _CloseTabsAfter();
+        void _CloseOtherTabs();
         void _UpdateSwitchToTabKeyChord();
         void _UpdateToolTip();
 

src/cascadia/TerminalApp/TabManagement.cpp

@@ -158,7 +158,10 @@ namespace winrt::TerminalApp::implementation
         // Set this tab's icon to the icon from the content
         _UpdateTabIcon(*newTabImpl);
 
-        tabViewItem.PointerReleased({ this, &TerminalPage::_OnTabClick });
+        tabViewItem.PointerPressed({ this, &TerminalPage::_OnTabPointerPressed });
+        tabViewItem.PointerReleased({ this, &TerminalPage::_OnTabPointerReleased });
+        tabViewItem.PointerExited({ this, &TerminalPage::_OnTabPointerExited });
+        tabViewItem.PointerEntered({ this, &TerminalPage::_OnTabPointerEntered });
 
         // When the tab requests close, try to close it (prompt for approval, if required)
         newTabImpl->CloseRequested([weakTab, weakThis{ get_weak() }](auto&& /*s*/, auto&& /*e*/) {
@@ -875,19 +878,66 @@ namespace winrt::TerminalApp::implementation
     // Arguments:
     // - sender: the control that originated this event (TabViewItem)
     // - eventArgs: the event's constituent arguments
-    void TerminalPage::_OnTabClick(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
+    void TerminalPage::_OnTabPointerPressed(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
     {
-        if (eventArgs.GetCurrentPoint(*this).Properties().IsMiddleButtonPressed())
+        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
         {
-            const auto tabViewItem = sender.try_as<MUX::Controls::TabViewItem>();
-            if (auto tab{ _GetTabByTabViewItem(tabViewItem) })
+            if (const auto tabViewItem{ sender.try_as<MUX::Controls::TabViewItem>() })
             {
-                _HandleCloseTabRequested(tab);
+                _tabPointerMiddleButtonPressed = tabViewItem.CapturePointer(eventArgs.Pointer());
+                _tabPointerMiddleButtonExited = false;
             }
             eventArgs.Handled(true);
         }
-        else if (eventArgs.GetCurrentPoint(*this).Properties().IsRightButtonPressed())
+    }
+
+    // Method Description:
+    // - Tracking pointer state for tab remove
+    // Arguments:
+    // - sender: the control that originated this event (TabViewItem)
+    // - eventArgs: the event's constituent arguments
+    void TerminalPage::_OnTabPointerReleased(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
+    {
+        if (_tabPointerMiddleButtonPressed && !eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
         {
+            _tabPointerMiddleButtonPressed = false;
+            if (const auto tabViewItem{ sender.try_as<MUX::Controls::TabViewItem>() })
+            {
+                tabViewItem.ReleasePointerCapture(eventArgs.Pointer());
+                auto tab = _GetTabByTabViewItem(tabViewItem);
+                if (!_tabPointerMiddleButtonExited && tab)
+                {
+                    _HandleCloseTabRequested(tab);
+                }
+            }
+            eventArgs.Handled(true);
+        }
+    }
+
+    // Method Description:
+    // - Tracking pointer state for tab remove
+    // Arguments:
+    // - sender: the control that originated this event (TabViewItem)
+    // - eventArgs: the event's constituent arguments
+    void TerminalPage::_OnTabPointerEntered(const IInspectable& /*sender*/, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
+    {
+        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
+        {
+            _tabPointerMiddleButtonExited = false;
+            eventArgs.Handled(true);
+        }
+    }
+
+    // Method Description:
+    // - Tracking pointer state for tab remove
+    // Arguments:
+    // - sender: the control that originated this event (TabViewItem)
+    // - eventArgs: the event's constituent arguments
+    void TerminalPage::_OnTabPointerExited(const IInspectable& /*sender*/, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs)
+    {
+        if (eventArgs.GetCurrentPoint(nullptr).Properties().IsMiddleButtonPressed())
+        {
+            _tabPointerMiddleButtonExited = true;
             eventArgs.Handled(true);
         }
     }

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -239,14 +239,6 @@ namespace winrt::TerminalApp::implementation
         _newTabButton.Click([weakThis{ get_weak() }](auto&&, auto&&) {
             if (auto page{ weakThis.get() })
             {
-                TraceLoggingWrite(
-                    g_hTerminalAppProvider,
-                    "NewTabMenuDefaultButtonClicked",
-                    TraceLoggingDescription("Event emitted when the default button from the new tab split button is invoked"),
-                    TraceLoggingValue(page->NumberOfTabs(), "TabCount", "The count of tabs currently opened in this window"),
-                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-
                 page->_OpenNewTerminalViaDropdown(NewTerminalArgs());
             }
         });
@@ -888,36 +880,14 @@ namespace winrt::TerminalApp::implementation
         // Since the previous focus location might be discarded in the background,
         // e.g., the command palette will be dismissed by the menu,
         // and then closing the fly-out will move the focus to wrong location.
-        newTabFlyout.Opening([weakThis{ get_weak() }](auto&&, auto&&) {
-            if (auto page{ weakThis.get() })
-            {
-                page->_FocusCurrentTab(true);
-
-                TraceLoggingWrite(
-                    g_hTerminalAppProvider,
-                    "NewTabMenuOpened",
-                    TraceLoggingDescription("Event emitted when the new tab menu is opened"),
-                    TraceLoggingValue(page->NumberOfTabs(), "TabCount", "The Count of tabs currently opened in this window"),
-                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-            }
+        newTabFlyout.Opening([this](auto&&, auto&&) {
+            _FocusCurrentTab(true);
         });
         // Necessary for fly-out sub items to get focus on a tab before collapsing. Related to #15049
-        newTabFlyout.Closing([weakThis{ get_weak() }](auto&&, auto&&) {
-            if (auto page{ weakThis.get() })
+        newTabFlyout.Closing([this](auto&&, auto&&) {
+            if (!_commandPaletteIs(Visibility::Visible))
             {
-                if (!page->_commandPaletteIs(Visibility::Visible))
-                {
-                    page->_FocusCurrentTab(true);
-                }
-
-                TraceLoggingWrite(
-                    g_hTerminalAppProvider,
-                    "NewTabMenuClosed",
-                    TraceLoggingDescription("Event emitted when the new tab menu is closed"),
-                    TraceLoggingValue(page->NumberOfTabs(), "TabCount", "The Count of tabs currently opened in this window"),
-                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
+                _FocusCurrentTab(true);
             }
         });
         _newTabButton.Flyout(newTabFlyout);
@@ -1122,15 +1092,6 @@ namespace winrt::TerminalApp::implementation
         profileMenuItem.Click([profileIndex, weakThis{ get_weak() }](auto&&, auto&&) {
             if (auto page{ weakThis.get() })
             {
-                TraceLoggingWrite(
-                    g_hTerminalAppProvider,
-                    "NewTabMenuItemClicked",
-                    TraceLoggingDescription("Event emitted when an item from the new tab menu is invoked"),
-                    TraceLoggingValue(page->NumberOfTabs(), "TabCount", "The count of tabs currently opened in this window"),
-                    TraceLoggingValue("Profile", "ItemType", "The type of item that was clicked in the new tab menu"),
-                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-
                 NewTerminalArgs newTerminalArgs{ profileIndex };
                 page->_OpenNewTerminalViaDropdown(newTerminalArgs);
             }
@@ -1176,15 +1137,6 @@ namespace winrt::TerminalApp::implementation
         actionMenuItem.Click([action, weakThis{ get_weak() }](auto&&, auto&&) {
             if (auto page{ weakThis.get() })
             {
-                TraceLoggingWrite(
-                    g_hTerminalAppProvider,
-                    "NewTabMenuItemClicked",
-                    TraceLoggingDescription("Event emitted when an item from the new tab menu is invoked"),
-                    TraceLoggingValue(page->NumberOfTabs(), "TabCount", "The count of tabs currently opened in this window"),
-                    TraceLoggingValue("Action", "ItemType", "The type of item that was clicked in the new tab menu"),
-                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-
                 page->_actionDispatch->DoAction(action.ActionAndArgs());
             }
         });
@@ -1246,7 +1198,6 @@ namespace winrt::TerminalApp::implementation
 
         const auto dispatchToElevatedWindow = ctrlPressed && !IsRunningElevated();
 
-        auto sessionType = "";
         if ((shiftPressed || dispatchToElevatedWindow) && !debugTap)
         {
             // Manually fill in the evaluated profile.
@@ -1264,12 +1215,10 @@ namespace winrt::TerminalApp::implementation
             if (dispatchToElevatedWindow)
             {
                 _OpenElevatedWT(newTerminalArgs);
-                sessionType = "ElevatedWindow";
             }
             else
             {
                 _OpenNewWindow(newTerminalArgs);
-                sessionType = "Window";
             }
         }
         else
@@ -1288,23 +1237,12 @@ namespace winrt::TerminalApp::implementation
                                  SplitDirection::Automatic,
                                  0.5f,
                                  newPane);
-                sessionType = "Pane";
             }
             else
             {
                 _CreateNewTabFromPane(newPane);
-                sessionType = "Tab";
             }
         }
-
-        TraceLoggingWrite(
-            g_hTerminalAppProvider,
-            "NewTabMenuCreatedNewTerminalSession",
-            TraceLoggingDescription("Event emitted when a new terminal was created via the new tab menu"),
-            TraceLoggingValue(NumberOfTabs(), "NewTabCount", "The count of tabs currently opened in this window"),
-            TraceLoggingValue(sessionType, "SessionType", "The type of session that was created"),
-            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
     }
 
     std::wstring TerminalPage::_evaluatePathForCwd(const std::wstring_view path)
@@ -1511,30 +1449,6 @@ namespace winrt::TerminalApp::implementation
         {
             target = SettingsTarget::DefaultsFile;
         }
-
-        const auto targetAsString = [&target]() {
-            switch (target)
-            {
-            case SettingsTarget::SettingsFile:
-                return "SettingsFile";
-            case SettingsTarget::DefaultsFile:
-                return "DefaultsFile";
-            case SettingsTarget::SettingsUI:
-            default:
-                return "UI";
-            }
-        }();
-
-        TraceLoggingWrite(
-            g_hTerminalAppProvider,
-            "NewTabMenuItemClicked",
-            TraceLoggingDescription("Event emitted when an item from the new tab menu is invoked"),
-            TraceLoggingValue(NumberOfTabs(), "TabCount", "The count of tabs currently opened in this window"),
-            TraceLoggingValue("Settings", "ItemType", "The type of item that was clicked in the new tab menu"),
-            TraceLoggingValue(targetAsString, "SettingsTarget", "The target settings file or UI"),
-            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-
         _LaunchSettings(target);
     }
 
@@ -1546,15 +1460,6 @@ namespace winrt::TerminalApp::implementation
         auto p = LoadCommandPalette();
         p.EnableCommandPaletteMode(CommandPaletteLaunchMode::Action);
         p.Visibility(Visibility::Visible);
-
-        TraceLoggingWrite(
-            g_hTerminalAppProvider,
-            "NewTabMenuItemClicked",
-            TraceLoggingDescription("Event emitted when an item from the new tab menu is invoked"),
-            TraceLoggingValue(NumberOfTabs(), "TabCount", "The count of tabs currently opened in this window"),
-            TraceLoggingValue("CommandPalette", "ItemType", "The type of item that was clicked in the new tab menu"),
-            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
     }
 
     // Method Description:
@@ -1567,15 +1472,6 @@ namespace winrt::TerminalApp::implementation
                                            const RoutedEventArgs&)
     {
         _ShowAboutDialog();
-
-        TraceLoggingWrite(
-            g_hTerminalAppProvider,
-            "NewTabMenuItemClicked",
-            TraceLoggingDescription("Event emitted when an item from the new tab menu is invoked"),
-            TraceLoggingValue(NumberOfTabs(), "TabCount", "The count of tabs currently opened in this window"),
-            TraceLoggingValue("About", "ItemType", "The type of item that was clicked in the new tab menu"),
-            TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-            TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
     }
 
     // Method Description:
@@ -1847,6 +1743,8 @@ namespace winrt::TerminalApp::implementation
 
         term.SearchMissingCommand({ get_weak(), &TerminalPage::_SearchMissingCommandHandler });
 
+        term.WindowSizeChanged({ get_weak(), &TerminalPage::_WindowSizeChanged });
+
         // Don't even register for the event if the feature is compiled off.
         if constexpr (Feature_ShellCompletions::IsEnabled())
         {
@@ -2425,7 +2323,7 @@ namespace winrt::TerminalApp::implementation
     // for it. The Title change will be propagated upwards through the tab's
     // PropertyChanged event handler.
     void TerminalPage::_activePaneChanged(winrt::TerminalApp::TerminalTab sender,
-                                          Windows::Foundation::IInspectable /*args*/)
+                                          Windows::Foundation::IInspectable args)
     {
         if (const auto tab{ _GetTerminalTabImpl(sender) })
         {
@@ -3194,6 +3092,31 @@ namespace winrt::TerminalApp::implementation
         term.RefreshQuickFixMenu();
     }
 
+    void TerminalPage::_WindowSizeChanged(const IInspectable sender, const Microsoft::Terminal::Control::WindowSizeChangedEventArgs args)
+    {
+        // Raise if:
+        // - Not in quake mode
+        // - Not in fullscreen
+        // - Only one tab exists
+        // - Only one pane exists
+        // else:
+        // - Reset conpty to its original size back
+        if (!WindowProperties().IsQuakeWindow() && !Fullscreen() &&
+            NumberOfTabs() == 1 && _GetFocusedTabImpl()->GetLeafPaneCount() == 1)
+        {
+            WindowSizeChanged.raise(*this, args);
+        }
+        else if (const auto& control{ sender.try_as<TermControl>() })
+        {
+            const auto& connection = control.Connection();
+
+            if (const auto& conpty{ connection.try_as<TerminalConnection::ConptyConnection>() })
+            {
+                conpty.ResetSize();
+            }
+        }
+    }
+
     // Method Description:
     // - Paste text from the Windows Clipboard to the focused terminal
     void TerminalPage::_PasteText()
@@ -4201,13 +4124,6 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
-        sui.ShowLoadWarningsDialog([weakThis{ get_weak() }](auto&& /*s*/, const Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Terminal::Settings::Model::SettingsLoadWarnings>& warnings) {
-            if (auto page{ weakThis.get() })
-            {
-                page->ShowLoadWarningsDialog.raise(*page, warnings);
-            }
-        });
-
         return *settingsContent;
     }
 
@@ -5412,8 +5328,8 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    safe_void_coroutine TerminalPage::_onTabDroppedOutside(winrt::IInspectable /*sender*/,
-                                                           winrt::MUX::Controls::TabViewTabDroppedOutsideEventArgs /*e*/)
+    safe_void_coroutine TerminalPage::_onTabDroppedOutside(winrt::IInspectable sender,
+                                                           winrt::MUX::Controls::TabViewTabDroppedOutsideEventArgs e)
     {
         // Get the current pointer point from the CoreWindow
         const auto& pointerPoint{ CoreWindow::GetForCurrentThread().PointerPosition() };
@@ -5485,14 +5401,6 @@ namespace winrt::TerminalApp::implementation
         runAsAdminItem.Click([profileIndex, weakThis{ get_weak() }](auto&&, auto&&) {
             if (auto page{ weakThis.get() })
             {
-                TraceLoggingWrite(
-                    g_hTerminalAppProvider,
-                    "NewTabMenuItemElevateSubmenuItemClicked",
-                    TraceLoggingDescription("Event emitted when the elevate submenu item from the new tab menu is invoked"),
-                    TraceLoggingValue(page->NumberOfTabs(), "TabCount", "The count of tabs currently opened in this window"),
-                    TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
-                    TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
-
                 NewTerminalArgs args{ profileIndex };
                 args.Elevate(true);
                 page->_OpenNewTerminalViaDropdown(args);

src/cascadia/TerminalApp/TerminalPage.h

@@ -195,11 +195,12 @@ namespace winrt::TerminalApp::implementation
         til::typed_event<IInspectable, IInspectable> IdentifyWindowsRequested;
         til::typed_event<IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs> RenameWindowRequested;
         til::typed_event<IInspectable, IInspectable> SummonWindowRequested;
+        til::typed_event<IInspectable, winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs> WindowSizeChanged;
 
+        til::typed_event<IInspectable, IInspectable> CloseRequested;
         til::typed_event<IInspectable, IInspectable> OpenSystemMenu;
         til::typed_event<IInspectable, IInspectable> QuitRequested;
         til::typed_event<IInspectable, winrt::Microsoft::Terminal::Control::ShowWindowArgs> ShowWindowChanged;
-        til::typed_event<Windows::Foundation::IInspectable, Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Terminal::Settings::Model::SettingsLoadWarnings>> ShowLoadWarningsDialog;
 
         til::typed_event<Windows::Foundation::IInspectable, winrt::TerminalApp::RequestMoveContentArgs> RequestMoveContent;
         til::typed_event<Windows::Foundation::IInspectable, winrt::TerminalApp::RequestReceiveContentArgs> RequestReceiveContent;
@@ -442,7 +443,13 @@ namespace winrt::TerminalApp::implementation
         void _TabDragStarted(const IInspectable& sender, const IInspectable& eventArgs);
         void _TabDragCompleted(const IInspectable& sender, const IInspectable& eventArgs);
 
-        void _OnTabClick(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
+        bool _tabPointerMiddleButtonPressed{ false };
+        bool _tabPointerMiddleButtonExited{ false };
+        void _OnTabPointerPressed(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
+        void _OnTabPointerReleased(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
+        void _OnTabPointerEntered(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
+        void _OnTabPointerExited(const IInspectable& sender, const Windows::UI::Xaml::Input::PointerRoutedEventArgs& eventArgs);
+
         void _OnTabSelectionChanged(const IInspectable& sender, const Windows::UI::Xaml::Controls::SelectionChangedEventArgs& eventArgs);
         void _OnTabItemsChanged(const IInspectable& sender, const Windows::Foundation::Collections::IVectorChangedEventArgs& eventArgs);
         void _OnTabCloseRequested(const IInspectable& sender, const Microsoft::UI::Xaml::Controls::TabViewTabCloseRequestedEventArgs& eventArgs);
@@ -541,6 +548,7 @@ namespace winrt::TerminalApp::implementation
         Windows::Foundation::IAsyncAction _SearchMissingCommandHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::SearchMissingCommandEventArgs args);
         Windows::Foundation::IAsyncOperation<Windows::Foundation::Collections::IVectorView<winrt::Microsoft::Management::Deployment::MatchResult>> _FindPackageAsync(hstring query);
 
+        void _WindowSizeChanged(const IInspectable sender, const winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs args);
         safe_void_coroutine _windowPropertyChanged(const IInspectable& sender, const winrt::Windows::UI::Xaml::Data::PropertyChangedEventArgs& args);
 
         void _onTabDragStarting(const winrt::Microsoft::UI::Xaml::Controls::TabView& sender, const winrt::Microsoft::UI::Xaml::Controls::TabViewTabDragStartingEventArgs& e);

src/cascadia/TerminalApp/TerminalPage.idl

@@ -100,10 +100,11 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, Object> IdentifyWindowsRequested;
         event Windows.Foundation.TypedEventHandler<Object, RenameWindowRequestedArgs> RenameWindowRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> SummonWindowRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Control.WindowSizeChangedEventArgs> WindowSizeChanged;
 
+        event Windows.Foundation.TypedEventHandler<Object, Object> CloseRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> OpenSystemMenu;
         event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Control.ShowWindowArgs> ShowWindowChanged;
-        event Windows.Foundation.TypedEventHandler<Object, Windows.Foundation.Collections.IVectorView<Microsoft.Terminal.Settings.Model.SettingsLoadWarnings> > ShowLoadWarningsDialog;
 
         event Windows.Foundation.TypedEventHandler<Object, RequestMoveContentArgs> RequestMoveContent;
         event Windows.Foundation.TypedEventHandler<Object, RequestReceiveContentArgs> RequestReceiveContent;

src/cascadia/TerminalApp/TerminalPaneContent.cpp

@@ -95,7 +95,7 @@ namespace winrt::TerminalApp::implementation
         NewTerminalArgs args{};
         const auto& controlSettings = _control.Settings();
 
-        args.Profile(::Microsoft::Console::Utils::GuidToString(_profile.Guid()));
+        args.Profile(controlSettings.ProfileName());
         // If we know the user's working directory use it instead of the profile.
         if (const auto dir = _control.WorkingDirectory(); !dir.empty())
         {
@@ -339,12 +339,8 @@ namespace winrt::TerminalApp::implementation
         RestartTerminalRequested.raise(*this, nullptr);
     }
 
-    void TerminalPaneContent::UpdateSettings(const CascadiaSettings& settings)
+    void TerminalPaneContent::UpdateSettings(const CascadiaSettings& /*settings*/)
     {
-        // Reload our profile from the settings model to propagate bell mode, icon, and close on exit mode (anything that uses _profile).
-        const auto profile{ settings.FindProfile(_profile.Guid()) };
-        _profile = profile ? profile : settings.ProfileDefaults();
-
         if (const auto& settings{ _cache.TryLookup(_profile) })
         {
             _control.UpdateControlSettings(settings.DefaultSettings(), settings.UnfocusedSettings());

src/cascadia/TerminalApp/TerminalTab.cpp

@@ -10,6 +10,7 @@
 #include "Utils.h"
 #include "ColorHelper.h"
 #include "AppLogic.h"
+#include "../inc/WindowingBehavior.h"
 
 using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
@@ -1442,6 +1443,23 @@ namespace winrt::TerminalApp::implementation
             Automation::AutomationProperties::SetHelpText(splitTabMenuItem, splitTabToolTip);
         }
 
+        Controls::MenuFlyoutItem moveTabToNewWindowMenuItem;
+        {
+            // "Move tab to new window"
+            Controls::FontIcon moveTabToNewWindowTabSymbol;
+            moveTabToNewWindowTabSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
+            moveTabToNewWindowTabSymbol.Glyph(L"\xE8A7");
+
+            moveTabToNewWindowMenuItem.Click({ get_weak(), &TerminalTab::_moveTabToNewWindowClicked });
+            moveTabToNewWindowMenuItem.Text(RS_(L"MoveTabToNewWindowText"));
+            moveTabToNewWindowMenuItem.Icon(moveTabToNewWindowTabSymbol);
+
+            const auto moveTabToNewWindowToolTip = RS_(L"MoveTabToNewWindowToolTip");
+
+            WUX::Controls::ToolTipService::SetToolTip(moveTabToNewWindowMenuItem, box_value(moveTabToNewWindowToolTip));
+            Automation::AutomationProperties::SetHelpText(moveTabToNewWindowMenuItem, moveTabToNewWindowToolTip);
+        }
+
         Controls::MenuFlyoutItem closePaneMenuItem = _closePaneMenuItem;
         {
             // "Close pane"
@@ -1517,15 +1535,12 @@ namespace winrt::TerminalApp::implementation
         contextMenuFlyout.Items().Append(renameTabMenuItem);
         contextMenuFlyout.Items().Append(duplicateTabMenuItem);
         contextMenuFlyout.Items().Append(splitTabMenuItem);
-        _AppendMoveMenuItems(contextMenuFlyout);
+        contextMenuFlyout.Items().Append(moveTabToNewWindowMenuItem);
         contextMenuFlyout.Items().Append(exportTabMenuItem);
         contextMenuFlyout.Items().Append(findMenuItem);
         contextMenuFlyout.Items().Append(restartConnectionMenuItem);
         contextMenuFlyout.Items().Append(menuSeparator);
 
-        auto closeSubMenu = _AppendCloseMenuItems(contextMenuFlyout);
-        closeSubMenu.Items().Append(closePaneMenuItem);
-
         // GH#5750 - When the context menu is dismissed with ESC, toss the focus
         // back to our control.
         contextMenuFlyout.Closed([weakThis](auto&&, auto&&) {
@@ -1545,6 +1560,8 @@ namespace winrt::TerminalApp::implementation
                 }
             }
         });
+        auto closeSubMenu = _AppendCloseMenuItems(contextMenuFlyout);
+        closeSubMenu.Items().Append(closePaneMenuItem);
 
         TabViewItem().ContextFlyout(contextMenuFlyout);
     }
@@ -1984,6 +2001,13 @@ namespace winrt::TerminalApp::implementation
         actionAndArgs.Action(ShortcutAction::ExportBuffer);
         _dispatch.DoAction(*this, actionAndArgs);
     }
+    void TerminalTab::_moveTabToNewWindowClicked(const winrt::Windows::Foundation::IInspectable& /* sender */,
+                                                 const winrt::Windows::UI::Xaml::RoutedEventArgs& /* args */)
+    {
+        MoveTabArgs args{ winrt::to_hstring(NewWindow), MoveTabDirection::Forward };
+        ActionAndArgs actionAndArgs{ ShortcutAction::MoveTab, args };
+        _dispatch.DoAction(*this, actionAndArgs);
+    }
     void TerminalTab::_findClicked(const winrt::Windows::Foundation::IInspectable& /* sender */,
                                    const winrt::Windows::UI::Xaml::RoutedEventArgs& /* args */)
     {

src/cascadia/TerminalApp/TerminalTab.h

@@ -196,6 +196,7 @@ namespace winrt::TerminalApp::implementation
         void _splitTabClicked(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
         void _closePaneClicked(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
         void _exportTextClicked(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
+        void _moveTabToNewWindowClicked(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
         void _findClicked(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& e);
 
         void _bubbleRestartTerminalRequested(TerminalApp::TerminalPaneContent sender, const winrt::Windows::Foundation::IInspectable& args);

src/cascadia/TerminalApp/TerminalWindow.cpp

@@ -15,6 +15,7 @@
 
 using namespace winrt::Windows::ApplicationModel;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
+using namespace winrt::Windows::Graphics::Display;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Core;
@@ -217,7 +218,7 @@ namespace winrt::TerminalApp::implementation
         _root->SetSettings(_settings, false); // We're on our UI thread right now, so this is safe
         _root->Loaded({ get_weak(), &TerminalWindow::_OnLoaded });
         _root->Initialized({ get_weak(), &TerminalWindow::_pageInitialized });
-        _root->ShowLoadWarningsDialog({ get_weak(), &TerminalWindow::_ShowLoadWarningsDialog });
+        _root->WindowSizeChanged({ get_weak(), &TerminalWindow::_WindowSizeChanged });
         _root->Create();
 
         AppLogic::Current()->SettingsChanged({ get_weak(), &TerminalWindow::UpdateSettingsHandler });
@@ -442,7 +443,7 @@ namespace winrt::TerminalApp::implementation
     //   validating the settings.
     // - Only one dialog can be visible at a time. If another dialog is visible
     //   when this is called, nothing happens. See ShowDialog for details
-    void TerminalWindow::_ShowLoadWarningsDialog(const IInspectable&, const Windows::Foundation::Collections::IVectorView<SettingsLoadWarnings>& warnings)
+    void TerminalWindow::_ShowLoadWarningsDialog(const Windows::Foundation::Collections::IVector<SettingsLoadWarnings>& warnings)
     {
         auto title = RS_(L"SettingsValidateErrorTitle");
         auto buttonText = RS_(L"Ok");
@@ -502,7 +503,7 @@ namespace winrt::TerminalApp::implementation
         }
         else if (settingsLoadedResult == S_FALSE)
         {
-            _ShowLoadWarningsDialog(nullptr, _initialLoadResult.Warnings());
+            _ShowLoadWarningsDialog(_initialLoadResult.Warnings());
         }
     }
 
@@ -803,7 +804,7 @@ namespace winrt::TerminalApp::implementation
             }
             else if (args.Result() == S_FALSE)
             {
-                _ShowLoadWarningsDialog(nullptr, args.Warnings());
+                _ShowLoadWarningsDialog(args.Warnings());
             }
             else if (args.Result() == S_OK)
             {
@@ -1332,6 +1333,41 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
+    void TerminalWindow::_WindowSizeChanged(const IInspectable&, winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs args)
+    {
+        winrt::Windows::Foundation::Size pixelSize = { static_cast<float>(args.Width()), static_cast<float>(args.Height()) };
+        const auto scale = static_cast<float>(DisplayInformation::GetForCurrentView().RawPixelsPerViewPixel());
+
+        if (!FocusMode())
+        {
+            if (!_settings.GlobalSettings().AlwaysShowTabs())
+            {
+                // Hide the title bar = off, Always show tabs = off.
+                static constexpr auto titlebarHeight = 10;
+                pixelSize.Height += (titlebarHeight)*scale;
+            }
+            else if (!_settings.GlobalSettings().ShowTabsInTitlebar())
+            {
+                // Hide the title bar = off, Always show tabs = on.
+                static constexpr auto titlebarAndTabBarHeight = 40;
+                pixelSize.Height += (titlebarAndTabBarHeight)*scale;
+            }
+            // Hide the title bar = on, Always show tabs = on.
+            // In this case, we don't add any height because
+            // NonClientIslandWindow::GetTotalNonClientExclusiveSize() gets
+            // called in AppHost::_resizeWindow and it already takes title bar
+            // height into account.  In other cases above
+            // IslandWindow::GetTotalNonClientExclusiveSize() is called, and it
+            // doesn't take the title bar height into account, so we have to do
+            // the calculation manually.
+        }
+
+        args.Width(static_cast<int32_t>(pixelSize.Width));
+        args.Height(static_cast<int32_t>(pixelSize.Height));
+
+        WindowSizeChanged.raise(*this, args);
+    }
+
     winrt::hstring WindowProperties::WindowName() const noexcept
     {
         return _WindowName;

src/cascadia/TerminalApp/TerminalWindow.h

@@ -162,6 +162,7 @@ namespace winrt::TerminalApp::implementation
         til::typed_event<Windows::Foundation::IInspectable, Windows::Foundation::IInspectable> IsQuakeWindowChanged;
         til::typed_event<winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::SystemMenuChangeArgs> SystemMenuChangeRequested;
         til::typed_event<winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::SettingsLoadEventArgs> SettingsChanged;
+        til::typed_event<winrt::Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs> WindowSizeChanged;
 
     private:
         // If you add controls here, but forget to null them either here or in
@@ -194,7 +195,7 @@ namespace winrt::TerminalApp::implementation
                                    const winrt::hstring& contentKey,
                                    HRESULT settingsLoadedResult,
                                    const winrt::hstring& exceptionText);
-        void _ShowLoadWarningsDialog(const IInspectable& sender, const Windows::Foundation::Collections::IVectorView<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings>& warnings);
+        void _ShowLoadWarningsDialog(const Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::SettingsLoadWarnings>& warnings);
 
         bool _IsKeyboardServiceEnabled();
 
@@ -202,6 +203,7 @@ namespace winrt::TerminalApp::implementation
         void _OnLoaded(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
         void _pageInitialized(const IInspectable& sender, const IInspectable& eventArgs);
         void _OpenSettingsUI();
+        void _WindowSizeChanged(const IInspectable& sender, winrt::Microsoft::Terminal::Control::WindowSizeChangedEventArgs args);
 
         winrt::Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::ActionAndArgs> _contentStringToActions(const winrt::hstring& content,
                                                                                                                                       const bool replaceFirstWithNewTab);
@@ -223,6 +225,7 @@ namespace winrt::TerminalApp::implementation
         FORWARDED_TYPED_EVENT(IdentifyWindowsRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, IdentifyWindowsRequested);
         FORWARDED_TYPED_EVENT(RenameWindowRequested, Windows::Foundation::IInspectable, winrt::TerminalApp::RenameWindowRequestedArgs, _root, RenameWindowRequested);
         FORWARDED_TYPED_EVENT(SummonWindowRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, SummonWindowRequested);
+        FORWARDED_TYPED_EVENT(CloseRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, CloseRequested);
         FORWARDED_TYPED_EVENT(OpenSystemMenu, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, OpenSystemMenu);
         FORWARDED_TYPED_EVENT(QuitRequested, Windows::Foundation::IInspectable, Windows::Foundation::IInspectable, _root, QuitRequested);
         FORWARDED_TYPED_EVENT(ShowWindowChanged, Windows::Foundation::IInspectable, winrt::Microsoft::Terminal::Control::ShowWindowArgs, _root, ShowWindowChanged);

src/cascadia/TerminalApp/TerminalWindow.idl

@@ -30,7 +30,7 @@ namespace TerminalApp
     {
         Boolean Reload { get; };
         UInt64 Result { get; };
-        IVectorView<Microsoft.Terminal.Settings.Model.SettingsLoadWarnings> Warnings { get; };
+        IVector<Microsoft.Terminal.Settings.Model.SettingsLoadWarnings> Warnings { get; };
         String ExceptionText { get; };
 
         Microsoft.Terminal.Settings.Model.CascadiaSettings NewSettings { get; };
@@ -127,10 +127,12 @@ namespace TerminalApp
         event Windows.Foundation.TypedEventHandler<Object, RenameWindowRequestedArgs> RenameWindowRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> IsQuakeWindowChanged;
         event Windows.Foundation.TypedEventHandler<Object, Object> SummonWindowRequested;
+        event Windows.Foundation.TypedEventHandler<Object, Object> CloseRequested;
         event Windows.Foundation.TypedEventHandler<Object, Object> OpenSystemMenu;
         event Windows.Foundation.TypedEventHandler<Object, Object> QuitRequested;
         event Windows.Foundation.TypedEventHandler<Object, TerminalApp.SystemMenuChangeArgs> SystemMenuChangeRequested;
         event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Control.ShowWindowArgs> ShowWindowChanged;
+        event Windows.Foundation.TypedEventHandler<Object, Microsoft.Terminal.Control.WindowSizeChangedEventArgs> WindowSizeChanged;
 
         event Windows.Foundation.TypedEventHandler<Object, SettingsLoadEventArgs> SettingsChanged;
 

src/cascadia/TerminalApp/dll/TerminalApp.vcxproj

@@ -11,7 +11,6 @@
     <!-- sets a bunch of Windows Universal properties -->
     <OpenConsoleUniversalApp>true</OpenConsoleUniversalApp>
     <PgoTarget>true</PgoTarget>
-    <VersionInfoFileDescription>Windows Terminal Main UI Library</VersionInfoFileDescription>
   </PropertyGroup>
   <PropertyGroup Label="NuGet Dependencies">
     <TerminalCppWinrt>true</TerminalCppWinrt>

src/cascadia/TerminalApp/pch.h

@@ -27,7 +27,6 @@
 
 #include <winrt/Windows.ApplicationModel.h>
 #include <winrt/Windows.ApplicationModel.DataTransfer.h>
-#include <winrt/Windows.ApplicationModel.Resources.Core.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
 #include <winrt/Windows.Foundation.Metadata.h>

src/cascadia/TerminalAzBridge/TerminalAzBridge.vcxproj

@@ -11,7 +11,6 @@
     <OpenConsoleUniversalApp>false</OpenConsoleUniversalApp>
     <ApplicationType>Windows Store</ApplicationType>
     <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
-    <VersionInfoFileDescription>Windows Terminal Azure Cloud Shell Connector</VersionInfoFileDescription>
   </PropertyGroup>
 
   <PropertyGroup Label="NuGet Dependencies">

src/cascadia/TerminalConnection/CTerminalHandoff.cpp

@@ -14,13 +14,6 @@ static DWORD g_cTerminalHandoffRegistration = 0;
 // Mutex so we only do start/stop/establish one at a time.
 static std::shared_mutex _mtx;
 
-// This is the callback that will be called when a connection is received.
-// Call this once during startup and don't ever change it again (race condition).
-void CTerminalHandoff::s_setCallback(NewHandoffFunction callback) noexcept
-{
-    _pfnHandoff = callback;
-}
-
 // Routine Description:
 // - Starts listening for TerminalHandoff requests by registering
 //   our class and interface with COM.
@@ -28,19 +21,24 @@ void CTerminalHandoff::s_setCallback(NewHandoffFunction callback) noexcept
 // - pfnHandoff - Function to callback when a handoff is received
 // Return Value:
 // - S_OK, E_NOT_VALID_STATE (start called when already started) or relevant COM registration error.
-HRESULT CTerminalHandoff::s_StartListening()
+HRESULT CTerminalHandoff::s_StartListening(NewHandoffFunction pfnHandoff)
 try
 {
     std::unique_lock lock{ _mtx };
 
+    RETURN_HR_IF(E_NOT_VALID_STATE, _pfnHandoff != nullptr);
+
     const auto classFactory = Make<SimpleClassFactory<CTerminalHandoff>>();
-    RETURN_LAST_ERROR_IF_NULL(classFactory);
+
+    RETURN_IF_NULL_ALLOC(classFactory);
 
     ComPtr<IUnknown> unk;
     RETURN_IF_FAILED(classFactory.As(&unk));
 
     RETURN_IF_FAILED(CoRegisterClassObject(__uuidof(CTerminalHandoff), unk.Get(), CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &g_cTerminalHandoffRegistration));
 
+    _pfnHandoff = pfnHandoff;
+
     return S_OK;
 }
 CATCH_RETURN()
@@ -55,6 +53,15 @@ CATCH_RETURN()
 HRESULT CTerminalHandoff::s_StopListening()
 {
     std::unique_lock lock{ _mtx };
+    return s_StopListeningLocked();
+}
+
+// See s_StopListening()
+HRESULT CTerminalHandoff::s_StopListeningLocked()
+{
+    RETURN_HR_IF_NULL(E_NOT_VALID_STATE, _pfnHandoff);
+
+    _pfnHandoff = nullptr;
 
     if (g_cTerminalHandoffRegistration)
     {
@@ -85,15 +92,22 @@ HRESULT CTerminalHandoff::EstablishPtyHandoff(HANDLE* in, HANDLE* out, HANDLE si
 {
     try
     {
+        std::unique_lock lock{ _mtx };
+
+        // s_StopListeningLocked sets _pfnHandoff to nullptr.
+        // localPfnHandoff is tested for nullness below.
+#pragma warning(suppress : 26429) // Symbol '...' is never tested for nullness, it can be marked as not_null (f.23).
+        auto localPfnHandoff = _pfnHandoff;
+
         // Because we are REGCLS_SINGLEUSE... we need to `CoRevokeClassObject` after we handle this ONE call.
         // COM does not automatically clean that up for us. We must do it.
-        LOG_IF_FAILED(s_StopListening());
+        LOG_IF_FAILED(s_StopListeningLocked());
 
         // Report an error if no one registered a handoff function before calling this.
-        THROW_HR_IF_NULL(E_NOT_VALID_STATE, _pfnHandoff);
+        THROW_HR_IF_NULL(E_NOT_VALID_STATE, localPfnHandoff);
 
         // Call registered handler from when we started listening.
-        THROW_IF_FAILED(_pfnHandoff(in, out, signal, reference, server, client, startupInfo));
+        THROW_IF_FAILED(localPfnHandoff(in, out, signal, reference, server, client, startupInfo));
 
 #pragma warning(suppress : 26477)
         TraceLoggingWrite(

src/cascadia/TerminalConnection/CTerminalHandoff.h

@@ -38,11 +38,11 @@ struct __declspec(uuid(__CLSID_CTerminalHandoff))
 
 #pragma endregion
 
-    static void s_setCallback(NewHandoffFunction callback) noexcept;
-    static HRESULT s_StartListening();
+    static HRESULT s_StartListening(NewHandoffFunction pfnHandoff);
+    static HRESULT s_StopListening();
 
 private:
-    static HRESULT s_StopListening();
+    static HRESULT s_StopListeningLocked();
 };
 
 // Disable warnings from the CoCreatableClass macro as the value it provides for

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -313,13 +313,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         }
         CATCH_LOG()
 
-        try
-        {
-            auto processImageName{ wil::QueryFullProcessImageNameW<std::wstring>(_piClient.hProcess) };
-            _clientName = std::filesystem::path{ std::move(processImageName) }.filename().wstring();
-        }
-        CATCH_LOG()
-
         _pipe = std::move(pipe.server);
         *in = pipe.client.release();
         *out = pipeClientClone.release();
@@ -435,20 +428,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
             TerminalOutput.raise(L"\r\n");
             TerminalOutput.raise(badPathText);
         }
-        // If the requested action requires elevation, display appropriate message
-        else if (hr == HRESULT_FROM_WIN32(ERROR_ELEVATION_REQUIRED))
-        {
-            const auto elevationText = RS_(L"ElevationRequired");
-            TerminalOutput.raise(L"\r\n");
-            TerminalOutput.raise(elevationText);
-        }
-        // If the requested executable was not found, display appropriate message
-        else if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
-        {
-            const auto fileNotFoundText = RS_(L"FileNotFound");
-            TerminalOutput.raise(L"\r\n");
-            TerminalOutput.raise(fileNotFoundText);
-        }
 
         _transitionToState(ConnectionState::Failed);
 
@@ -555,13 +534,21 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         }
     }
 
-    void ConptyConnection::ClearBuffer(bool keepCursorRow)
+    void ConptyConnection::ResetSize()
+    {
+        if (_isConnected())
+        {
+            THROW_IF_FAILED(ConptyResizePseudoConsole(_hPC.get(), { Utils::ClampToShortMax(_cols, 1), Utils::ClampToShortMax(_rows, 1) }));
+        }
+    }
+
+    void ConptyConnection::ClearBuffer()
     {
         // If we haven't connected yet, then we really don't need to do
         // anything. The connection should already start clear!
         if (_isConnected())
         {
-            THROW_IF_FAILED(ConptyClearPseudoConsole(_hPC.get(), keepCursorRow));
+            THROW_IF_FAILED(ConptyClearPseudoConsole(_hPC.get()));
         }
     }
 
@@ -793,12 +780,12 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
     void ConptyConnection::StartInboundListener()
     {
-        static const auto init = []() noexcept {
-            CTerminalHandoff::s_setCallback(&ConptyConnection::NewHandoff);
-            return true;
-        }();
+        THROW_IF_FAILED(CTerminalHandoff::s_StartListening(&ConptyConnection::NewHandoff));
+    }
 
-        CTerminalHandoff::s_StartListening();
+    void ConptyConnection::StopInboundListener()
+    {
+        THROW_IF_FAILED(CTerminalHandoff::s_StopListening());
     }
 
     // Function Description:

src/cascadia/TerminalConnection/ConptyConnection.h

@@ -23,8 +23,9 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         void Start();
         void WriteInput(const winrt::array_view<const char16_t> buffer);
         void Resize(uint32_t rows, uint32_t columns);
+        void ResetSize();
         void Close() noexcept;
-        void ClearBuffer(bool keepCursorRow);
+        void ClearBuffer();
 
         void ShowHide(const bool show);
 
@@ -35,6 +36,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         WORD ShowWindow() const noexcept;
 
         static void StartInboundListener();
+        static void StopInboundListener();
 
         static winrt::event_token NewConnection(const NewConnectionHandler& handler);
         static void NewConnection(const winrt::event_token& token);

src/cascadia/TerminalConnection/ConptyConnection.idl

@@ -14,7 +14,8 @@ namespace Microsoft.Terminal.TerminalConnection
         String StartingTitle { get; };
         UInt16 ShowWindow { get; };
 
-        void ClearBuffer(Boolean keepCursorRow);
+        void ResetSize();
+        void ClearBuffer();
 
         void ShowHide(Boolean show);
 
@@ -22,6 +23,7 @@ namespace Microsoft.Terminal.TerminalConnection
 
         static event NewConnectionHandler NewConnection;
         static void StartInboundListener();
+        static void StopInboundListener();
 
         static Windows.Foundation.Collections.ValueSet CreateSettings(String cmdline,
                                                                       String startingDirectory,

src/cascadia/TerminalConnection/Resources/de-DE/Resources.resw

@@ -209,7 +209,7 @@
   </data>
   <data name="CtrlDToClose" xml:space="preserve">
     <value>Sie können dieses Terminal jetzt mit STRG+D schließen oder zum Neustart die EINGABETASTE drücken.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
   </data>
   <data name="ProcessFailedToLaunch" xml:space="preserve">
     <value>[Fehler {0} beim Start von `{1}']</value>
@@ -220,10 +220,4 @@
     <value>Auf das Startverzeichnis „{0}“ konnte nicht zugegriffen werden</value>
     <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
   </data>
-  <data name="ElevationRequired" xml:space="preserve">
-    <value>Für den angeforderten Vorgang sind erhöhte Rechte erforderlich.</value>
-  </data>
-  <data name="FileNotFound" xml:space="preserve">
-    <value>Die angegebene Datei wurde nicht gefunden.</value>
-  </data>
 </root>

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

@@ -209,7 +209,7 @@
   </data>
   <data name="CtrlDToClose" xml:space="preserve">
     <value>You can now close this terminal with Ctrl+D, or press Enter to restart.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
   </data>
   <data name="ProcessFailedToLaunch" xml:space="preserve">
     <value>[error {0} when launching `{1}']</value>
@@ -220,10 +220,4 @@
     <value>Could not access starting directory "{0}"</value>
     <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
   </data>
-  <data name="ElevationRequired" xml:space="preserve">
-    <value>The requested operation requires elevation.</value>
-  </data>
-  <data name="FileNotFound" xml:space="preserve">
-    <value>The system cannot find the file specified.</value>
-  </data>
-</root>
+</root>

src/cascadia/TerminalConnection/Resources/es-ES/Resources.resw

@@ -209,7 +209,7 @@
   </data>
   <data name="CtrlDToClose" xml:space="preserve">
     <value>Ahora puede cerrar este terminal con Ctrl+D o presionar Entrar para reiniciar.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
   </data>
   <data name="ProcessFailedToLaunch" xml:space="preserve">
     <value>[error {0} al iniciar `{1}']</value>
@@ -220,10 +220,4 @@
     <value>No se pudo obtener acceso al directorio inicial «{0}»</value>
     <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
   </data>
-  <data name="ElevationRequired" xml:space="preserve">
-    <value>La operación solicitada requiere elevación.</value>
-  </data>
-  <data name="FileNotFound" xml:space="preserve">
-    <value>El sistema no puede encontrar el archivo especificado.</value>
-  </data>
 </root>

src/cascadia/TerminalConnection/Resources/fr-FR/Resources.resw

@@ -209,7 +209,7 @@
   </data>
   <data name="CtrlDToClose" xml:space="preserve">
     <value>Vous pouvez maintenant fermer ce terminal avec Ctrl+D, ou appuyez sur Entrée pour redémarrer.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
   </data>
   <data name="ProcessFailedToLaunch" xml:space="preserve">
     <value>[erreur {0} lors du lancement de `{1}']</value>
@@ -220,10 +220,4 @@
     <value>Le démarrage du répertoire n’est pas accessible «{0}»</value>
     <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
   </data>
-  <data name="ElevationRequired" xml:space="preserve">
-    <value>L’opération demandée nécessite une élévation.</value>
-  </data>
-  <data name="FileNotFound" xml:space="preserve">
-    <value>Le fichier spécifié est introuvable.</value>
-  </data>
 </root>

src/cascadia/TerminalConnection/Resources/it-IT/Resources.resw

@@ -209,7 +209,7 @@
   </data>
   <data name="CtrlDToClose" xml:space="preserve">
     <value>È ora possibile chiudere il terminale con CTRL+D oppure premere INVIO per riavviarlo.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
   </data>
   <data name="ProcessFailedToLaunch" xml:space="preserve">
     <value>[errore {0} durante l'avvio di `{1}']</value>
@@ -220,10 +220,4 @@
     <value>Non è possibile accedere alla directory di avvio "{0}"</value>
     <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
   </data>
-  <data name="ElevationRequired" xml:space="preserve">
-    <value>Per l'operazione richiesta è necessaria l'elevazione dei privilegi.</value>
-  </data>
-  <data name="FileNotFound" xml:space="preserve">
-    <value>Impossibile trovare il file specificato.</value>
-  </data>
 </root>