Simplify passing color tables

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

@@ -1,4 +1,3 @@
-aci
 admins
 allcolors
 Apc
@@ -9,13 +8,11 @@ breadcrumbs
 bsd
 calt
 ccmp
-ccon
 changelog
 clickable
 clig
 CMMI
 copyable
-Counterintuitively
 CtrlDToClose
 cybersecurity
 dalet
@@ -93,12 +90,10 @@ reserialize
 reserializes
 rlig
 runtimes
-servicebus
 shcha
 slnt
 Sos
 ssh
-sustainability
 stakeholders
 sxn
 timeline
@@ -120,7 +115,6 @@ vsdevcmd
 walkthrough
 walkthroughs
 We'd
-westus
 wildcards
 XBox
 YBox

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

@@ -28,7 +28,6 @@ CYICON
 Dacl
 dataobject
 dcomp
-debugbreak
 delayimp
 DERR
 dlldata
@@ -210,7 +209,6 @@ tlg
 TME
 tmp
 tmpdir
-tokeninfo
 tolower
 toupper
 TRACKMOUSEEVENT
@@ -221,19 +219,16 @@ UFIELD
 ULARGE
 UOI
 UPDATEINIFILE
-urlmon
 userenv
 USEROBJECTFLAGS
 Vcpp
 Viewbox
 virtualalloc
 vsnwprintf
-wcsnlen
 wcsstr
 wcstoui
 WDJ
 winhttp
-wininet
 winmain
 winsta
 winstamin

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

@@ -4,7 +4,6 @@ advapi
 altform
 altforms
 appendwttlogging
-appinstaller
 appx
 appxbundle
 appxerror
@@ -60,13 +59,12 @@ PRIINFO
 propkey
 pscustomobject
 QWORD
-rdpclip
 regedit
 resfiles
 robocopy
 SACLs
-sdkddkver
 segoe
+sdkddkver
 Shobjidl
 sid
 Skype

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

@@ -188,10 +188,8 @@ changelist
 chaof
 charinfo
 CHARSETINFO
-chcbpat
 chh
 chk
-chshdng
 CHT
 Cic
 cielab
@@ -303,7 +301,6 @@ coordnew
 COPYCOLOR
 CORESYSTEM
 cotaskmem
-countof
 CPG
 cpinfo
 CPINFOEX
@@ -752,6 +749,7 @@ gfx
 GGI
 GHIJK
 GHIJKL
+GHIJKLM
 gitfilters
 gitmodules
 gle
@@ -1002,6 +1000,7 @@ listptrsize
 lld
 llx
 LMENU
+LMNOP
 lnk
 lnkd
 lnkfile
@@ -1224,6 +1223,7 @@ nonspace
 NOOWNERZORDER
 Nop
 NOPAINT
+NOPQRST
 noprofile
 NOREDRAW
 NOREMOVE
@@ -1498,6 +1498,7 @@ pwsz
 pythonw
 Qaabbcc
 qos
+QRSTU
 QUERYOPEN
 QUESTIONMARK
 quickedit
@@ -1590,6 +1591,7 @@ RIGHTALIGN
 RIGHTBUTTON
 riid
 Rike
+RIPMSG
 RIS
 roadmap
 robomac
@@ -1775,7 +1777,6 @@ stdafx
 STDAPI
 stdc
 stdcpp
-STDEXT
 STDMETHODCALLTYPE
 STDMETHODIMP
 STGM
@@ -1860,6 +1861,7 @@ testname
 TESTNULL
 testpass
 testpasses
+testtimeout
 TEXCOORD
 texel
 TExpected
@@ -1906,7 +1908,6 @@ touchpad
 Tpp
 Tpqrst
 tprivapi
-tput
 tracelog
 tracelogging
 traceloggingprovider
@@ -2017,6 +2018,7 @@ utext
 UText
 UTEXT
 utr
+UVWX
 UVWXY
 UVWXYZ
 uwa
@@ -2075,6 +2077,7 @@ VTRGBTo
 vtseq
 vtterm
 vttest
+VWX
 waitable
 WANSUNG
 WANTARROWS
@@ -2270,7 +2273,6 @@ YCast
 YCENTER
 YCount
 YDPI
-YLimit
 YOffset
 YSubstantial
 YVIRTUALSCREEN

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

@@ -4,4 +4,3 @@ appshellintegration
 mdtauk
 gfycat
 Guake
-xkcd

OpenConsole.sln

@@ -239,6 +239,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{89CDCC
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Types.Unit.Tests", "src\types\ut_types\Types.Unit.Tests.vcxproj", "{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PublicTerminalCore", "src\cascadia\PublicTerminalCore\PublicTerminalCore.vcxproj", "{84848BFA-931D-42CE-9ADF-01EE54DE7890}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalControl", "src\cascadia\WpfTerminalControl\WpfTerminalControl.csproj", "{376FE273-6B84-4EB5-8B30-8DE9D21B022C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "src\cascadia\ut_app\TerminalApp.UnitTests.vcxproj", "{CA5CAD1A-9333-4D05-B12A-1905CBF112F9}"
@@ -332,7 +334,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fmt", "src\dep\fmt\fmt.vcxp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {84848BFA-931D-42CE-9ADF-01EE54DE7890}
 		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {A22EC5F6-7851-4B88-AC52-47249D437A52}
 	EndProjectSection
 EndProject
@@ -1709,6 +1711,34 @@ Global
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x64.Build.0 = Release|x64
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x86.ActiveCfg = Release|Win32
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73}.Release|x86.Build.0 = Release|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|ARM.ActiveCfg = AuditMode|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x64.Build.0 = AuditMode|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM.ActiveCfg = Debug|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|ARM64.Build.0 = Debug|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x64.ActiveCfg = Debug|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x64.Build.0 = Debug|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x86.ActiveCfg = Debug|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Debug|x86.Build.0 = Debug|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|ARM.ActiveCfg = Fuzzing|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|Any CPU.ActiveCfg = Release|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM.ActiveCfg = Release|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM64.ActiveCfg = Release|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|ARM64.Build.0 = Release|ARM64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x64.ActiveCfg = Release|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x64.Build.0 = Release|x64
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x86.ActiveCfg = Release|Win32
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890}.Release|x86.Build.0 = Release|Win32
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|Any CPU.ActiveCfg = Release|Any CPU
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|ARM.ActiveCfg = Debug|Any CPU
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C}.AuditMode|ARM.Build.0 = Debug|Any CPU
@@ -2864,6 +2894,7 @@ Global
 		{05500DEF-2294-41E3-AF9A-24E580B82836} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{1E4A062E-293B-4817-B20D-BF16B979E350} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
 		{34DE34D3-1CD6-4EE3-8BD9-A26B5B27EC73} = {89CDCC5C-9F53-4054-97A4-639D99F169CD}
+		{84848BFA-931D-42CE-9ADF-01EE54DE7890} = {4DAF0299-495E-4CD1-A982-9BAC16A45932}
 		{376FE273-6B84-4EB5-8B30-8DE9D21B022C} = {4DAF0299-495E-4CD1-A982-9BAC16A45932}
 		{CA5CAD1A-9333-4D05-B12A-1905CBF112F9} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {59840756-302F-44DF-AA47-441A9D673202}

README.md

@@ -1,4 +1,4 @@
-![terminal-logos](https://github.com/microsoft/terminal/assets/91625426/333ddc76-8ab2-4eb4-a8c0-4d7b953b1179)
+![terminal-logos](https://user-images.githubusercontent.com/48369326/115790869-4c852b00-a37c-11eb-97f1-f61972c7800c.png)
 
 # Welcome to the Windows Terminal, Console and Command-Line repo
 
@@ -73,7 +73,7 @@ winget install --id Microsoft.WindowsTerminal -e
 ```
 
 > **Note**\
-> Dependency support is available in WinGet version [1.6.2631 or later](https://github.com/microsoft/winget-cli/releases). To install the Terminal stable release 1.18 or later, please make sure you have the updated version of the WinGet client.
+> Due to [a dependency issue](https://github.com/microsoft/terminal/issues/15663), Terminal's current versions cannot be installed via the Windows Package Manager CLI. To install the stable release 1.17 or later, or the Preview release 1.18 or later, please use an alternative installation method.
 
 #### Via Chocolatey (unofficial)
 
@@ -118,31 +118,9 @@ repository.
 
 ---
 
-## Installing Windows Terminal Canary
-Windows Terminal Canary is a nightly build of Windows Terminal. This build has the latest code from our `main` branch, giving you an opportunity to try features before they make it to Windows Terminal Preview.
-
-Windows Terminal Canary is our least stable offering, so you may discover bugs before we have had a chance to find them.
-
-Windows Terminal Canary is available as an App Installer distribution and a Portable ZIP distribution.
-
-The App Installer distribution supports automatic updates. Due to platform limitations, this installer only works on Windows 11.
-
-The Portable ZIP distribution is a portable application. It will not automatically update and will not automatically check for updates. This portable ZIP distribution works on Windows 10 (19041+) and Windows 11.
-
-| Distribution  | Architecture    | Link                                                 |
-|---------------|:---------------:|------------------------------------------------------|
-| App Installer | x64, arm64, x86 | [download](https://aka.ms/terminal-canary-installer) |
-| Portable ZIP  | x64             | [download](https://aka.ms/terminal-canary-zip-x64)   |
-| Portable ZIP  | ARM64           | [download](https://aka.ms/terminal-canary-zip-arm64) |
-| Portable ZIP  | x86             | [download](https://aka.ms/terminal-canary-zip-x86)   |
-
-_Learn more about the [types of Windows Terminal distributions](https://learn.microsoft.com/windows/terminal/distributions)._
-
----
-
 ## Windows Terminal Roadmap
 
-The plan for the Windows Terminal [is described here](/doc/roadmap-2023.md) and
+The plan for the Windows Terminal [is described here](/doc/roadmap-2022.md) and
 will be updated as the project proceeds.
 
 ## Project Build Status

build/config/esrp.build.batch.wpf.json

@@ -1,7 +1,7 @@
 [
     {
         "MatchedPath": [
-            "Microsoft.Terminal.Control/Microsoft.Terminal.Control.dll"
+            "PublicTerminalCore.dll"
         ],
         "SigningInfo": {
             "Operations": [

build/config/template.appinstaller

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AppInstaller
-  xmlns="http://schemas.microsoft.com/appx/appinstaller/2017/2"
-  Version="1.0.0.0"
-  Uri="$$ROOT$$$$NAME$$.appinstaller">
-
-  <MainBundle
-    Name="$$NAME$$"
-    Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-    Version="$$VERSION$$"
-    Uri="$$ROOT$$$$PACKAGE$$" />
-
-  <Dependencies>
-    <Package
-      Name="Microsoft.UI.Xaml.2.8"
-      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
-      ProcessorArchitecture="x64"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.x64.appx" />
-    <Package
-      Name="Microsoft.UI.Xaml.2.8"
-      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
-      ProcessorArchitecture="x86"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.x86.appx" />
-    <Package
-      Name="Microsoft.UI.Xaml.2.8"
-      Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
-      Version="8.2305.5001.0"
-      ProcessorArchitecture="arm64"
-      Uri="https://github.com/microsoft/microsoft-ui-xaml/releases/download/v2.8.4/Microsoft.UI.Xaml.2.8.arm64.appx" />
-  </Dependencies>
-
-  <UpdateSettings>
-    <OnLaunch
-      HoursBetweenUpdateChecks="6" />
-  </UpdateSettings>
-</AppInstaller>

build/config/tsa.json

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

build/pipelines/nightly.yml

@@ -0,0 +1,23 @@
+trigger: none
+pr: none
+schedules:
+  - cron: "30 3 * * 2-6" # Run at 03:30 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
+    displayName: "Nightly Terminal Build"
+    branches:
+      include:
+        - main
+    always: false # only run if there's code changes!
+
+name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
+
+extends:
+  template: templates-v2\pipeline-full-release-build.yml
+  parameters:
+    branding: Canary
+    buildTerminal: true
+    pgoBuildMode: Optimize
+    codeSign: true
+    generateSbom: true
+    publishSymbolsToPublic: true
+    publishVpackToWindows: false
+    symbolExpiryTime: 15 # Nightly builds do not keep symbols for very long!

build/pipelines/ob-nightly.yml

@@ -1,53 +0,0 @@
-trigger: none
-pr: none
-schedules:
-  - cron: "30 3 * * 2-6" # Run at 03:30 UTC Tuesday through Saturday (After the work day in Pacific, Mon-Fri)
-    displayName: "Nightly Terminal Build"
-    branches:
-      include:
-        - main
-    always: false # only run if there's code changes!
-
-parameters:
-  - name: publishToAzure
-    displayName: "Deploy to **PUBLIC** Azure Storage"
-    type: boolean
-    default: true
-
-name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
-
-variables:
-  - template: templates-v2/variables-nuget-package-version.yml
-    parameters:
-      branding: Canary
-  - template: templates-v2/variables-onebranch-config.yml
-
-extends:
-  template: templates-v2/pipeline-onebranch-full-release-build.yml
-  parameters:
-    official: true
-    branding: Canary
-    buildTerminal: true
-    pgoBuildMode: Optimize
-    codeSign: true
-    publishSymbolsToPublic: true
-    publishVpackToWindows: false
-    symbolExpiryTime: 15
-    ${{ if eq(true, parameters.publishToAzure) }}:
-      extraPublishJobs:
-        - template: build/pipelines/templates-v2/job-deploy-to-azure-storage.yml@self
-          parameters:
-            pool: { type: windows }
-            variables:
-              ob_git_checkout: false # This job checks itself out
-              ob_git_skip_checkout_none: true
-              ob_outputDirectory: "$(Build.SourcesDirectory)/_none"
-            dependsOn: [PublishSymbols]
-            storagePublicRootURL: $(AppInstallerRootURL)
-            subscription: $(AzureSubscriptionName)
-            storageAccount: $(AzureStorageAccount)
-            storageContainer: $(AzureStorageContainer)
-            buildConfiguration: Release
-            buildPlatforms: [x64, x86, arm64]
-            environment: production-canary
-

build/pipelines/release.yml

@@ -44,6 +44,14 @@ parameters:
       - x64
       - x86
       - arm64
+  - name: codeSign
+    displayName: "Sign all build outputs"
+    type: boolean
+    default: true
+  - name: generateSbom
+    displayName: "Generate a Bill of Materials"
+    type: boolean
+    default: true
   - name: terminalInternalPackageVersion
     displayName: "Terminal Internal Package Version"
     type: string
@@ -60,16 +68,9 @@ parameters:
 
 name: $(BuildDefinitionName)_$(date:yyMM).$(date:dd)$(rev:rrr)
 
-variables:
-  - template: templates-v2/variables-nuget-package-version.yml
-    parameters:
-      branding: ${{ parameters.branding }}
-  - template: templates-v2/variables-onebranch-config.yml
-
 extends:
-  template: templates-v2/pipeline-onebranch-full-release-build.yml
+  template: templates-v2/pipeline-full-release-build.yml
   parameters:
-    official: true
     branding: ${{ parameters.branding }}
     buildTerminal: ${{ parameters.buildTerminal }}
     buildConPTY: ${{ parameters.buildConPTY }}
@@ -77,7 +78,8 @@ extends:
     pgoBuildMode: ${{ parameters.pgoBuildMode }}
     buildConfigurations: ${{ parameters.buildConfigurations }}
     buildPlatforms: ${{ parameters.buildPlatforms }}
-    codeSign: true
+    codeSign: ${{ parameters.codeSign }}
+    generateSbom: ${{ parameters.generateSbom }}
     terminalInternalPackageVersion: ${{ parameters.terminalInternalPackageVersion }}
     publishSymbolsToPublic: ${{ parameters.publishSymbolsToPublic }}
     publishVpackToWindows: ${{ parameters.publishVpackToWindows }}

build/pipelines/templates-v2/job-build-package-wpf.yml

@@ -97,7 +97,7 @@ jobs:
       flattenFolders: true
 
   - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
+    - task: EsrpCodeSigning@1
       displayName: Submit *.nupkg to ESRP for code signing
       inputs:
         ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a

build/pipelines/templates-v2/job-build-project.yml

@@ -62,9 +62,6 @@ parameters:
   - name: publishArtifacts
     type: boolean
     default: true
-  - name: removeAllNonSignedFiles
-    type: boolean
-    default: false
 
 jobs:
 - job: ${{ parameters.jobName }}
@@ -92,11 +89,6 @@ jobs:
     # Yup.
     BuildTargetParameter: ' '
     SelectedSigningFragments: ' '
-    # When building the unpackaged distribution, build it in portable mode if it's Canary-branded
-    ${{ if eq(parameters.branding, 'Canary') }}:
-      UnpackagedBuildArguments: -PortableMode
-    ${{ else }}:
-      UnpackagedBuildArguments: ' '
     JobOutputDirectory: $(Terminal.BinDir)
     JobOutputArtifactName: build-$(BuildPlatform)-$(BuildConfiguration)${{ parameters.artifactStem }}
     ${{ insert }}: ${{ parameters.variables }}
@@ -122,7 +114,7 @@ jobs:
           $SignFragments += "wpfdotnet"
         }
         If ([bool]::Parse("${{ parameters.buildWPF }}")) {
-          $BuildTargets += "Terminal\Control\Microsoft_Terminal_Control"
+          $BuildTargets += "Terminal\wpf\PublicTerminalCore"
           $SignFragments += "wpf"
         }
         If ([bool]::Parse("${{ parameters.buildConPTY }}")) {
@@ -176,7 +168,6 @@ jobs:
   # - Directories ending in Lib (static lib projects that we fully linked into DLLs which may also contain unnecessary resources)
   # - All LocalTests_ project outputs, as they were subsumed into TestHostApp
   # - All PDB files inside the WindowsTerminal/ output, which do not belong there.
-  # - console.dll, which apparently breaks XFGCheck? lol.
   - pwsh: |-
       $binDir = '$(Terminal.BinDir)'
       $ImportLibs = Get-ChildItem $binDir -Recurse -File -Filter '*.exp' | ForEach-Object { $_.FullName -Replace "exp$","lib" }
@@ -193,8 +184,6 @@ jobs:
         $Items += Get-ChildItem '$(Terminal.BinDir)' -Filter '*.pdb' -Recurse
       }
 
-      $Items += Get-ChildItem $binDir -Filter 'console.dll'
-
       $Items | Remove-Item -Recurse -Force -Verbose -ErrorAction:Ignore
     displayName: Clean up static libs and extra symbols
     errorActionPreference: silentlyContinue # It's OK if this silently fails
@@ -235,7 +224,7 @@ jobs:
 
     # Code-sign everything we just put together.
     # We run the signing in Terminal.BinDir, because all of the signing batches are relative to the final architecture/configuration output folder.
-    - task: EsrpCodeSigning@3
+    - task: EsrpCodeSigning@1
       displayName: Submit Signing Request
       inputs:
         ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
@@ -252,14 +241,6 @@ jobs:
           Write-Host "##vso[task.setvariable variable=WindowsTerminalPackagePath]${PackageFilename}"
         displayName: Re-pack the new Terminal package after signing
 
-    # Some of our governed pipelines explicitly fail builds that have *any* non-codesigned filed (!)
-    - ${{ if eq(parameters.removeAllNonSignedFiles, true) }}:
-      - pwsh: |-
-          Get-ChildItem "$(Terminal.BinDir)" -Recurse -Include "*.dll","*.exe" |
-            Where-Object { (Get-AuthenticodeSignature $_).Status -Ne "Valid" } |
-            Remove-Item -Verbose -Force
-        displayName: Remove all non-signed output files
-
   - ${{ else }}: # No Signing
     - ${{ if or(parameters.buildTerminal, parameters.buildEverything) }}:
       - pwsh: |-
@@ -274,7 +255,7 @@ jobs:
     - pwsh: |-
         $XamlAppxPath = (Get-Item "src\cascadia\CascadiaPackage\AppPackages\*\Dependencies\$(BuildPlatform)\Microsoft.UI.Xaml*.appx").FullName
         $outDir = New-Item -Type Directory "$(Terminal.BinDir)/_unpackaged" -ErrorAction:Ignore
-        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 $(UnpackagedBuildArguments) -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination $outDir.FullName
+        & .\build\scripts\New-UnpackagedTerminalDistribution.ps1 -TerminalAppX $(WindowsTerminalPackagePath) -XamlAppX $XamlAppxPath -Destination $outDir.FullName
       displayName: Build Unpackaged Distribution (from MSIX)
       condition: and(succeeded(), ne(variables.WindowsTerminalPackagePath, ''))
 

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

@@ -1,92 +0,0 @@
-parameters:
-  - name: buildConfiguration
-    type: string
-  - name: buildPlatforms
-    type: object
-  - name: pool
-    type: object
-    default: []
-  - name: dependsOn
-    type: object
-    default: null
-  - name: artifactStem
-    type: string
-    default: ''
-  - name: variables
-    type: object
-    default: {}
-  - name: environment
-    type: string
-  - name: storagePublicRootURL
-    type: string
-  - name: subscription
-    type: string
-  - name: storageAccount
-    type: string
-  - name: storageContainer
-    type: string
-
-jobs:
-- job: DeployAzure
-  ${{ if ne(length(parameters.pool), 0) }}:
-    pool: ${{ parameters.pool }}
-  displayName: Publish to Azure Storage (Prod)
-  dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - download: none
-
-  - checkout: self
-    clean: true
-    fetchDepth: 1
-    fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
-    submodules: true
-    persistCredentials: True
-
-  - task: DownloadPipelineArtifact@2
-    displayName: Download MSIX Bundle Artifact
-    inputs:
-      artifactName: appxbundle-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-      downloadPath: '$(Build.SourcesDirectory)/_out'
-      itemPattern: '**/*.msixbundle'
-
-  - ${{ each platform in parameters.buildPlatforms }}:
-    - task: DownloadPipelineArtifact@2
-      displayName: Download unpackaged build for ${{ platform }} ${{ parameters.buildConfiguration }}
-      inputs:
-        artifactName: build-${{ platform }}-${{ parameters.buildConfiguration }}${{ parameters.artifactStem }}
-        downloadPath: '$(Build.SourcesDirectory)/_unpackaged'
-        itemPattern: '**/_unpackaged/*.zip'
-
-  - pwsh: |-
-      $b = Get-Item _out/*.msixbundle
-      ./build/scripts/New-AppInstallerFromTemplateAndBundle.ps1 -BundlePath $b.FullName -AppInstallerTemplatePath ./build/config/template.appinstaller -AppInstallerRoot "${{ parameters.storagePublicRootURL }}" -OutputPath _out/Microsoft.WindowsTerminalCanary.appinstaller
-    displayName: "Produce AppInstaller for MSIX bundle"
-
-  - pwsh: |-
-      $zips = Get-ChildItem -Recurse -Filter *.zip _unpackaged
-      $zips | ForEach-Object {
-        $name = $_.Name
-        $parts = $name.Split('_')
-        $parts[1] = "latest"
-        $name = [String]::Join('_', $parts)
-        $_ | Move-Item -Destination (Join-Path "_out" $name)
-      }
-    displayName: "Wrangle Unpackaged builds into place, rename"
-
-  - 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@5
-    displayName: Publish to Storage Account
-    inputs:
-      sourcePath: _out/*
-      Destination: AzureBlob
-      azureSubscription: ${{ parameters.subscription }}
-      storage: ${{ parameters.storageAccount }}
-      ContainerName: ${{ parameters.storageContainer }}
-      AdditionalArgumentsForBlobCopy: "--content-type application/octet-stream"
-

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

@@ -29,9 +29,6 @@ parameters:
   - name: publishArtifacts
     type: boolean
     default: true
-  - name: afterBuildSteps
-    type: stepList
-    default: []
 
 jobs:
 - job: ${{ parameters.jobName }}
@@ -51,8 +48,6 @@ jobs:
       BundleStemName: Microsoft.WindowsTerminal
     ${{ elseif eq(parameters.branding, 'Preview') }}:
       BundleStemName: Microsoft.WindowsTerminalPreview
-    ${{ elseif eq(parameters.branding, 'Canary') }}:
-      BundleStemName: Microsoft.WindowsTerminalCanary
     ${{ else }}:
       BundleStemName: WindowsTerminalDev
     JobOutputDirectory: '$(System.ArtifactsDirectory)/bundle'
@@ -88,13 +83,11 @@ jobs:
       $Components[0] = ([int]$Components[0] + $VersionEpoch)
       $BundleVersion = $Components -Join "."
       New-Item -Type Directory "$(System.ArtifactsDirectory)/bundle"
-      $BundlePath = "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
-      .\build\scripts\Create-AppxBundle.ps1 -InputPath 'bin/' -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath $BundlePath
-      Write-Host "##vso[task.setvariable variable=MsixBundlePath]${BundlePath}"
+      .\build\scripts\Create-AppxBundle.ps1 -InputPath 'bin/' -ProjectName CascadiaPackage -BundleVersion $BundleVersion -OutputPath "$(System.ArtifactsDirectory)\bundle\$(BundleStemName)_$(XES_APPXMANIFESTVERSION)_8wekyb3d8bbwe.msixbundle"
     displayName: Create msixbundle
 
   - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
+    - task: EsrpCodeSigning@1
       displayName: Submit *.msixbundle to ESRP for code signing
       inputs:
         ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a
@@ -144,8 +137,6 @@ jobs:
         ValidateSignature: true
         Verbosity: 'Verbose'
 
-  - ${{ parameters.afterBuildSteps }}
-
   - ${{ if eq(parameters.publishArtifacts, true) }}:
     - publish: $(JobOutputDirectory)
       artifact: $(JobOutputArtifactName)

build/pipelines/templates-v2/job-package-conpty.yml

@@ -82,7 +82,7 @@ jobs:
       versionEnvVar: XES_PACKAGEVERSIONNUMBER
 
   - ${{ if eq(parameters.codeSign, true) }}:
-    - task: EsrpCodeSigning@3
+    - task: EsrpCodeSigning@1
       displayName: Submit *.nupkg to ESRP for code signing
       inputs:
         ConnectedServiceName: 9d6d2960-0793-4d59-943e-78dcb434840a

build/pipelines/templates-v2/job-publish-symbols.yml

@@ -17,12 +17,6 @@ parameters:
   - name: symbolExpiryTime
     type: string
     default: 36530 # This is the default from PublishSymbols@2
-  - name: variables
-    type: object
-    default: {}
-  - name: symbolPatGoesInTaskInputs
-    type: boolean
-    default: false
 
 jobs:
 - job: ${{ parameters.jobName }}
@@ -33,8 +27,6 @@ jobs:
   ${{ else }}:
     displayName: Publish Symbols Internally
   dependsOn: ${{ parameters.dependsOn }}
-  variables:
-    ${{ insert }}: ${{ parameters.variables }}
   steps:
   - checkout: self
     clean: true
@@ -84,8 +76,6 @@ jobs:
         SymbolsProduct: 'Windows Terminal Converged Symbols'
         SymbolsVersion: '$(XES_APPXMANIFESTVERSION)'
         SymbolExpirationInDays: ${{ parameters.symbolExpiryTime }}
-        ${{ if eq(parameters.symbolPatGoesInTaskInputs, true) }}:
-          Pat: $(ADO_microsoftpublicsymbols_PAT)
         # The ADO task does not support indexing of GitHub sources.
       # There is a bug which causes this task to fail if LIB includes an inaccessible path (even though it does not depend on it).
       # To work around this issue, we just force LIB to be any dir that we know exists.
@@ -93,5 +83,4 @@ jobs:
       env:
         LIB: $(Build.SourcesDirectory)
         ArtifactServices_Symbol_AccountName: microsoftpublicsymbols
-        ${{ if ne(parameters.symbolPatGoesInTaskInputs, true) }}:
-          ArtifactServices_Symbol_PAT: $(ADO_microsoftpublicsymbols_PAT)
+        ArtifactServices_Symbol_PAT: $(ADO_microsoftpublicsymbols_PAT)

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

@@ -51,9 +51,6 @@ parameters:
     type: boolean
     default: false
 
-  - name: extraPublishJobs
-    type: object
-    default: []
   - name: pool
     type: object
     default:
@@ -61,9 +58,28 @@ parameters:
       demands: ImageOverride -equals SHINE-VS17-Latest
 
 variables:
-  - template: variables-nuget-package-version.yml
-    parameters:
-      branding: ${{ parameters.branding }}
+  # If we are building a branch called "release-*", change the NuGet suffix
+  # to "preview". If we don't do that, XES will set the suffix to "release1"
+  # because it truncates the value after the first period.
+  # We also want to disable the suffix entirely if we're Release branded while
+  # on a release branch.
+  # main is special, however. XES ignores main. Since we never produce actual
+  # shipping builds from main, we want to force it to have a beta label as
+  # well.
+  #
+  # In effect:
+  # BRANCH / BRANDING | Release                    | Preview
+  # ------------------|----------------------------|-----------------------------
+  # release-*         | 1.12.20220427              | 1.13.20220427-preview
+  # main              | 1.14.20220427-experimental | 1.14.20220427-experimental
+  # all others        | 1.14.20220427-mybranch     | 1.14.20220427-mybranch
+  ${{ if startsWith(variables['Build.SourceBranchName'], 'release-') }}:
+    ${{ if eq(parameters.branding, 'Release') }}:
+      NoNuGetPackBetaVersion: true
+    ${{ else }}:
+      NuGetPackBetaVersion: preview
+  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
+    NuGetPackBetaVersion: experimental
 
 resources:
   repositories:
@@ -177,5 +193,4 @@ stages:
           includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
           symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
 
-      - ${{ parameters.extraPublishJobs }}
 ...

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

@@ -1,265 +0,0 @@
-parameters:
-  - name: official
-    type: boolean
-    default: false
-  - name: branding
-    type: string
-    default: Release
-    values:
-      - Release
-      - Preview
-      - Canary
-      - Dev
-  - name: buildTerminal
-    type: boolean
-    default: true
-  - name: buildConPTY
-    type: boolean
-    default: false
-  - name: buildWPF
-    type: boolean
-    default: false
-  - name: pgoBuildMode
-    type: string
-    default: Optimize
-    values:
-      - Optimize
-      - Instrument
-      - None
-  - name: buildConfigurations
-    type: object
-    default:
-      - Release
-  - name: buildPlatforms
-    type: object
-    default:
-      - x64
-      - x86
-      - arm64
-  - name: codeSign
-    type: boolean
-    default: true
-  - name: terminalInternalPackageVersion
-    type: string
-    default: '0.0.8'
-
-  - name: publishSymbolsToPublic
-    type: boolean
-    default: true
-  - name: symbolExpiryTime
-    type: string
-    default: 36530 # This is the default from PublishSymbols@2
-  - name: publishVpackToWindows
-    type: boolean
-    default: false
-
-  - name: extraPublishJobs
-    type: object
-    default: []
-
-resources:
-  repositories:
-  - repository: templates
-    type: git
-    name: OneBranch.Pipelines/GovernedTemplates
-    ref: refs/heads/main
-
-extends:
-  ${{ if eq(parameters.official, true) }}:
-    template: v2/Microsoft.Official.yml@templates # https://aka.ms/obpipelines/templates
-  ${{ else }}:
-    template: v2/Microsoft.NonOfficial.yml@templates
-  parameters:
-    featureFlags:
-      WindowsHostVersion: 1ESWindows2022
-    platform:
-      name: 'windows_undocked'
-      product: 'Windows Terminal'
-    cloudvault: # https://aka.ms/obpipelines/cloudvault
-      enabled: false
-    globalSdl: # https://aka.ms/obpipelines/sdl
-      tsa:
-        enabled: true
-        configFile: '$(Build.SourcesDirectory)\build\config\tsa.json'
-      binskim:
-        break: false
-        scanOutputDirectoryOnly: true
-      policheck:
-        break: false
-        severity: Note
-      baseline:
-        baselineFile: '$(Build.SourcesDirectory)\build\config\release.gdnbaselines'
-        suppressionSet: default
-
-    stages:
-      - stage: Build
-        displayName: Build
-        dependsOn: []
-        jobs:
-          - template: ./build/pipelines/templates-v2/job-build-project.yml@self
-            parameters:
-              pool: { type: windows }
-              variables:
-                ob_git_checkout: false # This job checks itself out
-                ob_git_skip_checkout_none: true
-                ob_outputDirectory: $(JobOutputDirectory)
-                ob_artifactBaseName: $(JobOutputArtifactName)
-              publishArtifacts: false # Handled by OneBranch
-              branding: ${{ parameters.branding }}
-              buildTerminal: ${{ parameters.buildTerminal }}
-              buildConPTY: ${{ parameters.buildConPTY }}
-              buildWPF: ${{ parameters.buildWPF }}
-              pgoBuildMode: ${{ parameters.pgoBuildMode }}
-              buildConfigurations: ${{ parameters.buildConfigurations }}
-              buildPlatforms: ${{ parameters.buildPlatforms }}
-              generateSbom: false # this is handled by onebranch
-              removeAllNonSignedFiles: true # appease the overlords
-              codeSign: ${{ parameters.codeSign }}
-              beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-                - task: PkgESSetupBuild@12
-                  displayName: Package ES - Setup Build
-                  inputs:
-                    disableOutputRedirect: true
-
-                - task: UniversalPackages@0
-                  displayName: Download terminal-internal Universal Package
-                  inputs:
-                    feedListDownload: 2b3f8893-a6e8-411f-b197-a9e05576da48
-                    packageListDownload: e82d490c-af86-4733-9dc4-07b772033204
-                    versionListDownload: ${{ parameters.terminalInternalPackageVersion }}
-
-                - template: ./build/pipelines/templates-v2/steps-fetch-and-prepare-localizations.yml@self
-                  parameters:
-                    includePseudoLoc: true
-
-          - ${{ if eq(parameters.buildWPF, true) }}:
-            # Add an Any CPU build flavor for the WPF control bits
-            - template: ./build/pipelines/templates-v2/job-build-project.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                jobName: BuildWPF
-                branding: ${{ parameters.branding }}
-                buildTerminal: false
-                buildWPFDotNetComponents: true
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms:
-                  - Any CPU
-                generateSbom: false # this is handled by onebranch
-                removeAllNonSignedFiles: true # appease the overlords
-                codeSign: ${{ parameters.codeSign }}
-                beforeBuildSteps:
-                  - task: PkgESSetupBuild@12
-                    displayName: Package ES - Setup Build
-                    inputs:
-                      disableOutputRedirect: true
-                  # WPF doesn't need the localizations or the universal package, but if it does... put them here.
-
-      - stage: Package
-        displayName: Package
-        dependsOn: [Build]
-        jobs:
-          - ${{ if eq(parameters.buildTerminal, true) }}:
-            - template: ./build/pipelines/templates-v2/job-merge-msix-into-bundle.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                  ### This job is also in charge of submitting the vpack to Windows if it's enabled
-                  ob_createvpack_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
-                  ob_updateOSManifest_enabled: ${{ and(parameters.buildTerminal, parameters.publishVpackToWindows) }}
-                  ### If enabled above, these options are in play.
-                  ob_createvpack_packagename: 'WindowsTerminal.app'
-                  ob_createvpack_owneralias: 'conhost@microsoft.com'
-                  ob_createvpack_description: 'VPack for the Windows Terminal Application'
-                  ob_createvpack_targetDestinationDirectory: '$(Destination)'
-                  ob_createvpack_propsFile: false
-                  ob_createvpack_provData: true
-                  ob_createvpack_metadata: '$(Build.SourceVersion)'
-                  ob_createvpack_topLevelRetries: 0
-                  ob_createvpack_failOnStdErr: true
-                  ob_createvpack_taskLogVerbosity: Detailed
-                  ob_createvpack_verbose: true
-                  ob_createvpack_vpackdirectory: '$(JobOutputDirectory)\vpack'
-                  ob_updateOSManifest_gitcheckinConfigPath: '$(Build.SourcesDirectory)\build\config\GitCheckin.json'
-                  # We're skipping the 'fetch' part of the OneBranch rules, but that doesn't mean
-                  # that it doesn't expect to have downloaded a manifest directly to some 'destination'
-                  # folder that it can then update and upload.
-                  # Effectively: it says "destination" but it means "source"
-                  # DH: Don't ask why.
-                  ob_updateOSManifest_destination: $(XES_VPACKMANIFESTDIRECTORY)
-                  ob_updateOSManifest_skipFetch: true
-                publishArtifacts: false # Handled by OneBranch
-                jobName: Bundle
-                branding: ${{ parameters.branding }}
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # Handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-                afterBuildSteps:
-                  # This directory has to exist, even if we aren't using createvpack, because the Guardian rules demand it.
-                  - pwsh: |-
-                      New-Item "$(JobOutputDirectory)/vpack" -Type Directory
-                    displayName: Make sure the vpack directory exists
-
-                  - ${{ if parameters.publishVpackToWindows }}:
-                    - pwsh: |-
-                        Copy-Item -Verbose -Path "$(MsixBundlePath)" -Destination (Join-Path "$(JobOutputDirectory)/vpack" 'Microsoft.WindowsTerminal_8wekyb3d8bbwe.msixbundle')
-                      displayName: Stage msixbundle for vpack
-
-          - ${{ if eq(parameters.buildConPTY, true) }}:
-            - template: ./build/pipelines/templates-v2/job-package-conpty.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # this is handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-
-          - ${{ if eq(parameters.buildWPF, true) }}:
-            - template: ./build/pipelines/templates-v2/job-build-package-wpf.yml@self
-              parameters:
-                pool: { type: windows }
-                variables:
-                  ob_git_checkout: false # This job checks itself out
-                  ob_git_skip_checkout_none: true
-                  ob_outputDirectory: $(JobOutputDirectory)
-                  ob_artifactBaseName: $(JobOutputArtifactName)
-                publishArtifacts: false # Handled by OneBranch
-                buildConfigurations: ${{ parameters.buildConfigurations }}
-                buildPlatforms: ${{ parameters.buildPlatforms }}
-                generateSbom: false # this is handled by onebranch
-                codeSign: ${{ parameters.codeSign }}
-
-      - stage: Publish
-        displayName: Publish
-        dependsOn: [Build, Package]
-        jobs:
-          - template: ./build/pipelines/templates-v2/job-publish-symbols.yml@self
-            parameters:
-              pool: { type: windows }
-              includePublicSymbolServer: ${{ parameters.publishSymbolsToPublic }}
-              symbolPatGoesInTaskInputs: true # onebranch tries to muck with the PAT variable, so we need to change how it get the PAT
-              symbolExpiryTime: ${{ parameters.symbolExpiryTime }}
-              variables:
-                ob_git_checkout: false # This job checks itself out
-                ob_git_skip_checkout_none: true
-                ob_outputDirectory: $(Build.ArtifactStagingDirectory)
-                # Without this, OneBranch will nerf our symbol tasks
-                ob_symbolsPublishing_enabled: true
-
-          - ${{ parameters.extraPublishJobs }}

build/pipelines/templates-v2/variables-nuget-package-version.yml

@@ -1,27 +0,0 @@
-parameters:
-  - name: branding
-    type: string
-
-variables:
-  # If we are building a branch called "release-*", change the NuGet suffix
-  # to "preview". If we don't do that, XES will set the suffix to "release1"
-  # because it truncates the value after the first period.
-  # We also want to disable the suffix entirely if we're Release branded while
-  # on a release branch.
-  # main is special, however. XES ignores main. Since we never produce actual
-  # shipping builds from main, we want to force it to have a beta label as
-  # well.
-  #
-  # In effect:
-  # BRANCH / BRANDING | Release                    | Preview
-  # ------------------|----------------------------|-----------------------------
-  # release-*         | 1.12.20220427              | 1.13.20220427-preview
-  # main              | 1.14.20220427-experimental | 1.14.20220427-experimental
-  # all others        | 1.14.20220427-mybranch     | 1.14.20220427-mybranch
-  ${{ if startsWith(variables['Build.SourceBranchName'], 'release-') }}:
-    ${{ if eq(parameters.branding, 'Release') }}:
-      NoNuGetPackBetaVersion: true
-    ${{ else }}:
-      NuGetPackBetaVersion: preview
-  ${{ elseif eq(variables['Build.SourceBranchName'], 'main') }}:
-    NuGetPackBetaVersion: experimental

build/pipelines/templates-v2/variables-onebranch-config.yml

@@ -1,2 +0,0 @@
-variables:
-  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'

build/scripts/New-AppInstallerFromTemplateAndBundle.ps1

@@ -1,42 +0,0 @@
-[CmdletBinding()]
-Param(
-    [Parameter(Mandatory,
-      HelpMessage="Path to the .msixbundle")]
-    [string]
-    $BundlePath,
-
-    [Parameter(Mandatory,
-      HelpMessage="Path to the .appinstaller template")]
-    [string]
-    $AppInstallerTemplatePath,
-
-    [string]
-    $AppInstallerRoot,
-
-    [Parameter(Mandatory,
-      HelpMessage="Output Path")]
-    [string]
-    $OutputPath
-)
-
-$ErrorActionPreference = "Stop"
-
-$sentinelFile = New-TemporaryFile
-$directory = New-Item -Type Directory "$($sentinelFile.FullName)_Package"
-Remove-Item $sentinelFile -Force -EA:Ignore
-
-$bundle = (Get-Item $BundlePath)
-& tar.exe -x -f $bundle.FullName -C $directory AppxMetadata/AppxBundleManifest.xml
-
-$xml = [xml](Get-Content (Join-Path $directory "AppxMetadata\AppxBundleManifest.xml"))
-$name = $xml.Bundle.Identity.Name
-$version = $xml.Bundle.Identity.Version
-
-$doc = (Get-Content -ReadCount 0 $AppInstallerTemplatePath)
-$doc = $doc -Replace '\$\$ROOT\$\$',$AppInstallerRoot
-$doc = $doc -Replace '\$\$NAME\$\$',$name
-$doc = $doc -Replace '\$\$VERSION\$\$',$version
-$doc = $doc -Replace '\$\$PACKAGE\$\$',$bundle.Name
-$doc | Out-File -Encoding utf8NoBOM $OutputPath
-
-Get-Item $OutputPath

build/scripts/New-UnpackagedTerminalDistribution.ps1

@@ -25,12 +25,7 @@ Param(
     [Parameter(HelpMessage="Path to makeappx.exe", ParameterSetName='Layout')]
     [ValidateScript({Test-Path $_ -Type Leaf})]
     [string]
-    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakeAppx.exe",
-
-    [Parameter(HelpMessage="Include the portable mode marker file by default", ParameterSetName='AppX')]
-    [Parameter(HelpMessage="Include the portable mode marker file by default", ParameterSetName='Layout')]
-    [switch]
-    $PortableMode = $PSCmdlet.ParameterSetName -eq 'Layout'
+    $MakeAppxPath = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64\MakeAppx.exe"
 )
 
 $filesToRemove = @("*.xml", "*.winmd", "Appx*", "Images/*Tile*", "Images/*Logo*") # Remove from Terminal
@@ -133,11 +128,6 @@ $finalTerminalPriFile = Join-Path $terminalAppPath "resources.pri"
 # Packaging
 ########
 
-$portableModeMarkerFile = Join-Path $terminalAppPath ".portable"
-If ($PortableMode) {
-	"" | Out-File $portableModeMarkerFile
-}
-
 If ($PSCmdlet.ParameterSetName -Eq "AppX") {
 	# We only produce a ZIP when we're combining two AppX directories.
 	New-Item -ItemType Directory -Path $Destination -ErrorAction:SilentlyContinue | Out-Null

custom.props

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

dep/nuget/packages.config

@@ -9,7 +9,7 @@
   <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="2.3.2262" targetFramework="native" developmentDependency="true" />
   <package id="Microsoft.UI.Xaml" version="2.8.4" targetFramework="native" />
   <package id="Microsoft.Web.WebView2" version="1.0.1661.34" targetFramework="native" />
-  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.230824.2" targetFramework="native" developmentDependency="true" />
+  <package id="Microsoft.Windows.ImplementationLibrary" version="1.0.220201.1" targetFramework="native" developmentDependency="true" />
 
   <!-- Managed packages -->
   <package id="Appium.WebDriver" version="3.0.0.2" targetFramework="net45" />

doc/COOKED_READ_DATA.md

@@ -1,90 +0,0 @@
-# COOKED_READ_DATA, aka conhost's readline implementation
-
-## Test instructions
-
-All of the following ✅ marks must be fulfilled during manual testing:
-* ASCII input
-* Chinese input (中文維基百科) ❔
-  * Resizing the window properly wraps/unwraps wide glyphs ❌
-    Broken due to `TextBuffer::Reflow` bugs
-* Surrogate pair input (🙂) ❔
-  * Resizing the window properly wraps/unwraps surrogate pairs ❌
-    Broken due to `TextBuffer::Reflow` bugs
-* In cmd.exe
-  * Create 2 file: "a😊b.txt" and "a😟b.txt"
-  * Press tab: Autocomplete to "a😊b.txt" ✅
-  * Navigate the cursor right past the "a"
-  * Press tab twice: Autocomplete to "a😟b.txt" ✅
-* Backspace deletes preceding glyphs ✅
-* Ctrl+Backspace deletes preceding words ✅
-* Escape clears input ✅
-* Home navigates to start ✅
-* Ctrl+Home deletes text between cursor and start ✅
-* End navigates to end ✅
-* Ctrl+End deletes text between cursor and end ✅
-* Left navigates over previous code points ✅
-* Ctrl+Left navigates to previous word-starts ✅
-* Right and F1 navigate over next code points ✅
-  * Pressing right at the end of input copies characters
-    from the previous command ✅
-* Ctrl+Right navigates to next word-ends ✅
-* Insert toggles overwrite mode ✅
-* Delete deletes next code point ✅
-* Up and F5 cycle through history ✅
-  * Doesn't crash with no history ✅
-  * Stops at first entry ✅
-* Down cycles through history ✅
-  * Doesn't crash with no history ✅
-  * Stops at last entry ✅
-* PageUp retrieves the oldest command ✅
-* PageDown retrieves the newest command ✅
-* F2 starts "copy to char" prompt ✅
-  * Escape dismisses prompt ✅
-  * Typing a character copies text from the previous command up
-    until that character into the current buffer (acts identical
-    to F3, but with automatic character search) ✅
-* F3 copies the previous command into the current buffer,
-  starting at the current cursor position,
-  for as many characters as possible ✅
-  * Doesn't erase trailing text if the current buffer
-    is longer than the previous command ✅
-  * Puts the cursor at the end of the copied text ✅
-* F4 starts "copy from char" prompt ✅
-  * Escape dismisses prompt ✅
-  * Erases text between the current cursor position and the
-    first instance of a given char (but not including it) ✅
-* F6 inserts Ctrl+Z ✅
-* F7 without modifiers starts "command list" prompt ✅
-  * Escape dismisses prompt ✅
-  * Minimum size of 40x10 characters ✅
-  * Width expands to fit the widest history command ✅
-  * Height expands up to 20 rows with longer histories ✅
-  * F9 starts "command number" prompt ✅
-  * Left/Right paste replace the buffer with the given command ✅
-    * And put cursor at the end of the buffer ✅
-  * Up/Down navigate selection through history ✅
-    * Stops at start/end with <10 entries ✅
-    * Stops at start/end with >20 entries ✅
-    * Wide text rendering during pagination with >20 entries ✅
-  * Shift+Up/Down moves history items around ✅
-  * Home navigates to first entry ✅
-  * End navigates to last entry ✅
-  * PageUp navigates by 20 items at a time or to first ✅
-  * PageDown navigates by 20 items at a time or to last ✅
-* Alt+F7 clears command history ✅
-* F8 cycles through commands that start with the same text as
-  the current buffer up until the current cursor position ✅
-  * Doesn't crash with no history ✅
-* F9 starts "command number" prompt ✅
-  * Escape dismisses prompt ✅
-  * Ignores non-ASCII-decimal characters ✅
-  * Allows entering between 1 and 5 digits ✅
-  * Pressing Enter fetches the given command from the history ✅
-* Alt+F10 clears doskey aliases ✅
-* In cmd.exe, with an empty prompt in an empty directory:
-  Pressing tab produces an audible bing and prints no text ✅
-* When Narrator is enabled, in cmd.exe:
-  * Typing individual characters announces only
-    exactly each character that is being typed ✅
-  * Backspacing at the end of a prompt announces
-    only exactly each deleted character ✅

doc/Niksa.md

@@ -27,8 +27,6 @@ I would highly recommend that Gulp convert to using PowerShell scripts and that
 
 Original Source: https://github.com/microsoft/terminal/issues/217#issuecomment-404240443
 
-_Addendum_: cmd.exe is the literal embodiment of [xkcd#1172]([url](https://xkcd.com/1172/)). Every change, no matter how small, will break _someone_. 
-
 ## <a name="screenPerf"></a>Why is typing-to-screen performance better than every other app?
 
 I really do not mind when someone comes by and decides to tell us that we're doing a good job at something. We hear so many complaints every day that a post like this is a breath of fresh air. Thanks for your thanks!

doc/ORGANIZATION.md

@@ -32,6 +32,7 @@
 		* `/src/cascadia/TerminalApp` - This DLL represents the implementation of the Windows Terminal application. This includes parsing settings, hosting tabs & panes with Terminals in them, and displaying other UI elements. This DLL is almost entirely UWP-like code, and shouldn't be doing any Win32-like UI work.
 		* `/src/cascadia/WindowsTerminal` - This EXE provides Win32 hosting for the TerminalApp. It will set up XAML islands, and is responsible for drawing the window, either as a standard window or with content in the titlebar (non-client area).
 		* `/src/cascadia/CascadiaPackage` - This is a project for packaging the Windows Terminal and its dependencies into an .appx/.msix for deploying to the machine.
+		* `/src/cascadia/PublicTerminalCore` - This is a DLL wrapper for the TerminalCore and Renderer, similar to `TermControl`, which exposes some exported functions that so the Terminal can be used from C#.
 		* `/src/cascadia/WpfTerminalControl` - A DLL implementing a WPF version of the Terminal Control.
 	* `/src/host` – The meat of the windows console host. This includes buffer, input, output, windowing, server management, clipboard, and most interactions with the console host window that aren’t stated anywhere else. We’re trying to pull things out that are reusable into other libraries, but it’s a work in progress
 		* `/src/host/lib` – Builds the reusable LIB copy of the host

doc/cascadia/profiles.schema.json

@@ -86,19 +86,12 @@
       ]
     },
     "BuiltinSuggestionSource": {
-      "type": "string",
-      "anyOf": [
-        {
-          "type": "string"
-        },
-        {
-          "enum": [
-            "commandHistory",
-            "tasks",
-            "all"
-          ]
-        }
-      ]
+      "enum": [
+        "commandHistory",
+        "tasks",
+        "all"
+      ],
+      "type": "string"
     },
     "SuggestionSource": {
       "default": "all",
@@ -106,17 +99,15 @@
       "$comment": "`tasks` and `local` are sources that would be added by the Tasks feature, as a follow-up",
       "oneOf": [
         {
-          "type": "null"
-        },
-        {
-          "$ref": "#/$defs/BuiltinSuggestionSource"
+          "type": [ "string", "null", "BuiltinSuggestionSource" ]
         },
         {
           "type": "array",
-          "items": {
-            "$ref": "#/$defs/BuiltinSuggestionSource"
-          },
-          "uniqueItems": true
+          "items": { "type": "BuiltinSuggestionSource" }
+        },
+        {
+          "type": "array",
+          "items": { "type": "string" }
         }
       ]
     },
@@ -210,6 +201,10 @@
                 "desktopWallpaper"
               ]
             }
+          ],
+          "type": [
+            "string",
+            "null"
           ]
         },
         "backgroundImageOpacity": {
@@ -274,17 +269,6 @@
         "experimental.pixelShaderPath": {
           "description": "Use to set a path to a pixel shader to use with the Terminal when unfocused. Overrides `experimental.retroTerminalEffect`. This is an experimental feature, and its continued existence is not guaranteed.",
           "type": "string"
-        },
-        "useAcrylic": {
-          "description": "When set to true, the window will have an acrylic material background when unfocused. When set to false, the window will have a plain, untextured background when unfocused.",
-          "type": "boolean"
-        },
-        "opacity": {
-          "default": 100,
-          "description": "Sets the opacity of the window for the profile when unfocused. Accepts values from 0-100.",
-          "maximum": 100,
-          "minimum": 0,
-          "type": "number"
         }
       },
       "type": "object"
@@ -390,12 +374,8 @@
     },
     "ShortcutActionName": {
       "enum": [
-        "addMark",
         "adjustFontSize",
-        "adjustOpacity",
-        "clearAllMarks",
         "clearBuffer",
-        "clearMark",
         "closeOtherPanes",
         "closeOtherTabs",
         "closePane",
@@ -406,7 +386,6 @@
         "copy",
         "duplicateTab",
         "expandSelectionToWord",
-        "experimental.colorSelection",
         "exportBuffer",
         "find",
         "findMatch",
@@ -414,60 +393,64 @@
         "globalSummon",
         "identifyWindow",
         "identifyWindows",
-        "markMode",
         "moveFocus",
         "movePane",
+        "swapPane",
+        "markMode",
         "moveTab",
         "multipleActions",
         "newTab",
         "newWindow",
         "nextTab",
-        "openAbout",
         "openNewTabDropdown",
         "openSettings",
-        "openSystemMenu",
         "openTabColorPicker",
-        "openTabRenamer",
         "openWindowRenamer",
         "paste",
         "prevTab",
-        "quakeMode",
-        "quit",
         "renameTab",
-        "renameWindow",
+        "openSystemMenu",
+        "openTabRenamer",
+        "quakeMode",
         "resetFontSize",
         "resizePane",
-        "restoreLastClosed",
+        "renameWindow",
         "scrollDown",
         "scrollDownPage",
-        "scrollToBottom",
-        "scrollToMark",
-        "scrollToTop",
         "scrollUp",
         "scrollUpPage",
-        "searchWeb",
-        "selectAll",
+        "scrollToBottom",
+        "scrollToTop",
         "sendInput",
         "setColorScheme",
-        "setFocusMode",
-        "setFullScreen",
-        "setMaximized",
         "setTabColor",
         "showSuggestions",
         "splitPane",
-        "swapPane",
-        "switchSelectionEndpoint",
         "switchToTab",
         "tabSearch",
         "toggleAlwaysOnTop",
         "toggleBlockSelection",
         "toggleFocusMode",
+        "selectAll",
+        "setFocusMode",
+        "switchSelectionEndpoint",
         "toggleFullscreen",
+        "setFullScreen",
+        "setMaximized",
         "togglePaneZoom",
+        "toggleSplitOrientation",
         "toggleReadOnlyMode",
         "toggleShaderEffects",
-        "toggleSplitOrientation",
         "wt",
+        "quit",
+        "adjustOpacity",
+        "restoreLastClosed",
+        "addMark",
+        "scrollToMark",
+        "clearMark",
+        "clearAllMarks",
+        "searchWeb",
+        "experimental.colorSelection",
         "unbound"
       ],
       "type": "string"
@@ -657,7 +640,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -686,7 +668,7 @@
             },
             "allowEmpty": {
               "description": "Whether to render a folder without entries, or to hide it",
-              "default": false,
+              "default": "false",
               "type": "boolean"
             }
           }
@@ -700,7 +682,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -717,7 +698,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -739,7 +719,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -756,7 +735,6 @@
           "$ref": "#/$defs/NewTabMenuEntry"
         },
         {
-          "type": "object",
           "properties": {
             "type": {
               "type": "string",
@@ -797,7 +775,6 @@
       ]
     },
     "ShortcutAction": {
-      "type": "object",
       "properties": {
         "action": {
           "description": "The action to execute",
@@ -806,7 +783,8 @@
       },
       "required": [
         "action"
-      ]
+      ],
+      "type": "object"
     },
     "AdjustFontSizeAction": {
       "description": "Arguments corresponding to an Adjust Font Size Action",
@@ -815,7 +793,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -840,7 +817,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -882,7 +858,6 @@
           "$ref": "#/$defs/NewTerminalArgs"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -899,7 +874,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -924,7 +898,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -949,7 +922,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -974,7 +946,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -999,7 +970,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1024,7 +994,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1049,7 +1018,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1077,7 +1045,6 @@
           "$ref": "#/$defs/NewTerminalArgs"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1110,7 +1077,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1148,7 +1114,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1176,7 +1141,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1198,7 +1162,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1220,7 +1183,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1245,7 +1207,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1266,7 +1227,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1287,7 +1247,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1308,7 +1267,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1333,7 +1291,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1362,7 +1319,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1391,7 +1347,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1420,7 +1375,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1445,7 +1399,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1470,7 +1423,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1494,7 +1446,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1520,7 +1471,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1542,7 +1492,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1570,7 +1519,6 @@
           "$ref": "#/$defs/NewTerminalArgs"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1587,7 +1535,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1609,7 +1556,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1631,7 +1577,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1653,7 +1598,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1675,7 +1619,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1698,7 +1641,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1720,7 +1662,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1742,7 +1683,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1794,7 +1734,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1811,7 +1750,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1835,7 +1773,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1864,7 +1801,6 @@
           "$ref": "#/$defs/ShortcutAction"
         },
         {
-          "type": "object",
           "properties": {
             "action": {
               "type": "string",
@@ -1951,11 +1887,7 @@
       "properties": {
         "applicationTheme": {
           "description": "Which UI theme the Terminal should use for controls",
-          "enum": [
-            "light",
-            "dark",
-            "system"
-          ],
+          "enum": [ "light", "dark", "system" ],
           "type": "string"
         },
         "useMica": {
@@ -1986,11 +1918,7 @@
           "type": "string",
           "description": "The name of the theme. This will be displayed in the settings UI.",
           "not": {
-            "enum": [
-              "light",
-              "dark",
-              "system"
-            ]
+            "enum": [ "light", "dark", "system" ]
           }
         },
         "tab": {
@@ -2007,7 +1935,6 @@
     "ThemePair": {
       "additionalProperties": false,
       "description": "A pair of Theme names, to allow the Terminal to switch theme based on the OS theme",
-      "type": "object",
       "properties": {
         "light": {
           "type": "string",
@@ -2189,16 +2116,16 @@
         },
         "name": {
           "description": "The name that will appear in the command palette. If one isn't provided, the terminal will attempt to automatically generate a name.\nIf name is a string, it will be the name of the command.\nIf name is a object, the key property of the object will be used to lookup a localized string resource for the command",
-          "type": [
-            "string",
-            "object",
-            "null"
-          ],
           "properties": {
             "key": {
               "type": "string"
             }
-          }
+          },
+          "type": [
+            "string",
+            "object",
+            "null"
+          ]
         },
         "iterateOn": {
           "type": "string",
@@ -2235,7 +2162,6 @@
     "Globals": {
       "additionalProperties": true,
       "description": "Properties that affect the entire window, regardless of the profile settings.",
-      "type": "object",
       "properties": {
         "alwaysOnTop": {
           "default": false,
@@ -2247,11 +2173,6 @@
           "description": "When set to true, tabs are always displayed. When set to false and \"showTabsInTitlebar\" is set to false, tabs only appear after opening a new tab.",
           "type": "boolean"
         },
-        "compatibility.enableUnfocusedAcrylic": {
-          "default": true,
-          "description": "When set to true, unfocused windows can have acrylic instead of opaque.",
-          "type": "boolean"
-        },
         "centerOnLaunch": {
           "default": false,
           "description": "When set to `true`, the terminal window will auto-center itself on the display it opens on. The terminal will use the \"initialPosition\" to determine which display to open on.",
@@ -2349,6 +2270,11 @@
           "description": "When set to true, the background image for the currently focused profile is expanded to encompass the entire window, beneath other panes.",
           "type": "boolean"
         },
+        "compatibility.reloadEnvironmentVariables": {
+          "default": true,
+          "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
+          "type": "boolean"
+        },
         "initialCols": {
           "default": 120,
           "description": "The number of columns displayed in the window upon first load. If \"launchMode\" is set to \"maximized\" (or \"maximizedFocus\"), this property is ignored.",
@@ -2450,17 +2376,10 @@
         "theme": {
           "default": "dark",
           "description": "Sets the theme of the application. This value should be the name of one of the themes defined in `themes`. The Terminal also includes the themes `dark`, `light`, and `system`.",
-          "anyOf": [
+          "oneOf": [
             {
               "type": "string"
             },
-            {
-              "enum": [
-                "dark",
-                "light",
-                "system"
-              ]
-            },
             {
               "$ref": "#/$defs/ThemePair"
             }
@@ -2570,12 +2489,12 @@
       },
       "required": [
         "defaultProfile"
-      ]
+      ],
+      "type": "object"
     },
     "Profile": {
       "description": "Properties specific to a unique profile.",
       "additionalProperties": false,
-      "type": "object",
       "properties": {
         "acrylicOpacity": {
           "default": 0.5,
@@ -2604,11 +2523,6 @@
             "null"
           ]
         },
-        "compatibility.reloadEnvironmentVariables": {
-          "default": true,
-          "description": "When set to true, when opening a new tab or pane it will get reloaded environment variables.",
-          "type": "boolean"
-        },
         "unfocusedAppearance": {
           "$ref": "#/$defs/AppearanceConfig",
           "description": "Sets the appearance of the terminal when it is unfocused.",
@@ -2627,7 +2541,7 @@
         },
         "backgroundImage": {
           "description": "Sets the file location of the image to draw over the window background.",
-          "anyOf": [
+          "oneOf": [
             {
               "type": [
                 "string",
@@ -2639,6 +2553,10 @@
                 "desktopWallpaper"
               ]
             }
+          ],
+          "type": [
+            "string",
+            "null"
           ]
         },
         "backgroundImageAlignment": {
@@ -2975,7 +2893,8 @@
           "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"
         }
-      }
+      },
+      "type": "object"
     },
     "ProfileList": {
       "description": "A list of profiles and the properties specific to each.",
@@ -2990,7 +2909,6 @@
     },
     "ProfilesObject": {
       "description": "A list of profiles and default settings that apply to all of them",
-      "type": "object",
       "properties": {
         "list": {
           "$ref": "#/$defs/ProfileList"
@@ -2999,12 +2917,12 @@
           "description": "The default settings that apply to every profile.",
           "$ref": "#/$defs/Profile"
         }
-      }
+      },
+      "type": "object"
     },
     "SchemeList": {
       "description": "Properties are specific to each color scheme. ColorTool is a great tool you can use to create and explore new color schemes. All colors use hex color format.",
       "items": {
-        "type": "object",
         "additionalProperties": false,
         "properties": {
           "name": {
@@ -3093,7 +3011,8 @@
             "$ref": "#/$defs/Color",
             "description": "Sets the color used as ANSI yellow."
           }
-        }
+        },
+        "type": "object"
       },
       "type": "array"
     }
@@ -3103,7 +3022,6 @@
       "$ref": "#/$defs/Globals"
     },
     {
-      "type": "object",
       "additionalItems": true,
       "properties": {
         "profiles": {

doc/roadmap-2022.md

@@ -1,9 +1,5 @@
 # Terminal 2022 Roadmap
 
-> **NOTE**
->
-> This document has been superseded by the [Terminal 2023 Roadmap]. Please refer to that document for the updated roadmap.
-
 ## Overview 
 
 This document outlines the roadmap of features we're planning for the Windows Terminal during 2022. This serves as a successor to the [Terminal v2 Roadmap], to reflect changes to our planning going forward.
@@ -130,5 +126,3 @@ Incoming issues/asks/etc. are triaged several times a week, labeled appropriatel
 [Windows Terminal Preview 1.12 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-12-release/
 [Windows Terminal Preview 1.13 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-13-release/
 [Windows Terminal Preview 1.14 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-14-release/
-
-[Terminal 2023 Roadmap]: https://github.com/microsoft/terminal/tree/main/doc/roadmap-2023.md

doc/roadmap-2023.md

@@ -1,76 +0,0 @@
-# Terminal 2023 Roadmap
-
-## Overview 
-
-This document outlines the roadmap of features we're planning for the Windows Terminal during 2023. This serves as a successor to the [2022 Roadmap], to reflect changes to our planning going forward.
-
-## Release cadence
-
-We've settled on a roughly quarterly release cycle - about once every three months. In May we released [Terminal 1.18]. We're targeting 1.19 for sometime in late September, and 1.20 likely in early January 2024. (These timelines are rough estimates, not strict rules. For example, 1.18's release was pushed back slightly to better align with Build 2023.)
-
-New features will go into [Windows Terminal Preview](https://aka.ms/terminal-preview) first. Typically, one release after they've been in Preview, those features will move into [Windows Terminal](https://aka.ms/terminal) ("Terminal Stable"). In the case of some more risky or experimental features, we might hold them to only Preview builds for an extended period[^1].
-
-
-| Quarter | Date       | Release Version | Preview Release Blog Post |
-| --------|------------|---------------- | ------------------------- |
-| CY23 Q1 | 2023-01-24 | [Terminal 1.17] | [Windows Terminal Preview 1.17 Release] |
-| CY23 Q2 | 2023-05-23 | [Terminal 1.18] | [Windows Terminal Preview 1.18 Release] |
-| CY23 Q3 |            | [Terminal 1.19] | [Windows Terminal Preview 1.19 Release] |
-| CY23 Q4 |            | [Terminal 1.20] | [Windows Terminal Preview 1.20 Release] |
-
-Within a single milestone, we typically reserve the last month as "bake time", to polish off bugfixes and get the release ready to ship. In this last month, we'll likely slow down our ingestion of community PRs just to stabilize what's already in `main`. For example, a given release might look like:
-
-```mermaid
-gantt
-    title Proposed Terminal Releases 1.14-1.18
-    dateFormat  YYYY-MM-DD
-    axisFormat  %d %b
-    section Terminal 1.18
-        Lock down & bake        :l18, 2023-05-09  , 2w
-        Release 1.18            :milestone, 2023-05-23, 0
-        1.18 becomes Stable     :milestone, after l19, 0
-    section Terminal 1.19
-        Features                :f19, after l18, 10w
-        Bugfix                  :b19, after f19  , 4w
-        Lock down & bake        :l19, after b19  , 2w
-        Release 1.19            :milestone, after l19, 0
-```
-
-_informative, not normative_
-
-## Up next in the Terminal
-
-### Terminal 1.19
-
-* Canary builds. Nightly builds of the Terminal from `main`. More unstable, but quicker access to experimental features.
-* Terminal AI. While this will only be shipping in Canary builds to begin with, the v0 implementation will be available roughly at the same time as 1.19.
-* The Suggestions UI. This is the starting point for shell completions [#3121], tasks [#1595], and probably Terminal AI at some point too.
-* Unicode input for `cmd.exe` (and any other console app using "cooked reads"). See [#15567]
-* Miscellaneous performance improvements. Conhost should be a _lot_ faster now.
-* Broadcast input mode, for sending text to multiple panes at once.
-
-## Team member "north stars"
-
-For a more fluid take on what each of the team's personal goals are, head on over to [Core team North Stars]. This has a list of more long-term goals that each team member is working towards, but not things that are necessarily committed work.
-
-
-[^1]: A conclusive list of these features can be found at https://github.com/microsoft/terminal/blob/main/src/features.xml. Note that this is a raw XML doc used to light up specific parts of the codebase, and not something authored for human consumption.
-
-[2022 Roadmap]: https://github.com/microsoft/terminal/tree/main/doc/roadmap-2022.md
-
-[Terminal 1.17]: https://github.com/microsoft/terminal/releases/tag/v1.17.1023
-[Terminal 1.18]: https://github.com/microsoft/terminal/releases/tag/v1.18.1462.0
-[Windows Terminal Preview 1.17 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-17-release/
-[Windows Terminal Preview 1.18 Release]: https://devblogs.microsoft.com/commandline/windows-terminal-preview-1-18-release/
-
-[@DHowett]: https://github.com/DHowett
-[@zadjii-msft]: https://github.com/zadjii-msft
-[@lhecker]: https://github.com/lhecker
-[@carlos-zamora]: https://github.com/carlos-zamora
-[@PankajBhojwani]: https://github.com/PankajBhojwani
-
-[Core team North Stars]: https://github.com/microsoft/terminal/wiki/Core-team-North-Stars
-
-[#1595]: https://github.com/microsoft/terminal/issues/1595
-[#3121]: https://github.com/microsoft/terminal/issues/3121
-[#15567]: https://github.com/microsoft/terminal/issues/15567

doc/specs/#1595 - Suggestions UI/Suggestions-UI.md

@@ -1,744 +0,0 @@
----
-author: Mike Griese
-created on: 2022-08-22
-last updated: 2023-08-03
-issue id: 1595
----
-
-# Windows Terminal - Suggestions UI
-
-## Abstract
-
-Multiple related scenarios have come up where it would be beneficial to display
-actionable UI to the user within the context of the active terminal itself. This
-UI would be akin to the Intellisense UI in Visual Studio. It appears right where
-the user is typing, and can help provide immediate content for the user, based
-on some context. The "Suggestions UI" is this new ephemeral UI within the
-Windows Terminal that can display different types of actions, from different
-sources.
-
-## Background
-
-The Suggestions UI is the singular UI by which the Terminal can display a
-variety of suggestions to the user. These include:
-
-* Recent commands the user has executed in this terminal, powered by shell integration.
-* Recent directories, similarly powered by shell integration
-* Completions from the shell itself (like the shell completions in PowerShell)
-* Tasks, which are `sendInput` actions from the user's settings
-* Buffer Completions, which is a dumb type of autocomplete based on words in the buffer
-* and more (as provided via extensions)
-
-All of these scenarios are places where it makes sense to present the user a
-menu at the point of text insertion in the terminal control itself.
-
-### Inspiration
-
-Primarily, the inspiration is any Intellisense-like experience, in any app.
-Visual Studio, VsCode, PowerShell, vim, Sublime any JetBrains IDE - there's more
-than enough examples in the wild.
-
-Ultimately, the inspiration for the Suggestions UI came from a bunch of places
-all at once. In the course of a few months though, it became clear that we'd
-need a unified UI for displaying a variety of suggestion-like experiences in the
-Terminal. Our work with the PowerShell and VsCode teams helped refine these
-requests all into the unified design below.
-
-### User Stories
-
-  Size     |  Description
------------|--
- 🐣 Crawl  | The user can bring up the Suggestions UI with recent commands, powered by shell integration
- 🐣 Crawl  | [#12863] The user can bring up the Suggestions UI with recent directories, powered by shell integration
- 🚶 Walk   | The user can bring up the Suggestions UI with tasks from their settings
- 🚶 Walk   | CLI apps can invoke the Suggestions UI with a new VT sequence
- 🚶 Walk   | The Suggestions UI can be opened using the current typed commandline as a filter
- 🚶 Walk   | Recent commands and directories are stored in `state.json`, across sessions
- 🏃‍♂️ Run    | Suggestions can have descriptions presented in / alongside the UI
- 🏃‍♂️ Run    | The Suggestions UI can be opened without any nesting
- 🏃‍♂️ Run    | The Suggestions UI can be opened, nested by `source` of the suggestion
- 🚀 Sprint | Extensions can provide suggestion sources for the Suggestions UI
- 🚀 Sprint | The Suggestions UI can be opened in "inline" mode, only showing the text of the first suggestion
-
-### Elevator Pitch
-
-The Suggestions UI is a UI element displayed in the Terminal for providing
-different types of text suggestions to the user - anything from recently run
-commands, to saved commands, to tab-completion suggestions from the shell
-itself.
-
-## Business Justification
-
-It will delight developers.
-
-Furthermore, our partners on the Visual Studio team have been requesting similar
-functionality for some time now. The way autocompletion menus in PowerShell
-currently interact with UIA clients leaves much to be desired. They'd like a way
-to provide richer context to screen readers. Something to enable the terminal to
-more specifically describe the context of what's being presented to the user.
-
-## Scenario Details
-
-### UI/UX Design
-
-#### Prototypes
-
-The following gif was a VsCode prototype of [shell-driven autocompletion]. This
-is the point of reference we're starting from when talking about what the
-suggestions UI might look like.
-
-![](vscode-shell-suggestions.gif)
-
-These suggestions are populated by logic within PowerShell itself, and
-communicated to the Terminal. The Terminal can then display them in the
-Suggestions UI.
-
-The following demonstrate a prototype of what that might look like for the
-Terminal. These are meant to be informative, not normative, representations of
-what the UI would look like.
-
-![](shell-autocomplete-july-2022-000.gif)
-
-A prototype of the recent commands UI, powered by shell integration:
-
-![](command-history-suggestions.gif)
-
-A prototype of the tasks UI, powered by the user's settings:
-
-![](tasks-suggestions.gif)
-
-(admittedly, the `TeachingTip` in that gif is a prototype and was later replaced
-with a better version.)
-
-In general, the Suggestions UI will present a list of elements to select from,
-near the text cursor. This control might be contain a text box for filtering
-these items (a "**palette**"), or it might not (a "**menu**").
-
-![An example of the menu mode](3121-suggestion-menu-2023-000.gif)
-
-#### Palette vs Menu
-
-Depending on how the suggestions UI is invoked, we may or may not want to
-display a text box for filtering these suggestions. Consider the Intellisense
-menu in Visual Studio. That's a UI that only allows for up/down for navigation
-(and enter/tab for selecting the suggestion).
-
-For suggestions driven by the Terminal, we'll display a filtering text box in
-the Suggestions UI. This is similar to the command palette's search - a fuzzy
-search to filter the contents. This is the "**palette**" style of the
-suggestions dialog.
-
-For completions driven by the shell, we should probably not display the
-filtering text box. This is the "**menu**" style of the suggestion dialog. The
-user is primarily interacting with the shell here, not the Terminal.
-
-> **Warning**
-> TODO! For discussion, possibly with a real UX designer.
-
-How should we handle completions here? Tab? Enter? Right-Arrow? Should we have
-an element selected when we open the menu, or should tab/enter only work once
-the user has used the arrows at least once? Sublime allows for <kbd>tab</kbd> to
-complete the suggestion immediately.
-
-Consider also that these suggestions might be provided by the shell, as the user
-is typing at a commandline shell. For something like PowerShell, the user might
-want to start typing a command and have it tab-complete based off the shell's
-tab expansion rules. PowerShell's inline suggestions use right-arrow to
-differentiate "use this suggestion" vs tab for "tab expand what I'm typing at
-the prompt". We should probably preserve this behavior.
-
-We probably don't want to provide different experiences for the **menu** version
-of the Suggestions UI vs. the **palette** version. In the palette version, the
-user won't be pressing tab to tab-complete at the shell - the focus is out of
-the of terminal and in the Suggestions UI. With the menu version, the focus is
-still "in the terminal", and users would expect tab to tab-complete.
-
-We will want to make sure that there's some semblance of consistency across our
-implementation for the Suggestions UI, our own Command Palette, VsCode's
-intellisense and their own implementation of shell-completions in the Terminal.
-
-> **Note**
-> In my prototype, for the "Menu" mode, I accepted ALL of right-arrow, tab, and
-> enter as "accept completion", and any other key dismissed the UI. This _felt_
-> right for that mode. I'm not sure we could make the same call for "palette"
-> mode, where we'd need tab for navigating focus.
-
-### Implementation Details
-
-#### Fork the Command Palette
-
-We're largely going to start with the Command Palette to build the Suggestions
-UI[[1](#footnote-1)]. The Command Palette is already a control we've built for displaying a
-transient list of commands and dispatching them to the rest of the app.
-
-Currently, the Command Palette is a single static control, at the top-center of
-the Terminal window, and occupying a decent portion of the screen. For the
-Suggestions UI, we'll instead want to make sure that the control appears
-relative to the current cursor position.
-
-We'll start by taking the command palette, and copying it over to a new control.
-This will allow us to remove large chunks of code dealing with different modes
-(i.e. the tab switcher), and code dealing with prefix characters to switch
-modes.
-
-We'll need to make some small modifications to enable the Suggestions UI to
-* work as a text cursor-relative control
-* exist as a Flyout outside the bounds of the Terminal window
-* If the Suggestions UI is too close to the bottom of the screen, we'll need it to open
-  "upwards", with the search box at the _bottom_ and the list extending above it
-* prevent it from switching to command-line mode
-* display tooltips / `TeachingTip`s / some secondary flyout with a description
-  of the suggestion (if provided)
-
-#### Completion sources
-
-The Suggestions UI will support suggestions from a variety of different
-"sources". As an example, consider the following actions:
-
-```json
-        { "command": { "action":"suggestions", "source": "commandHistory" } },
-        { "command": { "action":"suggestions", "source": "directoryHistory" } },
-
-        { "command": { "action":"suggestions", "source": "tasks" } },
-        { "command": { "action":"suggestions", "source": "local" } },
-
-        { "command": { "action":"suggestions", "source": ["local", "tasks", "commandHistory"] } },
-
-        { "command": { "action":"suggestions", "source": "Microsoft.Terminal.Extensions.BufferComplete" } },
-```
-
-Each of these `suggestions` actions would open the Suggestions UI with a
-different set of actions.
-
-* `commandHistory`: Use commands from this session, as identified via shell
-  integration. This won't be able to return any suggestions if the user has not
-  configured their shell to support shell integration sequences yet.
-* `directoryHistory`: Populate the list with a series of `cd {path}` commands,
-  where the paths are populated via shell integration. Paths are in MRU order.
-* `tasks`: Populate the list with all `sendInput` actions in the user's settings
-  file. The command structure should remain unchanged. For example, if they have
-  `sendInput` actions nested under a "git" command, then the "git" entry will
-  remain in this tasks view with their `sendInput` actions nested inside it. For
-  more details, see the [Tasks] spec.
-* `local`: Populate the list with tasks that are located in the CWD, in a file
-  named `.wt.json`. For more details, see the [Tasks] spec.
-* `Microsoft.Terminal.Extensions.BufferComplete`: As an example, this
-  demonstrates how an action might be authored to reference a suggestion source
-  from an extension[[2](#footnote-2)].
-
-Each of these different sources will build a different set of `Command`s,
-primarily populated with `sendInput` actions. We'll load those `Command`s into
-the Suggestions UI control, and open it at the text cursor.
-
-To drill in on a single example - the `commandHistory` source. In that
-particular case, the TerminalPage will query the active TermControl for a list
-of its recent commands. If it knows these (via shell integration), then the
-TerminalPage will use that list of commands to build a list of `sendInput`
-actions. Those will then get fed to the suggestions UI.
-
-Not listed above is [shell-driven autocompletion]. These aren't something that
-the Terminal can invoke all on its own - these are something the shell would
-need to invoke themselves.
-
-#### Pre-populate the current commandline context
-
-Consider the following scenario. A user has typed `git c` in their shell, and
-has [shell integration] enabled for their shell. They want to open the
-Suggestions UI filtered to their recent history, but starting with what they've
-already typed. To support this scenario, we'll add an additional property:
-
-* `"useCommandline"`: `bool` (**default**: `true`)
-  * `true`: the current commandline the user has typed will pre-populate the
-    filter of the Suggestions UI. This requires that the user has enabled shell
-    integration in their shell's config.
-  * `false`: the filter will start empty, regardless of what the user has typed.
-
-With that setting, the user can achieve their desired UX with the following action:
-
-```json
-{ "command": { "action":"suggestions", "source": "commandHistory", "useCommandline": true } },
-```
-
-Now, when they type `git c` and invoke the Suggestions UI, they can immediately
-start searching for recent commands that started with `git c`.
-
-The primary use case for `useCommandline: false` was for `"nesting": "source"`.
-When filtering a list of ["Tasks...", "Recent commands...", "Recent
-directories...", "Docker...", "Git..."], then there's minimal value to start by
-filtering to "git c".
-
-#### Default actions
-
-I propose adding the following actions to the Terminal by default:
-
-```json
-{ "command": { "action":"suggestions", "source": "commandHistory", "useCommandline": true } },
-{ "command": { "action":"suggestions", "source": "directoryHistory" } },
-{ "command": { "action":"suggestions", "source": ["local", "tasks", "commandHistory"], "useCommandline": true, "nesting": "disabled" } },
-{ "command": { "action":"suggestions", "source": ["all"], "useCommandline": false, "nesting": "source" } },
-```
-
-These actions are colloquially:
-* Give me suggestions from my recent commands, using what I've typed
-* Give me suggestions of directories I've recently been in
-* _(After [Tasks] are implemented)_ Give me suggestions from recent commands,
-  commands I've saved, and commands for this project. Don't nest any, so they're
-  all in the top-level menu. Use what I've typed already to start filtering.
-* Just open the Suggestions UI with all suggestions sources, and group them by
-  the source of the suggestions.
-
-This should cover most of the basic use cases for suggestions.
-
-#### Who owns this menu?
-
-There was some discussion of who should own the suggestions menu. The control
-itself? Or the app hosting the control?
-
-A main argument for hosting this UI in the control itself is that any consumer
-of the `TermControl` should be able to display the [shell-driven autocompletion]
-menu. And they should get the UI from us "for free". Consumers shouldn't need to
-reimplement it themselves. This probably could be done without many changes:
-* Instead of operating on `Command`s and actions from the terminal settings,
-  the control could just know that all the entries in the menu are "send
-  input" "actions".
-* The control could offer a method to manually invoke the Suggestions UI for a
-  list of {suggestion, name, description} objects.
-* The app layer could easily translate between sendInput actions and these
-  pseudo-actions.
-
-A big argument in favor of having the app layer host the control: Consider an
-app like Visual Studio. When they embed the control, they'll want to style the
-shell-completions UI in their own way. They already have their own intellisense
-menu, and their own UI paradigm.
-
-For now, we'll leave this as something that's owned by the app layer. When we
-get around to finalizing the [shell-driven autocompletion] design, we can
-iterate on ideas for supporting both consumers that want to use a pre-built
-suggestions control, or consumers who want to bring their own.
-
-## Tenets
-
-<table>
-
-<tr><td><strong>Compatibility</strong></td><td>
-
-This shouldn't break any existing flows. This is a general purpose UI element,
-to be extended in a variety of ways. Those customizations will all be opt-in by
-the user, so I'm not expecting any breaking compatibility changes here.
-
-</td></tr>
-
-<tr><td><strong>Accessibility</strong></td><td>
-
-The Suggestions UI was designed with the goal of making commandline shell
-suggestions _more_ accessible. As Carlos previously wrote:
-
-> Screen readers struggle with this because the entire menu is redrawn every time, making it harder to understand what exactly is "selected" (as the concept of selection in this instance is a shell-side concept represented by visual manipulation).
->
-> ...
->
-> _\[Shell driven suggestions\]_ can then be leveraged by Windows Terminal to create UI elements. Doing so leverages WinUI's accessible design.
-
-This will allow the Terminal to provide more context-relevant information to
-screen readers.
-
-</td></tr>
-
-<tr><td><strong>Sustainability</strong></td><td>
-
-No sustainability changes expected.
-
-</td></tr>
-
-<tr><td><strong>Localization</strong></td><td>
-
-The localization needs of the Suggestions UI will be effectively the same as the
-needs of the Command Palette.
-
-The Terminal will have no way to localize suggestions that are provided via
-[shell-driven autocompletion]. These are just verbatim strings that the shell
-told us to use. We don't consider this to be something to worry about, however.
-This is no different than the fact that Terminal cannot localize the `Get-Help`
-(or any other) output of PowerShell.
-
-</td></tr>
-
-</table>
-
-## Implementation Plan
-
-This is more of an informative outline, rather than a normative one. Many of the
-things from Crawl, Walk, and Run are all already in PRs as of the time of this
-spec's review.
-
-### 🐣 Crawl
-
-* [ ] Fork the Command palette to a new UI element, the `SuggestionsControl`
-* [ ] Enable previewing `sendInput` actions in the Command Palette and `SuggestionsControl`
-* [ ] Enable the `SuggestionsControl` to open top-down (aligned to the bottom of the cursor row) or bottom-up (aligned to the top of the cursor row).
-* [ ] Disable sorting on the `SuggestionsControl` - elements should presumably be pre-sorted by the source.
-* [ ] Expose the recent commands as a accessor on `TermControl`
-* [ ] Add a `suggestions` action which accepts a single option `recentCommands`. These should be fed in MRU order to the `SuggestionsControl`.
-* [ ] Expose the recent directories as an accessor on `TermControl`, and add a `recentDirectories` source.
-
-### 🚶 Walk
-
-* [ ] Add a `tasks` source to `suggestions` which opens the Suggestions UI with
-  a tree of all `sendInput` commands
-* [ ] Enable the `SuggestionsControl` to open with or without a search box
-* [ ] Plumb support for shell-driven completions through the core up to the app
-* [ ] Expose the _current_ commandline from the `TermControl`
-* [ ] Add a `useCommandline` property to `suggestions`, to pre-populate the search with the current commandline.
-* [ ] Persist recent commands / directories accordingly
-
-### 🏃‍♂️ Run
-
-* [ ] Add a `description` field to `Command`
-* [ ] Add a `TeachingTip` (or similar) to the Suggestions UI to display
-  descriptions (when available)
-* [ ] Use the `ToolTip` property of shell-driven suggestions as the description
-* [ ] Add a boolean `nesting` property which can be used to disable nesting on the `tasks` source.
-* [ ] Add the ability for `nesting` to accept `enabled`/`disabled` as `true`/`false` equivalents
-* [ ] Add the ability for `nesting` to accept `source`, which instead groups all
-  commands to the Suggestions UI by the source of that suggestion.
-
-### 🚀 Sprint
-
-The two "sprint" tasks here are much more ambitious than the other listed
-scenarios, so breaking them down to atomic tasks sees less reasonable. We'd have
-to spend a considerable amount more time figuring out _how_ to do each of these
-first.
-
-For example - extensions. We have yet to fully realize what extensions _are_.
-Determining how extensions will provide suggestions is left as something we'll
-need to do as a part of the Extensions spec.
-
-## Conclusion
-
-Here's a sample json schema for the settings discussed here.
-
-```json
-"OpenSuggestionsAction": {
-  "description": "Arguments corresponding to a Open Suggestions Action",
-  "allOf": [
-    {
-      "$ref": "#/$defs/ShortcutAction"
-    },
-    {
-      "properties": {
-        "action": {
-          "type": "string",
-          "const": "suggestions"
-        },
-        "source": {
-          "$ref": "#/$defs/SuggestionSource",
-          "description": "Which suggestion sources to filter."
-        },
-        "useCommandline": {
-          "default": false,
-          "description": "When set to `true`, the current commandline the user has typed will pre-populate the filter of the Suggestions UI. This requires that the user has enabled shell integration in their shell's config. When set to false, the filter will start empty."
-        },
-        "nesting": {
-          "default": true,
-          "description": "When set to `true`, suggestions will follow the provided nesting structure. For Tasks, these will follow the structure of the Command Palette. When set to `false`, no nesting will be used (and all suggestions will be in the top-level menu.",
-          "$comment": "This setting is a possible follow-up setting, not required for v1. "
-        }
-      }
-    }
-  ]
-},
-"BuiltinSuggestionSource": {
-  "enum": [
-    "commandHistory",
-    "directoryHistory",
-    "tasks",
-    "local",
-    "all"
-  ],
-  "type": "string"
-},
-"SuggestionSource": {
-  "default": "all",
-  "description": "Either a single suggestion source, or an array of sources to concatenate. Built-in sources include `commandHistory`, `directoryHistory`, `tasks`, and `local`. Extensions may provide additional values. The special value `all` indicates all suggestion sources should be included",
-  "$comment": "`tasks` and `local` are sources that would be added by the Tasks feature, as a follow-up"
-  "oneOf": [
-    {
-      "type": [ "string", "null", "BuiltinSuggestionSource" ]
-    },
-    {
-      "type": "array",
-      "items": { "type": "BuiltinSuggestionSource" }
-    },
-    {
-      "type": "array",
-      "items": { "type": "string" }
-    }
-  ]
-},
-```
-
-### Future Considerations
-
-* Another extension idea: `WithFig.FigCompletions`. Imagine an extension that
-  could parse existing [Fig] completion specs, and provide those as suggestions
-  in this way.
-  * This might be a good example of an async suggestion source. The current
-    commandline is used as the starting filter, and the suggestions would be
-    populated by some `fig` process / thread / async operation that returns the
-    suggestions.
-* If the user hasn't enabled shell completion, we could add text to the
-  `commandHistory` or `directoryHistory` menus to inform the user how they could
-  go enable shell integration. We already have a docs page dedicated to this, so
-  we could start by linking to that page. More notes on this in [Automatic shell
-  integration](#Automatic-shell-integration).
-* Maybe there could be a per-profile setting for automatic suggestions after
-  some timeout. Like, as you type, a menu version of the Suggestions UI appears.
-  So you could just start typing `git c`, and it would automatically give you a
-  menu with suggestions, implicitly using the typed command as the "filter".
-  * Maybe we could do this as an `implicit` property on the `suggestions` action
-
-
-#### Description Tooltips
-
-> **Note**: _This is left as a future consideration for the initial draft of
-> this spec. I'd like to flesh out [shell-driven autocompletion] more before
-> committing any plans here._
-
-It would be beneficial for the Suggestions UI to display additional context to
-the user. Consider a extension that provides some commands for the user, like a
-hypothetical "Docker" extension. The extension author might be able to give the
-commands simplified names, but also want to expose a more detailed description
-of the commands to the user.
-
-Or consider the Suggestions UI when invoked by [shell-driven autocompletion].
-The shell might want to provide help text to the user with each of the
-suggestions. This would allow a user to browse through the suggestions that they
-might not know about, and learn how they work before committing to one.
-
-Only the help text for the currently hovered command should be presented to the
-user. To support this kind of UX, we'll add an optional flyout of some sort to
-display with the Suggestions UI. This flyout will only appear if there's more
-information provided to the Terminal.
-
-This might be in the form of a `TeachingTip`, as in this example:
-
-![TeachingTip with description](https://user-images.githubusercontent.com/18356694/222244568-243a6482-92d9-4c3c-bffc-54ad97f01f69.gif)
-
-Actions in the settings could also accept an optional `description` property, to
-specify the string that would be presented in that flyout.
-
-#### Automatic shell integration
-
-A large portion of these features all rely on shell integration being enabled by
-the user. However, this is not a trivial thing for the Terminal to do on behalf
-of the user. Shell integration relies on changes to the user's shell config. If
-the Terminal were to try and configure those itself, we may accidentally destroy
-configuration that the user has already set up. Hence why the Terminal can't
-just have a "Light up all the bells and whistles" toggle in the Settings UI.
-
-This is a non-trivial problem to solve, so it is being left as a future
-consideration, for a later spec. It deserves its own spec to sort out how we
-should expose this to users and safely implement it.
-
-#### Pre-filtering the UI & filter by source
-
-> **Note**: _This is a brainstorm I considered while writing this spec. I would
-> not include it in the v1 of this spec. Rather, I'd like to leave it for
-> where we might go with this UX in the future._
-
-Do want to support different _types_ of nesting? So instead of just the default,
-there could be something like `nesting: "source"`, to create a menu structured
-like:
-
-```
-Suggestions UI
-├─ Recent Commands...
-│  ├─ git checkout main
-│  ├─ git fetch
-│  └─ git pull
-├─ Recent Directories...
-│  ├─ d:\dev
-│  ├─ d:\dev\public
-│  └─ d:\dev\public\terminal
-├─ Saved tasks...
-│  ├─ Git...
-│  │  └─ git commit -m "
-│  │  └─ git log...
-│  └─ bx & runut
-└─ Docker
-   ├─ docker build --platform linux/amd64 <path>
-   └─ docker logs -f --tail <lines_count> <container_name>
-```
-
-> **Note**
-> I'm using `Docker` as an example fragment extension that provides
-> some `docker` commands. When grouping by `"source"`, we could pull those into
-> a separate top-level entry. When not grouping by `"source"`, those would still
-> show up with the rest of `tasks`. )
-
-#### Store recent commands across sessions
-
-> **Note**
-> _I'm not sure we really want to put this in this spec or not, hence
-> why it is in the "Future considerations" section. I think it is worth
-> mentioning. This might be better served in the [shell integration] doc._
-
-We'll probably want a way for recent commands to be saved across sessions. That way, your `cmd.exe` command history could persist across sessions. We'd need:
-
-* A setting to enable this behavior
-* A setting to control the context of these saved commandlines.
-  * Do we want them saved per-profile, or globally?
-  * If they're saved per-profile, maybe a profile can opt-in to loading all the commands?
-  * How does defterm play with this? Do we "layer" by concatenating per-profile commands with `profiles.defaults` ones?
-* A button in the Settings UI for clearing these commands
-* Should fragments be able to pre-populate "recent commands"?
-  * I'm just gonna say _no_. That would be a better idea for Tasks (aka just a `sendInput` Action that we load from the fragment normally as a Task), or a specific suggestion source for the fragment extension.
-
-#### Inline mode
-
-> **Note**
-> _This is a half-baked idea with some potential. However, I don't
-> think it needs to be a part of the v1 of the Suggestions UI, so I'm leaving it
-> under future considerations for a future revision._
-
-Do we want to have a suggestions UI "mode", that's just **one** inline
-suggestion, "no" UI? Some UX ala the `PsReadline` recent command suggestion
-feature. Imagine, we just display the IME ghost text thing for the first result,
-given the current prompt?
-
-Take the following action as an example:
-
-```json
-{ "command": { "action":"suggestions", "source": "commandHistory", "useCommandline": true, "inline": true } },
-```
-
-Type the start of some command at the prompt, and press that key. Presto, we do
-the `pwsh` thing. Ghost text appears for the first match in the `commandHistory`
-for what the user has typed. If they press another key, ~they've typed into the
-"hidden" Suggestions UI, which filters the (hidden) list more, and updates the
-one inline suggestion.~
-
-Or, instead, typed keys go to the shell, and then we re-query the commandline,
-and update the filter accordingly. That would allow tab-completion to still
-work. We'd use <kbd>right arrow</kbd> to accept the suggestion (and dismiss the
-ghost text preview).
-
-This would seemingly SUPER conflict with PowerShell's own handler. Probably not
-something someone should enable for PowerShell 7 profiles if they're using that
-feature.
-
-### Rejected ideas
-
-These are musings from earlier versions of the spec.
-* **Asynchronous prompting**: This was rejected because it was so fundamentally
-  different from the rest of the UX of the Suggestions UI, it didn't make sense
-  to try and also do that behavior.
-* ...
-
-#### REJECTED: Asynchronous prompting
-
-Certain suggestion sources might want to provide results asynchronously.
-Consider a source that might want to make a web request to populate what strings
-to suggest. That source might want to prompt the user for input first, then
-dispatch the request, then populate the UI. Or something like a `fig`-like
-suggestion source, which would need to parse some files from the disk to
-generate the list of suggestions.
-
-The easiest way to do this would be to provide a secondary UI element for
-prompting the user for input, doing the request in the background, then opening
-the UI later. However, that feels a little disjointed. Could we instead provide
-a more continuous experience?
-
-The following is a proposal for using the Suggestions UI itself as the control
-to prompt the user for input.
-
-```c++
-TerminalPage::SetUpSuggestionsUI()
-{
-    const auto& asyncSource{ AsyncSuggestions() };
-
-    suggestionsUI.OnInputChanged({ asyncSource, AsyncSuggestions::InputChangedHandler});
-    // In this example, we don't want the UI to filter item based on the input
-    // string - the source has already determined the list of relevant matches.
-    suggestionsUI.FilterByInput(false);
-
-    asyncSource.SuggestionsChanged([](const auto& newCommands){
-        suggestionsUI.Loading(false);
-        suggestionsUI.Commands(newCommands);
-    })
-}
-
-void AsyncSuggestions::InputChangedHandler(FilterChangedArgs args)
-{
-    // kick off a trailing ThrottledFunc to do a new query
-    _loadNewResults->Run(args.NewInputText());
-    // If we get another request, we might want to cancel the pending throttled
-    // func entirely, and start the timeout fresh. Just so that we only make a
-    // query for the final string they type.
-
-    args.RequestLoading(true); // pass a boolean back up in the args, so that
-    // the Suggestions UI can clear out the current commands, and start displaying an
-    // indeterminate progress wheel.
-}
-```
-
-That would basically _have_ to be special cased for this source, at least for
-now. We could refactor that later to better deal with extensions.
-
-Let's make sure this would work for something `fig`-like, where the "prompt" is
-literally the prompt, what the user has already typed at the commandline.
-
-After some discussion:
-* How do we differentiate the prompting version of the Suggestions UI from the
-  filtering version?
-  * The prompting version _doesn't_ filter results
-* Async modes wouldn't work with sync ones at all. E.g. if you did `source:
-  ["tasks", "myAsyncSource"]`. It doesn't make sense to start with a list of
-  `tasks`, then type, find no tasks, but then oh! the UI fills in some other
-  suggestions too. That's weird.
-
-## Resources
-
-These are some other work streams that have a lot of tie-in to the Suggestions
-UI. These are all being spec'd at roughly the same time, so links may not be
-fully up to date.
-* [Shell integration]
-* [Shell-driven autocompletion]
-* [Tasks]
-
-### Footnotes
-
-<a name="footnote-1"><a>[1]: We've had discussion in the past ([#7285]) about
-possibly creating a more abstract "Live filtering list view" to replace the
-Command Palette. We could most certainly use that here too. We've decided to
-initially go with a fork for now.
-
-<a name="footnote-2"><a>[2]: Obviously, we're not having a real discussion about
-extensions in this doc. This example is solely to show that there's room for
-extensions to work with the "source" property in this design. What the final
-shape of extensions will be is very much still to be determined.
-
-
-[Fig]: https://github.com/withfig/autocomplete
-[Warp]: https://www.warp.dev/
-[workflows]: https://docs.warp.dev/features/workflows
-[also working on workflows]: https://fig.io/user-manual/workflows
-[winget script]: https://github.com/microsoft/PowerToys/blob/main/.github/workflows/package-submissions.yml
-[#1595]: https://github.com/microsoft/terminal/issues/1595
-[#7039]: https://github.com/microsoft/terminal/issues/7039
-[#3121]: https://github.com/microsoft/terminal/issues/3121
-[#10436]: https://github.com/microsoft/terminal/issues/10436
-[#12927]: https://github.com/microsoft/terminal/issues/12927
-[#12863]: https://github.com/microsoft/terminal/issues/12863
-[#7285]: https://github.com/microsoft/terminal/issues/7285
-[#14939]: https://github.com/microsoft/terminal/issues/7285
-
-[#keep]: https://github.com/zadjii/keep
-[VsCode Tasks]: https://github.com/microsoft/terminal/blob/main/.vscode/tasks.json
-
-<!-- Note: This is its own spec in progress, but for the time being #12862 will do -->
-[Tasks]: https://github.com/microsoft/terminal/issues/12862
-<!-- Note: This is just a link to the PR that introduced the shell integration spec -->
-[shell integration]: https://github.com/microsoft/terminal/pull/14792
-<!-- Note: If I ever write a spec for this, go ahead and replace this link -->
-[shell-driven autocompletion]: https://github.com/microsoft/terminal/issues/3121

oss/libpopcnt/libpopcnt.h

@@ -95,7 +95,7 @@
   #define HAVE_AVX512
 #endif
 
-#if defined(X86_OR_X64) && !defined(_M_ARM64EC)
+#if defined(X86_OR_X64)
   /* MSVC compatible compilers (Windows) */
   #if defined(_MSC_VER)
     /* clang-cl (LLVM 10 from 2020) requires /arch:AVX2 or

src/buffer/out/OutputCellIterator.cpp

@@ -11,7 +11,7 @@
 #include "../../types/inc/GlyphWidth.hpp"
 #include "../../inc/conattrs.hpp"
 
-static constexpr TextAttribute InvalidTextAttribute{ INVALID_COLOR, INVALID_COLOR, INVALID_COLOR };
+static constexpr TextAttribute InvalidTextAttribute{ INVALID_COLOR, INVALID_COLOR };
 
 // Routine Description:
 // - This is a fill-mode iterator for one particular wchar. It will repeat forever if fillLimit is 0.

src/buffer/out/Row.cpp

@@ -152,15 +152,11 @@ til::CoordType CharToColumnMapper::GetTrailingColumnAt(ptrdiff_t offset) noexcep
     return col;
 }
 
-// If given a pointer inside the ROW's text buffer, this function will return the corresponding column.
-// This function in particular returns the glyph's first column.
 til::CoordType CharToColumnMapper::GetLeadingColumnAt(const wchar_t* str) noexcept
 {
     return GetLeadingColumnAt(str - _chars);
 }
 
-// If given a pointer inside the ROW's text buffer, this function will return the corresponding column.
-// This function in particular returns the glyph's last column (this matters for wide glyphs).
 til::CoordType CharToColumnMapper::GetTrailingColumnAt(const wchar_t* str) noexcept
 {
     return GetTrailingColumnAt(str - _chars);
@@ -368,16 +364,11 @@ void ROW::TransferAttributes(const til::small_rle<TextAttribute, uint16_t, 1>& a
 
 void ROW::CopyFrom(const ROW& source)
 {
+    RowCopyTextFromState state{ .source = source };
+    CopyTextFrom(state);
+    TransferAttributes(source.Attributes(), _columnCount);
     _lineRendition = source._lineRendition;
     _wrapForced = source._wrapForced;
-
-    RowCopyTextFromState state{
-        .source = source,
-        .sourceColumnLimit = source.GetReadableColumnCount(),
-    };
-    CopyTextFrom(state);
-
-    TransferAttributes(source.Attributes(), _columnCount);
 }
 
 // Returns the previous possible cursor position, preceding the given column.
@@ -391,17 +382,7 @@ til::CoordType ROW::NavigateToPrevious(til::CoordType column) const noexcept
 // Returns the row width if column is beyond the width of the row.
 til::CoordType ROW::NavigateToNext(til::CoordType column) const noexcept
 {
-    return _adjustForward(_clampedColumnInclusive(column + 1));
-}
-
-// Returns the starting column of the glyph at the given column.
-// In other words, if you have 3 wide glyphs
-//   AA BB CC
-//   01 23 45  <-- column
-// then `AdjustToGlyphStart(3)` returns 2.
-til::CoordType ROW::AdjustToGlyphStart(til::CoordType column) const noexcept
-{
-    return _adjustBackward(_clampedColumn(column));
+    return _adjustForward(_clampedColumn(column + 1));
 }
 
 // Routine Description:
@@ -738,12 +719,11 @@ try
     if (sourceColBeg < sourceColLimit)
     {
         charOffsets = source._charOffsets.subspan(sourceColBeg, static_cast<size_t>(sourceColLimit) - sourceColBeg + 1);
-        const auto beg = size_t{ charOffsets.front() } & CharOffsetsMask;
-        const auto end = size_t{ charOffsets.back() } & CharOffsetsMask;
+        const auto charsOffset = charOffsets.front() & CharOffsetsMask;
         // We _are_ using span. But C++ decided that string_view and span aren't convertible.
         // _chars is a std::span for performance and because it refers to raw, shared memory.
 #pragma warning(suppress : 26481) // Don't use pointer arithmetic. Use span instead (bounds.1).
-        chars = { source._chars.data() + beg, end - beg };
+        chars = { source._chars.data() + charsOffset, source._chars.size() - charsOffset };
     }
 
     WriteHelper h{ *this, state.columnBegin, state.columnLimit, chars };
@@ -959,16 +939,6 @@ til::CoordType ROW::MeasureLeft() const noexcept
 
 til::CoordType ROW::MeasureRight() const noexcept
 {
-    if (_wrapForced)
-    {
-        auto width = _columnCount;
-        if (_doubleBytePadded)
-        {
-            width--;
-        }
-        return width;
-    }
-
     const auto text = GetText();
     const auto beg = text.begin();
     const auto end = text.end();

src/buffer/out/Row.hpp

@@ -136,7 +136,6 @@ public:
 
     til::CoordType NavigateToPrevious(til::CoordType column) const noexcept;
     til::CoordType NavigateToNext(til::CoordType column) const noexcept;
-    til::CoordType AdjustToGlyphStart(til::CoordType column) const noexcept;
 
     void ClearCell(til::CoordType column);
     OutputCellIterator WriteCells(OutputCellIterator it, til::CoordType columnBegin, std::optional<bool> wrap = std::nullopt, std::optional<til::CoordType> limitRight = std::nullopt);

src/buffer/out/TextAttribute.cpp

@@ -7,7 +7,7 @@
 
 // Keeping TextColor compact helps us keeping TextAttribute compact,
 // which in turn ensures that our buffer memory usage is low.
-static_assert(sizeof(TextAttribute) == 16);
+static_assert(sizeof(TextAttribute) == 12);
 static_assert(alignof(TextAttribute) == 2);
 // Ensure that we can memcpy() and memmove() the struct for performance.
 static_assert(std::is_trivially_copyable_v<TextAttribute>);
@@ -156,25 +156,6 @@ uint16_t TextAttribute::GetHyperlinkId() const noexcept
     return _hyperlinkId;
 }
 
-TextColor TextAttribute::GetUnderlineColor() const noexcept
-{
-    return _underlineColor;
-}
-
-// Method description:
-// - Retrieves the underline style of the text.
-// - If the attribute is not the **current** attribute of the text buffer,
-//   (eg. reading an attribute from another part of the text buffer, which
-//   was modified using DECRARA), this might return an invalid style. In this
-//   case, treat the style as singly underlined.
-// Return value:
-// - The underline style.
-UnderlineStyle TextAttribute::GetUnderlineStyle() const noexcept
-{
-    const auto styleAttr = WI_EnumValue(_attrs & CharacterAttributes::UnderlineStyle);
-    return static_cast<UnderlineStyle>(styleAttr >> UNDERLINE_STYLE_SHIFT);
-}
-
 void TextAttribute::SetForeground(const TextColor foreground) noexcept
 {
     _foreground = foreground;
@@ -185,13 +166,6 @@ void TextAttribute::SetBackground(const TextColor background) noexcept
     _background = background;
 }
 
-void TextAttribute::SetUnderlineColor(const TextColor color) noexcept
-{
-    // Index16 colors are not supported for underline colors.
-    assert(!color.IsIndex16());
-    _underlineColor = color;
-}
-
 void TextAttribute::SetForeground(const COLORREF rgbForeground) noexcept
 {
     _foreground = TextColor(rgbForeground);
@@ -303,12 +277,14 @@ bool TextAttribute::IsCrossedOut() const noexcept
     return WI_IsFlagSet(_attrs, CharacterAttributes::CrossedOut);
 }
 
-// Method description:
-// - Returns true if the text is underlined with any underline style.
 bool TextAttribute::IsUnderlined() const noexcept
 {
-    const auto style = GetUnderlineStyle();
-    return (style != UnderlineStyle::NoUnderline);
+    return WI_IsFlagSet(_attrs, CharacterAttributes::Underlined);
+}
+
+bool TextAttribute::IsDoublyUnderlined() const noexcept
+{
+    return WI_IsFlagSet(_attrs, CharacterAttributes::DoublyUnderlined);
 }
 
 bool TextAttribute::IsOverlined() const noexcept
@@ -356,14 +332,14 @@ void TextAttribute::SetCrossedOut(bool isCrossedOut) noexcept
     WI_UpdateFlag(_attrs, CharacterAttributes::CrossedOut, isCrossedOut);
 }
 
-// Method description:
-// - Sets underline style to singly, doubly, or one of the extended styles.
-// Arguments:
-// - style - underline style to set.
-void TextAttribute::SetUnderlineStyle(const UnderlineStyle style) noexcept
+void TextAttribute::SetUnderlined(bool isUnderlined) noexcept
 {
-    const auto shiftedStyle = WI_EnumValue(style) << UNDERLINE_STYLE_SHIFT;
-    _attrs = (_attrs & ~CharacterAttributes::UnderlineStyle) | static_cast<CharacterAttributes>(shiftedStyle);
+    WI_UpdateFlag(_attrs, CharacterAttributes::Underlined, isUnderlined);
+}
+
+void TextAttribute::SetDoublyUnderlined(bool isDoublyUnderlined) noexcept
+{
+    WI_UpdateFlag(_attrs, CharacterAttributes::DoublyUnderlined, isDoublyUnderlined);
 }
 
 void TextAttribute::SetOverlined(bool isOverlined) noexcept
@@ -398,11 +374,6 @@ void TextAttribute::SetDefaultBackground() noexcept
     _background = TextColor();
 }
 
-void TextAttribute::SetDefaultUnderlineColor() noexcept
-{
-    _underlineColor = TextColor{};
-}
-
 // Method description:
 // - Resets only the rendition character attributes, which includes everything
 //     except the Protected attribute.

src/buffer/out/TextAttribute.hpp

@@ -27,17 +27,6 @@ Revision History:
 #include "WexTestClass.h"
 #endif
 
-enum class UnderlineStyle
-{
-    NoUnderline = 0U,
-    SinglyUnderlined = 1U,
-    DoublyUnderlined = 2U,
-    CurlyUnderlined = 3U,
-    DottedUnderlined = 4U,
-    DashedUnderlined = 5U,
-    Max = DashedUnderlined
-};
-
 class TextAttribute final
 {
 public:
@@ -45,8 +34,7 @@ public:
         _attrs{ CharacterAttributes::Normal },
         _foreground{},
         _background{},
-        _hyperlinkId{ 0 },
-        _underlineColor{}
+        _hyperlinkId{ 0 }
     {
     }
 
@@ -54,28 +42,16 @@ public:
         _attrs{ gsl::narrow_cast<WORD>(wLegacyAttr & USED_META_ATTRS) },
         _foreground{ gsl::at(s_legacyForegroundColorMap, wLegacyAttr & FG_ATTRS) },
         _background{ gsl::at(s_legacyBackgroundColorMap, (wLegacyAttr & BG_ATTRS) >> 4) },
-        _hyperlinkId{ 0 },
-        _underlineColor{}
+        _hyperlinkId{ 0 }
     {
     }
 
     constexpr TextAttribute(const COLORREF rgbForeground,
-                            const COLORREF rgbBackground,
-                            const COLORREF rgbUnderline = INVALID_COLOR) noexcept :
+                            const COLORREF rgbBackground) noexcept :
         _attrs{ CharacterAttributes::Normal },
         _foreground{ rgbForeground },
         _background{ rgbBackground },
-        _hyperlinkId{ 0 },
-        _underlineColor{ rgbUnderline }
-    {
-    }
-
-    constexpr TextAttribute(const CharacterAttributes attrs, const TextColor foreground, const TextColor background, const uint16_t hyperlinkId, const TextColor underlineColor) noexcept :
-        _attrs{ attrs },
-        _foreground{ foreground },
-        _background{ background },
-        _hyperlinkId{ hyperlinkId },
-        _underlineColor{ underlineColor }
+        _hyperlinkId{ 0 }
     {
     }
 
@@ -111,6 +87,7 @@ public:
     bool IsInvisible() const noexcept;
     bool IsCrossedOut() const noexcept;
     bool IsUnderlined() const noexcept;
+    bool IsDoublyUnderlined() const noexcept;
     bool IsOverlined() const noexcept;
     bool IsReverseVideo() const noexcept;
     bool IsProtected() const noexcept;
@@ -121,7 +98,8 @@ public:
     void SetBlinking(bool isBlinking) noexcept;
     void SetInvisible(bool isInvisible) noexcept;
     void SetCrossedOut(bool isCrossedOut) noexcept;
-    void SetUnderlineStyle(const UnderlineStyle underlineStyle) noexcept;
+    void SetUnderlined(bool isUnderlined) noexcept;
+    void SetDoublyUnderlined(bool isDoublyUnderlined) noexcept;
     void SetOverlined(bool isOverlined) noexcept;
     void SetReverseVideo(bool isReversed) noexcept;
     void SetProtected(bool isProtected) noexcept;
@@ -140,11 +118,8 @@ public:
     TextColor GetForeground() const noexcept;
     TextColor GetBackground() const noexcept;
     uint16_t GetHyperlinkId() const noexcept;
-    TextColor GetUnderlineColor() const noexcept;
-    UnderlineStyle GetUnderlineStyle() const noexcept;
     void SetForeground(const TextColor foreground) noexcept;
     void SetBackground(const TextColor background) noexcept;
-    void SetUnderlineColor(const TextColor color) noexcept;
     void SetForeground(const COLORREF rgbForeground) noexcept;
     void SetBackground(const COLORREF rgbBackground) noexcept;
     void SetIndexedForeground(const BYTE fgIndex) noexcept;
@@ -156,7 +131,6 @@ public:
 
     void SetDefaultForeground() noexcept;
     void SetDefaultBackground() noexcept;
-    void SetDefaultUnderlineColor() noexcept;
     void SetDefaultRenditionAttributes() noexcept;
 
     bool BackgroundIsDefault() const noexcept;
@@ -173,8 +147,8 @@ public:
         // global ^ local == false: the foreground attribute is the visible foreground, so we care about the backgrounds being identical
         const auto checkForeground = (inverted != IsReverseVideo());
         return !IsAnyGridLineEnabled() && // grid lines have a visual representation
-               // styled underline and crossed out have a visual representation
-               !IsUnderlined() && WI_IsFlagClear(_attrs, CharacterAttributes::CrossedOut) &&
+               // crossed out, doubly and singly underlined have a visual representation
+               WI_AreAllFlagsClear(_attrs, CharacterAttributes::CrossedOut | CharacterAttributes::DoublyUnderlined | CharacterAttributes::Underlined) &&
                // hyperlinks have a visual representation
                !IsHyperlink() &&
                // all other attributes do not have a visual representation
@@ -201,7 +175,6 @@ private:
     uint16_t _hyperlinkId; // sizeof: 2, alignof: 2
     TextColor _foreground; // sizeof: 4, alignof: 1
     TextColor _background; // sizeof: 4, alignof: 1
-    TextColor _underlineColor; // sizeof: 4, alignof: 1
 
 #ifdef UNIT_TESTING
     friend class TextBufferTests;

src/buffer/out/search.cpp

@@ -14,15 +14,16 @@ bool Search::ResetIfStale(Microsoft::Console::Render::IRenderData& renderData, c
     const auto lastMutationId = textBuffer.GetLastMutationId();
 
     if (_needle == needle &&
+        _reverse == reverse &&
         _caseInsensitive == caseInsensitive &&
         _lastMutationId == lastMutationId)
     {
-        _step = reverse ? -1 : 1;
         return false;
     }
 
     _renderData = &renderData;
     _needle = needle;
+    _reverse = reverse;
     _caseInsensitive = caseInsensitive;
     _lastMutationId = lastMutationId;
 
@@ -33,40 +34,14 @@ bool Search::ResetIfStale(Microsoft::Console::Render::IRenderData& renderData, c
     return true;
 }
 
-void Search::MoveToCurrentSelection()
+void Search::MovePastCurrentSelection()
 {
     if (_renderData->IsSelectionActive())
     {
-        MoveToPoint(_renderData->GetTextBuffer().ScreenToBufferPosition(_renderData->GetSelectionAnchor()));
+        MovePastPoint(_renderData->GetTextBuffer().ScreenToBufferPosition(_renderData->GetSelectionAnchor()));
     }
 }
 
-void Search::MoveToPoint(const til::point anchor) noexcept
-{
-    if (_results.empty())
-    {
-        return;
-    }
-
-    const auto count = gsl::narrow_cast<ptrdiff_t>(_results.size());
-    ptrdiff_t index = 0;
-
-    if (_step < 0)
-    {
-        for (index = count - 1; index >= 0 && til::at(_results, index).start > anchor; --index)
-        {
-        }
-    }
-    else
-    {
-        for (index = 0; index < count && til::at(_results, index).start < anchor; ++index)
-        {
-        }
-    }
-
-    _index = (index + count) % count;
-}
-
 void Search::MovePastPoint(const til::point anchor) noexcept
 {
     if (_results.empty())
@@ -75,17 +50,18 @@ void Search::MovePastPoint(const til::point anchor) noexcept
     }
 
     const auto count = gsl::narrow_cast<ptrdiff_t>(_results.size());
-    ptrdiff_t index = 0;
+    const auto highestIndex = count - 1;
+    auto index = _reverse ? highestIndex : 0;
 
-    if (_step < 0)
+    if (_reverse)
     {
-        for (index = count - 1; index >= 0 && til::at(_results, index).start >= anchor; --index)
+        for (; index >= 0 && til::at(_results, index).start >= anchor; --index)
         {
         }
     }
     else
     {
-        for (index = 0; index < count && til::at(_results, index).start <= anchor; ++index)
+        for (; index <= highestIndex && til::at(_results, index).start <= anchor; ++index)
         {
         }
     }
@@ -95,10 +71,8 @@ void Search::MovePastPoint(const til::point anchor) noexcept
 
 void Search::FindNext() noexcept
 {
-    if (const auto count{ gsl::narrow_cast<ptrdiff_t>(_results.size()) })
-    {
-        _index = (_index + _step + count) % count;
-    }
+    const auto count = gsl::narrow_cast<ptrdiff_t>(_results.size());
+    _index = (_index + _step + count) % count;
 }
 
 const til::point_span* Search::GetCurrent() const noexcept
@@ -113,7 +87,6 @@ const til::point_span* Search::GetCurrent() const noexcept
 
 // Routine Description:
 // - Takes the found word and selects it in the screen buffer
-
 bool Search::SelectCurrent() const
 {
     if (const auto s = GetCurrent())
@@ -129,13 +102,3 @@ bool Search::SelectCurrent() const
 
     return false;
 }
-
-const std::vector<til::point_span>& Search::Results() const noexcept
-{
-    return _results;
-}
-
-ptrdiff_t Search::CurrentMatch() const noexcept
-{
-    return _index;
-}

src/buffer/out/search.h

@@ -27,21 +27,18 @@ public:
 
     bool ResetIfStale(Microsoft::Console::Render::IRenderData& renderData, const std::wstring_view& needle, bool reverse, bool caseInsensitive);
 
-    void MoveToCurrentSelection();
-    void MoveToPoint(til::point anchor) noexcept;
+    void MovePastCurrentSelection();
     void MovePastPoint(til::point anchor) noexcept;
     void FindNext() noexcept;
 
     const til::point_span* GetCurrent() const noexcept;
     bool SelectCurrent() const;
 
-    const std::vector<til::point_span>& Results() const noexcept;
-    ptrdiff_t CurrentMatch() const noexcept;
-
 private:
     // _renderData is a pointer so that Search() is constexpr default constructable.
     Microsoft::Console::Render::IRenderData* _renderData = nullptr;
-    std::wstring _needle;
+    std::wstring_view _needle;
+    bool _reverse = false;
     bool _caseInsensitive = false;
     uint64_t _lastMutationId = 0;
 

src/buffer/out/textBuffer.cpp

@@ -416,88 +416,6 @@ size_t TextBuffer::GraphemePrev(const std::wstring_view& chars, size_t position)
     return til::utf16_iterate_prev(chars, position);
 }
 
-// Ever wondered how much space a piece of text needs before inserting it? This function will tell you!
-// It fundamentally behaves identical to the various ROW functions around `RowWriteState`.
-//
-// Set `columnLimit` to the amount of space that's available (e.g. `buffer_width - cursor_position.x`)
-// and it'll return the amount of characters that fit into this space. The out parameter `columns`
-// will contain the amount of columns this piece of text has actually used.
-//
-// Just like with `RowWriteState` one special case is when not all text fits into the given space:
-// In that case, this function always returns exactly `columnLimit`. This distinction is important when "inserting"
-// a wide glyph but there's only 1 column left. That 1 remaining column is supposed to be padded with whitespace.
-size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::CoordType columnLimit, til::CoordType& columns) noexcept
-{
-    columnLimit = std::max(0, columnLimit);
-
-    const auto beg = chars.begin();
-    const auto end = chars.end();
-    auto it = beg;
-    const auto asciiEnd = beg + std::min(chars.size(), gsl::narrow_cast<size_t>(columnLimit));
-
-    // ASCII fast-path: 1 char always corresponds to 1 column.
-    for (; it != asciiEnd && *it < 0x80; ++it)
-    {
-    }
-
-    const auto dist = gsl::narrow_cast<size_t>(it - beg);
-    auto col = gsl::narrow_cast<til::CoordType>(dist);
-
-    if (it == asciiEnd) [[likely]]
-    {
-        columns = col;
-        return dist;
-    }
-
-    // Unicode slow-path where we need to count text and columns separately.
-    for (;;)
-    {
-        auto ptr = &*it;
-        const auto wch = *ptr;
-        size_t len = 1;
-
-        col++;
-
-        // Even in our slow-path we can avoid calling IsGlyphFullWidth if the current character is ASCII.
-        // It also allows us to skip the surrogate pair decoding at the same time.
-        if (wch >= 0x80)
-        {
-            if (til::is_surrogate(wch))
-            {
-                const auto it2 = it + 1;
-                if (til::is_leading_surrogate(wch) && it2 != end && til::is_trailing_surrogate(*it2))
-                {
-                    len = 2;
-                }
-                else
-                {
-                    ptr = &UNICODE_REPLACEMENT;
-                }
-            }
-
-            col += IsGlyphFullWidth({ ptr, len });
-        }
-
-        // 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)
-        {
-            columns = columnLimit;
-            return gsl::narrow_cast<size_t>(it - beg);
-        }
-
-        // But if we simply ran out of text we just need to return the actual number of columns.
-        it += len;
-        if (it == end)
-        {
-            columns = col;
-            return chars.size();
-        }
-    }
-}
-
 // Pretend as if `position` is a regular cursor in the TextBuffer.
 // This function will then pretend as if you pressed the left/right arrow
 // keys `distance` amount of times (negative = left, positive = right).
@@ -888,9 +806,9 @@ void TextBuffer::IncrementCircularBuffer(const TextAttribute& fillAttributes)
 // - The viewport
 //Return value:
 // - Coordinate position (relative to the text buffer)
-til::point TextBuffer::GetLastNonSpaceCharacter(const Viewport* viewOptional) const
+til::point TextBuffer::GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional) const
 {
-    const auto viewport = viewOptional ? *viewOptional : GetSize();
+    const auto viewport = viewOptional.has_value() ? viewOptional.value() : GetSize();
 
     til::point coordEndOfText;
     // Search the given viewport by starting at the bottom.
@@ -1152,40 +1070,46 @@ void TextBuffer::Reset() noexcept
 // - newSize - new size of screen.
 // Return Value:
 // - Success if successful. Invalid parameter if screen buffer size is unexpected. No memory if allocation failed.
-void TextBuffer::ResizeTraditional(til::size newSize)
+[[nodiscard]] NTSTATUS TextBuffer::ResizeTraditional(til::size newSize) noexcept
 {
     // Guard against resizing the text buffer to 0 columns/rows, which would break being able to insert text.
     newSize.width = std::max(newSize.width, 1);
     newSize.height = std::max(newSize.height, 1);
 
-    TextBuffer newBuffer{ newSize, _currentAttributes, 0, false, _renderer };
-    const auto cursorRow = GetCursor().GetPosition().y;
-    const auto copyableRows = std::min<til::CoordType>(_height, newSize.height);
-    til::CoordType srcRow = 0;
-    til::CoordType dstRow = 0;
-
-    if (cursorRow >= newSize.height)
+    try
     {
-        srcRow = cursorRow - newSize.height + 1;
+        TextBuffer newBuffer{ newSize, _currentAttributes, 0, false, _renderer };
+        const auto cursorRow = GetCursor().GetPosition().y;
+        const auto copyableRows = std::min<til::CoordType>(_height, newSize.height);
+        til::CoordType srcRow = 0;
+        til::CoordType dstRow = 0;
+
+        if (cursorRow >= newSize.height)
+        {
+            srcRow = cursorRow - newSize.height + 1;
+        }
+
+        for (; dstRow < copyableRows; ++dstRow, ++srcRow)
+        {
+            newBuffer.GetMutableRowByOffset(dstRow).CopyFrom(GetRowByOffset(srcRow));
+        }
+
+        // NOTE: Keep this in sync with _reserve().
+        _buffer = std::move(newBuffer._buffer);
+        _bufferEnd = newBuffer._bufferEnd;
+        _commitWatermark = newBuffer._commitWatermark;
+        _initialAttributes = newBuffer._initialAttributes;
+        _bufferRowStride = newBuffer._bufferRowStride;
+        _bufferOffsetChars = newBuffer._bufferOffsetChars;
+        _bufferOffsetCharOffsets = newBuffer._bufferOffsetCharOffsets;
+        _width = newBuffer._width;
+        _height = newBuffer._height;
+
+        _SetFirstRowIndex(0);
     }
+    CATCH_RETURN();
 
-    for (; dstRow < copyableRows; ++dstRow, ++srcRow)
-    {
-        newBuffer.GetMutableRowByOffset(dstRow).CopyFrom(GetRowByOffset(srcRow));
-    }
-
-    // NOTE: Keep this in sync with _reserve().
-    _buffer = std::move(newBuffer._buffer);
-    _bufferEnd = newBuffer._bufferEnd;
-    _commitWatermark = newBuffer._commitWatermark;
-    _initialAttributes = newBuffer._initialAttributes;
-    _bufferRowStride = newBuffer._bufferRowStride;
-    _bufferOffsetChars = newBuffer._bufferOffsetChars;
-    _bufferOffsetCharOffsets = newBuffer._bufferOffsetCharOffsets;
-    _width = newBuffer._width;
-    _height = newBuffer._height;
-
-    _SetFirstRowIndex(0);
+    return S_OK;
 }
 
 void TextBuffer::SetAsActiveBuffer(const bool isActiveBuffer) noexcept
@@ -2277,7 +2201,6 @@ std::string TextBuffer::GenHTML(const TextAndColor& rows,
 // Routine Description:
 // - Generates an RTF document based on the passed in text and color data
 //   RTF 1.5 Spec: https://www.biblioscape.com/rtf15_spec.htm
-//   RTF 1.9.1 Spec: https://msopenspecs.azureedge.net/files/Archive_References/[MSFT-RTF].pdf
 // Arguments:
 // - rows - the text and color data we will format & encapsulate
 // - backgroundColor - default background color for characters, also used in padding
@@ -2297,18 +2220,10 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi
 
         // Standard RTF header.
         // This is similar to the header generated by WordPad.
-        // \ansi:
-        //   Specifies that the ANSI char set is used in the current doc.
-        // \ansicpg1252:
-        //   Represents the ANSI code page which is used to perform
-        //   the Unicode to ANSI conversion when writing RTF text.
-        // \deff0:
-        //   Specifies that the default font for the document is the one
-        //   at index 0 in the font table.
-        // \nouicompat:
-        //   Some features are blocked by default to maintain compatibility
-        //   with older programs (Eg. Word 97-2003). `nouicompat` disables this
-        //   behavior, and unblocks these features. See: Spec 1.9.1, Pg. 51.
+        // \ansi - specifies that the ANSI char set is used in the current doc
+        // \ansicpg1252 - represents the ANSI code page which is used to perform the Unicode to ANSI conversion when writing RTF text
+        // \deff0 - specifies that the default font for the document is the one at index 0 in the font table
+        // \nouicompat - ?
         rtfBuilder << "\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat";
 
         // font table
@@ -2317,25 +2232,17 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi
         // map to keep track of colors:
         // keys are colors represented by COLORREF
         // values are indices of the corresponding colors in the color table
-        std::unordered_map<COLORREF, size_t> colorMap;
+        std::unordered_map<COLORREF, int> colorMap;
+        auto nextColorIndex = 1; // leave 0 for the default color and start from 1.
 
         // RTF color table
         std::ostringstream colorTableBuilder;
         colorTableBuilder << "{\\colortbl ;";
-
-        const auto getColorTableIndex = [&](const COLORREF color) -> size_t {
-            // Exclude the 0 index for the default color, and start with 1.
-
-            const auto [it, inserted] = colorMap.emplace(color, colorMap.size() + 1);
-            if (inserted)
-            {
-                colorTableBuilder << "\\red" << static_cast<int>(GetRValue(color))
-                                  << "\\green" << static_cast<int>(GetGValue(color))
-                                  << "\\blue" << static_cast<int>(GetBValue(color))
-                                  << ";";
-            }
-            return it->second;
-        };
+        colorTableBuilder << "\\red" << static_cast<int>(GetRValue(backgroundColor))
+                          << "\\green" << static_cast<int>(GetGValue(backgroundColor))
+                          << "\\blue" << static_cast<int>(GetBValue(backgroundColor))
+                          << ";";
+        colorMap[backgroundColor] = nextColorIndex++;
 
         // content
         std::ostringstream contentBuilder;
@@ -2345,12 +2252,7 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi
         // \fs specifies font size in half-points i.e. \fs20 results in a font size
         // of 10 pts. That's why, font size is multiplied by 2 here.
         contentBuilder << "\\pard\\slmult1\\f0\\fs" << std::to_string(2 * fontHeightPoints)
-                       // Set the background color for the page. But, the
-                       // standard way (\cbN) to do this isn't supported in Word.
-                       // However, the following control words sequence works
-                       // in Word (and other RTF editors also) for applying the
-                       // text background color. See: Spec 1.9.1, Pg. 23.
-                       << "\\chshdng0\\chcbpat" << getColorTableIndex(backgroundColor)
+                       << "\\highlight1"
                        << " ";
 
         std::optional<COLORREF> fgColor = std::nullopt;
@@ -2400,8 +2302,43 @@ std::string TextBuffer::GenRTF(const TextAndColor& rows, const int fontHeightPoi
                 if (colorChanged)
                 {
                     writeAccumulatedChars(false);
-                    contentBuilder << "\\chshdng0\\chcbpat" << getColorTableIndex(bkColor.value())
-                                   << "\\cf" << getColorTableIndex(fgColor.value())
+
+                    auto bkColorIndex = 0;
+                    if (colorMap.find(bkColor.value()) != colorMap.end())
+                    {
+                        // color already exists in the map, just retrieve the index
+                        bkColorIndex = colorMap[bkColor.value()];
+                    }
+                    else
+                    {
+                        // color not present in the map, so add it
+                        colorTableBuilder << "\\red" << static_cast<int>(GetRValue(bkColor.value()))
+                                          << "\\green" << static_cast<int>(GetGValue(bkColor.value()))
+                                          << "\\blue" << static_cast<int>(GetBValue(bkColor.value()))
+                                          << ";";
+                        colorMap[bkColor.value()] = nextColorIndex;
+                        bkColorIndex = nextColorIndex++;
+                    }
+
+                    auto fgColorIndex = 0;
+                    if (colorMap.find(fgColor.value()) != colorMap.end())
+                    {
+                        // color already exists in the map, just retrieve the index
+                        fgColorIndex = colorMap[fgColor.value()];
+                    }
+                    else
+                    {
+                        // color not present in the map, so add it
+                        colorTableBuilder << "\\red" << static_cast<int>(GetRValue(fgColor.value()))
+                                          << "\\green" << static_cast<int>(GetGValue(fgColor.value()))
+                                          << "\\blue" << static_cast<int>(GetBValue(fgColor.value()))
+                                          << ";";
+                        colorMap[fgColor.value()] = nextColorIndex;
+                        fgColorIndex = nextColorIndex++;
+                    }
+
+                    contentBuilder << "\\highlight" << bkColorIndex
+                                   << "\\cf" << fgColorIndex
                                    << " ";
                 }
 
@@ -2475,181 +2412,204 @@ void TextBuffer::_AppendRTFText(std::ostringstream& contentBuilder, const std::w
 //   the new buffer. The rows's new value is placed back into this parameter.
 // Return Value:
 // - S_OK if we successfully copied the contents to the new buffer, otherwise an appropriate HRESULT.
-void TextBuffer::Reflow(TextBuffer& oldBuffer, TextBuffer& newBuffer, const Viewport* lastCharacterViewport, PositionInformation* positionInfo)
+HRESULT TextBuffer::Reflow(TextBuffer& oldBuffer,
+                           TextBuffer& newBuffer,
+                           const std::optional<Viewport> lastCharacterViewport,
+                           std::optional<std::reference_wrapper<PositionInformation>> positionInfo)
+try
 {
     const auto& oldCursor = oldBuffer.GetCursor();
     auto& newCursor = newBuffer.GetCursor();
 
-    til::point oldCursorPos = oldCursor.GetPosition();
-    til::point newCursorPos;
+    // We need to save the old cursor position so that we can
+    // place the new cursor back on the equivalent character in
+    // the new buffer.
+    const auto cOldCursorPos = oldCursor.GetPosition();
+    const auto cOldLastChar = oldBuffer.GetLastNonSpaceCharacter(lastCharacterViewport);
 
-    // BODGY: We use oldCursorPos in two critical places below:
-    // * To compute an oldHeight that includes at a minimum the cursor row
-    // * For REFLOW_JANK_CURSOR_WRAP (see comment below)
-    // Both of these would break the reflow algorithm, but the latter of the two in particular
-    // would cause the main copy loop below to deadlock. In other words, these two lines
-    // protect this function against yet-unknown bugs in other parts of the code base.
-    oldCursorPos.x = std::clamp(oldCursorPos.x, 0, oldBuffer._width - 1);
-    oldCursorPos.y = std::clamp(oldCursorPos.y, 0, oldBuffer._height - 1);
+    const auto cOldRowsTotal = cOldLastChar.y + 1;
 
-    const auto lastRowWithText = oldBuffer.GetLastNonSpaceCharacter(lastCharacterViewport).y;
-
-    auto mutableViewportTop = positionInfo ? positionInfo->mutableViewportTop : til::CoordTypeMax;
-    auto visibleViewportTop = positionInfo ? positionInfo->visibleViewportTop : til::CoordTypeMax;
-
-    til::CoordType oldY = 0;
-    til::CoordType newY = 0;
-    til::CoordType newX = 0;
-    til::CoordType newWidth = newBuffer.GetSize().Width();
-    til::CoordType newYLimit = til::CoordTypeMax;
-
-    const auto oldHeight = std::max(lastRowWithText, oldCursorPos.y) + 1;
-    const auto newHeight = newBuffer.GetSize().Height();
-    const auto newWidthU16 = gsl::narrow_cast<uint16_t>(newWidth);
-
-    // Copy oldBuffer into newBuffer until oldBuffer has been fully consumed.
-    for (; oldY < oldHeight && newY < newYLimit; ++oldY)
+    til::point cNewCursorPos;
+    auto fFoundCursorPos = false;
+    auto foundOldMutable = false;
+    auto foundOldVisible = false;
+    // Loop through all the rows of the old buffer and reprint them into the new buffer
+    til::CoordType iOldRow = 0;
+    for (; iOldRow < cOldRowsTotal; iOldRow++)
     {
-        const auto& oldRow = oldBuffer.GetRowByOffset(oldY);
+        // Fetch the row and its "right" which is the last printable character.
+        const auto& row = oldBuffer.GetRowByOffset(iOldRow);
+        const auto cOldColsTotal = oldBuffer.GetLineWidth(iOldRow);
+        auto iRight = row.MeasureRight();
 
-        // A pair of double height rows should optimally wrap as a union (i.e. after wrapping there should be 4 lines).
-        // But for this initial implementation I chose the alternative approach: Just truncate them.
-        if (oldRow.GetLineRendition() != LineRendition::SingleWidth)
+        // If we're starting a new row, try and preserve the line rendition
+        // from the row in the original buffer.
+        const auto newBufferPos = newCursor.GetPosition();
+        if (newBufferPos.x == 0)
         {
-            // Since rows with a non-standard line rendition should be truncated it's important
-            // that we pretend as if the previous row ended in a newline, even if it didn't.
-            // This is what this if does: It newlines.
-            if (newX)
-            {
-                newX = 0;
-                newY++;
-            }
-
-            auto& newRow = newBuffer.GetMutableRowByOffset(newY);
-
-            // See the comment marked with "REFLOW_RESET".
-            if (newY >= newHeight)
-            {
-                newRow.Reset(newBuffer._initialAttributes);
-            }
-
-            newRow.CopyFrom(oldRow);
-            newRow.SetWrapForced(false);
-
-            if (oldY == oldCursorPos.y)
-            {
-                newCursorPos = { newRow.AdjustToGlyphStart(oldCursorPos.x), newY };
-            }
-            if (oldY >= mutableViewportTop)
-            {
-                positionInfo->mutableViewportTop = newY;
-                mutableViewportTop = til::CoordTypeMax;
-            }
-            if (oldY >= visibleViewportTop)
-            {
-                positionInfo->visibleViewportTop = newY;
-                visibleViewportTop = til::CoordTypeMax;
-            }
-
-            newY++;
-            continue;
+            auto& newRow = newBuffer.GetMutableRowByOffset(newBufferPos.y);
+            newRow.SetLineRendition(row.GetLineRendition());
         }
 
-        // Rows don't store any information for what column the last written character is in.
-        // We simply truncate all trailing whitespace in this implementation.
-        auto oldRowLimit = oldRow.MeasureRight();
-        if (oldY == oldCursorPos.y)
+        // There is a special case here. If the row has a "wrap"
+        // flag on it, but the right isn't equal to the width (one
+        // index past the final valid index in the row) then there
+        // were a bunch trailing of spaces in the row.
+        // (But the measuring functions for each row Left/Right do
+        // not count spaces as "displayable" so they're not
+        // included.)
+        // As such, adjust the "right" to be the width of the row
+        // to capture all these spaces
+        if (row.WasWrapForced())
         {
-            // REFLOW_JANK_CURSOR_WRAP:
-            // Pretending as if there's always at least whitespace in front of the cursor has the benefit that
-            // * the cursor retains its distance from any preceding text.
-            // * when a client application starts writing on this new, empty line,
-            //   enlarging the buffer unwraps the text onto the preceding line.
-            oldRowLimit = std::max(oldRowLimit, oldCursorPos.x + 1);
+            iRight = cOldColsTotal;
+
+            // And a combined special case.
+            // If we wrapped off the end of the row by adding a
+            // piece of padding because of a double byte LEADING
+            // character, then remove one from the "right" to
+            // leave this padding out of the copy process.
+            if (row.WasDoubleBytePadded())
+            {
+                iRight--;
+            }
         }
 
-        til::CoordType oldX = 0;
-
-        // Copy oldRow into newBuffer until oldRow has been fully consumed.
-        // We use a do-while loop to ensure that line wrapping occurs and
-        // that attributes are copied over even for seemingly empty rows.
-        do
+        // Loop through every character in the current row (up to
+        // the "right" boundary, which is one past the final valid
+        // character)
+        til::CoordType iOldCol = 0;
+        const auto copyRight = iRight;
+        for (; iOldCol < copyRight; iOldCol++)
         {
-            // This if condition handles line wrapping.
-            // Only if we write past the last column we should wrap and as such this if
-            // condition is in front of the text insertion code instead of behind it.
-            // A SetWrapForced of false implies an explicit newline, which is the default.
-            if (newX >= newWidth)
+            if (iOldCol == cOldCursorPos.x && iOldRow == cOldCursorPos.y)
             {
-                newBuffer.GetMutableRowByOffset(newY).SetWrapForced(true);
-                newX = 0;
-                newY++;
+                cNewCursorPos = newCursor.GetPosition();
+                fFoundCursorPos = true;
             }
 
-            // REFLOW_RESET:
-            // If we shrink the buffer vertically, for instance from 100 rows to 90 rows, we will write 10 rows in the
-            // new buffer twice. We need to reset them before copying text, or otherwise we'll see the previous contents.
-            // We don't need to be smart about this. Reset() is fast and shrinking doesn't occur often.
-            if (newY >= newHeight && newX == 0)
+            // TODO: MSFT: 19446208 - this should just use an iterator and the inserter...
+            const auto glyph = row.GlyphAt(iOldCol);
+            const auto dbcsAttr = row.DbcsAttrAt(iOldCol);
+            const auto textAttr = row.GetAttrByColumn(iOldCol);
+
+            newBuffer.InsertCharacter(glyph, dbcsAttr, textAttr);
+        }
+
+        // GH#32: Copy the attributes from the rest of the row into this new buffer.
+        // From where we are in the old buffer, to the end of the row, copy the
+        // remaining attributes.
+        // - if the old buffer is smaller than the new buffer, then just copy
+        //   what we have, as it was. We already copied all _text_ with colors,
+        //   but it's possible for someone to just put some color into the
+        //   buffer to the right of that without any text (as just spaces). The
+        //   buffer looks weird to the user when we resize and it starts losing
+        //   those colors, so we need to copy them over too... as long as there
+        //   is space. The last attr in the row will be extended to the end of
+        //   the row in the new buffer.
+        // - if the old buffer is WIDER, than we might have wrapped onto a new
+        //   line. Use the cursor's position's Y so that we know where the new
+        //   row is, and start writing at the cursor position. Again, the attr
+        //   in the last column of the old row will be extended to the end of the
+        //   row that the text was flowed onto.
+        //   - if the text in the old buffer didn't actually fill the whole
+        //     line in the new buffer, then we didn't wrap. That's fine. just
+        //     copy attributes from the old row till the end of the new row, and
+        //     move on.
+        const auto newRowY = newCursor.GetPosition().y;
+        auto& newRow = newBuffer.GetMutableRowByOffset(newRowY);
+        auto newAttrColumn = newCursor.GetPosition().x;
+        const auto newWidth = newBuffer.GetLineWidth(newRowY);
+        // Stop when we get to the end of the buffer width, or the new position
+        // for inserting an attr would be past the right of the new buffer.
+        for (auto copyAttrCol = iOldCol;
+             copyAttrCol < cOldColsTotal && newAttrColumn < newWidth;
+             copyAttrCol++, newAttrColumn++)
+        {
+            // TODO: MSFT: 19446208 - this should just use an iterator and the inserter...
+            const auto textAttr = row.GetAttrByColumn(copyAttrCol);
+            newRow.SetAttrToEnd(newAttrColumn, textAttr);
+        }
+
+        // If we found the old row that the caller was interested in, set the
+        // out value of that parameter to the cursor's current Y position (the
+        // new location of the _end_ of that row in the buffer).
+        if (positionInfo.has_value())
+        {
+            if (!foundOldMutable)
             {
-                // We need to ensure not to overwrite the row the cursor is on.
-                if (newY >= newYLimit)
+                if (iOldRow >= positionInfo.value().get().mutableViewportTop)
                 {
-                    break;
+                    positionInfo.value().get().mutableViewportTop = newCursor.GetPosition().y;
+                    foundOldMutable = true;
                 }
-                newBuffer.GetMutableRowByOffset(newY).Reset(newBuffer._initialAttributes);
             }
 
-            auto& newRow = newBuffer.GetMutableRowByOffset(newY);
-
-            RowCopyTextFromState state{
-                .source = oldRow,
-                .columnBegin = newX,
-                .columnLimit = til::CoordTypeMax,
-                .sourceColumnBegin = oldX,
-                .sourceColumnLimit = oldRowLimit,
-            };
-            newRow.CopyTextFrom(state);
-
-            const auto& oldAttr = oldRow.Attributes();
-            auto& newAttr = newRow.Attributes();
-            const auto attributes = oldAttr.slice(gsl::narrow_cast<uint16_t>(oldX), oldAttr.size());
-            newAttr.replace(gsl::narrow_cast<uint16_t>(newX), newAttr.size(), attributes);
-            newAttr.resize_trailing_extent(newWidthU16);
-
-            if (oldY == oldCursorPos.y && oldCursorPos.x >= oldX)
+            if (!foundOldVisible)
             {
-                // In theory AdjustToGlyphStart ensures we don't put the cursor on a trailing wide glyph.
-                // In practice I don't think that this can possibly happen. Better safe than sorry.
-                newCursorPos = { newRow.AdjustToGlyphStart(oldCursorPos.x - oldX + newX), newY };
-                // If there's so much text past the old cursor position that it doesn't fit into new buffer,
-                // then the new cursor position will be "lost", because it's overwritten by unrelated text.
-                // We have two choices how can handle this:
-                // * If the new cursor is at an y < 0, just put the cursor at (0,0)
-                // * Stop writing into the new buffer before we overwrite the new cursor position
-                // This implements the second option. There's no fundamental reason why this is better.
-                newYLimit = newY + newHeight;
-            }
-            if (oldY >= mutableViewportTop)
-            {
-                positionInfo->mutableViewportTop = newY;
-                mutableViewportTop = til::CoordTypeMax;
-            }
-            if (oldY >= visibleViewportTop)
-            {
-                positionInfo->visibleViewportTop = newY;
-                visibleViewportTop = til::CoordTypeMax;
+                if (iOldRow >= positionInfo.value().get().visibleViewportTop)
+                {
+                    positionInfo.value().get().visibleViewportTop = newCursor.GetPosition().y;
+                    foundOldVisible = true;
+                }
             }
+        }
 
-            oldX = state.sourceColumnEnd;
-            newX = state.columnEnd;
-        } while (oldX < oldRowLimit);
-
-        // If the row had an explicit newline we also need to newline. :)
-        if (!oldRow.WasWrapForced())
+        // If we didn't have a full row to copy, insert a new
+        // line into the new buffer.
+        // Only do so if we were not forced to wrap. If we did
+        // force a word wrap, then the existing line break was
+        // only because we ran out of space.
+        if (iRight < cOldColsTotal && !row.WasWrapForced())
         {
-            newX = 0;
-            newY++;
+            if (!fFoundCursorPos && (iRight == cOldCursorPos.x && iOldRow == cOldCursorPos.y))
+            {
+                cNewCursorPos = newCursor.GetPosition();
+                fFoundCursorPos = true;
+            }
+            // Only do this if it's not the final line in the buffer.
+            // On the final line, we want the cursor to sit
+            // where it is done printing for the cursor
+            // adjustment to follow.
+            if (iOldRow < cOldRowsTotal - 1)
+            {
+                newBuffer.NewlineCursor();
+            }
+            else
+            {
+                // If we are on the final line of the buffer, we have one more check.
+                // We got into this code path because we are at the right most column of a row in the old buffer
+                // that had a hard return (no wrap was forced).
+                // However, as we're inserting, the old row might have just barely fit into the new buffer and
+                // caused a new soft return (wrap was forced) putting the cursor at x=0 on the line just below.
+                // We need to preserve the memory of the hard return at this point by inserting one additional
+                // hard newline, otherwise we've lost that information.
+                // We only do this when the cursor has just barely poured over onto the next line so the hard return
+                // isn't covered by the soft one.
+                // e.g.
+                // The old line was:
+                // |aaaaaaaaaaaaaaaaaaa | with no wrap which means there was a newline after that final a.
+                // The cursor was here ^
+                // And the new line will be:
+                // |aaaaaaaaaaaaaaaaaaa| and show a wrap at the end
+                // |                   |
+                //  ^ and the cursor is now there.
+                // If we leave it like this, we've lost the newline information.
+                // So we insert one more newline so a continued reflow of this buffer by resizing larger will
+                // continue to look as the original output intended with the newline data.
+                // After this fix, it looks like this:
+                // |aaaaaaaaaaaaaaaaaaa| no wrap at the end (preserved hard newline)
+                // |                   |
+                //  ^ and the cursor is now here.
+                const auto coordNewCursor = newCursor.GetPosition();
+                if (coordNewCursor.x == 0 && coordNewCursor.y > 0)
+                {
+                    if (newBuffer.GetRowByOffset(coordNewCursor.y - 1).WasWrapForced())
+                    {
+                        newBuffer.NewlineCursor();
+                    }
+                }
+            }
         }
     }
 
@@ -2657,40 +2617,85 @@ void TextBuffer::Reflow(TextBuffer& oldBuffer, TextBuffer& newBuffer, const View
     // printable character. This is to fix the `color 2f` scenario, where you
     // change the buffer colors then resize and everything below the last
     // printable char gets reset. See GH #12567
-    const auto initializedRowsEnd = oldBuffer._estimateOffsetOfLastCommittedRow() + 1;
-    for (; oldY < initializedRowsEnd && newY < newHeight; oldY++, newY++)
+    auto newRowY = newCursor.GetPosition().y + 1;
+    const auto newHeight = newBuffer.GetSize().Height();
+    const auto oldHeight = oldBuffer._estimateOffsetOfLastCommittedRow() + 1;
+    for (;
+         iOldRow < oldHeight && newRowY < newHeight;
+         iOldRow++)
     {
-        auto& oldRow = oldBuffer.GetRowByOffset(oldY);
-        auto& newRow = newBuffer.GetMutableRowByOffset(newY);
-        auto& newAttr = newRow.Attributes();
-        newAttr = oldRow.Attributes();
-        newAttr.resize_trailing_extent(newWidthU16);
-    }
-
-    // Since we didn't use IncrementCircularBuffer() we need to compute the proper
-    // _firstRow offset now, in a way that replicates IncrementCircularBuffer().
-    // We need to do the same for newCursorPos.y for basically the same reason.
-    if (newY > newHeight)
-    {
-        newBuffer._firstRow = newY % newHeight;
-        // _firstRow maps from API coordinates that always start at 0,0 in the top left corner of the
-        // terminal's scrollback, to the underlying buffer Y coordinate via `(y + _firstRow) % height`.
-        // Here, we need to un-map the `newCursorPos.y` from the underlying Y coordinate to the API coordinate
-        // and so we do `(y - _firstRow) % height`, but we add `+ newHeight` to avoid getting negative results.
-        newCursorPos.y = (newCursorPos.y - newBuffer._firstRow + newHeight) % newHeight;
+        const auto& row = oldBuffer.GetRowByOffset(iOldRow);
+
+        // Optimization: Since all these rows are below the last printable char,
+        // we can reasonably assume that they are filled with just spaces.
+        // That's convenient, we can just copy the attr row from the old buffer
+        // into the new one, and resize the row to match. We'll rely on the
+        // behavior of ATTR_ROW::Resize to trim down when narrower, or extend
+        // the last attr when wider.
+        auto& newRow = newBuffer.GetMutableRowByOffset(newRowY);
+        const auto newWidth = newBuffer.GetLineWidth(newRowY);
+        newRow.TransferAttributes(row.Attributes(), newWidth);
+
+        newRowY++;
     }
 
+    // Finish copying remaining parameters from the old text buffer to the new one
     newBuffer.CopyProperties(oldBuffer);
     newBuffer.CopyHyperlinkMaps(oldBuffer);
 
-    assert(newCursorPos.x >= 0 && newCursorPos.x < newWidth);
-    assert(newCursorPos.y >= 0 && newCursorPos.y < newHeight);
-    newCursor.SetSize(oldCursor.GetSize());
-    newCursor.SetPosition(newCursorPos);
+    // If we found where to put the cursor while placing characters into the buffer,
+    //   just put the cursor there. Otherwise we have to advance manually.
+    if (fFoundCursorPos)
+    {
+        newCursor.SetPosition(cNewCursorPos);
+    }
+    else
+    {
+        // Advance the cursor to the same offset as before
+        // get the number of newlines and spaces between the old end of text and the old cursor,
+        //   then advance that many newlines and chars
+        auto iNewlines = cOldCursorPos.y - cOldLastChar.y;
+        const auto iIncrements = cOldCursorPos.x - cOldLastChar.x;
+        const auto cNewLastChar = newBuffer.GetLastNonSpaceCharacter();
+
+        // If the last row of the new buffer wrapped, there's going to be one less newline needed,
+        //   because the cursor is already on the next line
+        if (newBuffer.GetRowByOffset(cNewLastChar.y).WasWrapForced())
+        {
+            iNewlines = std::max(iNewlines - 1, 0);
+        }
+        else
+        {
+            // if this buffer didn't wrap, but the old one DID, then the d(columns) of the
+            //   old buffer will be one more than in this buffer, so new need one LESS.
+            if (oldBuffer.GetRowByOffset(cOldLastChar.y).WasWrapForced())
+            {
+                iNewlines = std::max(iNewlines - 1, 0);
+            }
+        }
+
+        for (auto r = 0; r < iNewlines; r++)
+        {
+            newBuffer.NewlineCursor();
+        }
+        for (auto c = 0; c < iIncrements - 1; c++)
+        {
+            newBuffer.IncrementCursor();
+        }
+    }
+
+    // Save old cursor size before we delete it
+    const auto ulSize = oldCursor.GetSize();
+
+    // Set size back to real size as it will be taking over the rendering duties.
+    newCursor.SetSize(ulSize);
 
     newBuffer._marks = oldBuffer._marks;
     newBuffer._trimMarksOutsideBuffer();
+
+    return S_OK;
 }
+CATCH_RETURN()
 
 // Method Description:
 // - Adds or updates a hyperlink in our hyperlink table
@@ -2911,10 +2916,14 @@ void TextBuffer::AddMark(const ScrollMark& m)
 
 void TextBuffer::_trimMarksOutsideBuffer()
 {
-    const til::CoordType height = _height;
-    std::erase_if(_marks, [height](const auto& m) {
-        return (m.start.y < 0) || (m.start.y >= height);
-    });
+    const auto height = GetSize().Height();
+    _marks.erase(std::remove_if(_marks.begin(),
+                                _marks.end(),
+                                [height](const auto& m) {
+                                    return (m.start.y < 0) ||
+                                           (m.start.y >= height);
+                                }),
+                 _marks.end());
 }
 
 std::wstring_view TextBuffer::CurrentCommand() const

src/buffer/out/textBuffer.hpp

@@ -137,7 +137,6 @@ public:
 
     static size_t GraphemeNext(const std::wstring_view& chars, size_t position) noexcept;
     static size_t GraphemePrev(const std::wstring_view& chars, size_t position) noexcept;
-    static size_t FitTextIntoColumns(const std::wstring_view& chars, til::CoordType columnLimit, til::CoordType& columns) noexcept;
 
     til::point NavigateCursor(til::point position, til::CoordType distance) const;
 
@@ -164,7 +163,7 @@ public:
     // Scroll needs access to this to quickly rotate around the buffer.
     void IncrementCircularBuffer(const TextAttribute& fillAttributes = {});
 
-    til::point GetLastNonSpaceCharacter(const Microsoft::Console::Types::Viewport* viewOptional = nullptr) const;
+    til::point GetLastNonSpaceCharacter(std::optional<const Microsoft::Console::Types::Viewport> viewOptional = std::nullopt) const;
 
     Cursor& GetCursor() noexcept;
     const Cursor& GetCursor() const noexcept;
@@ -195,7 +194,7 @@ public:
 
     void Reset() noexcept;
 
-    void ResizeTraditional(const til::size newSize);
+    [[nodiscard]] HRESULT ResizeTraditional(const til::size newSize) noexcept;
 
     void SetAsActiveBuffer(const bool isActiveBuffer) noexcept;
     bool IsActiveBuffer() const noexcept;
@@ -263,7 +262,10 @@ public:
         til::CoordType visibleViewportTop{ 0 };
     };
 
-    static void Reflow(TextBuffer& oldBuffer, TextBuffer& newBuffer, const Microsoft::Console::Types::Viewport* lastCharacterViewport = nullptr, PositionInformation* positionInfo = nullptr);
+    static HRESULT Reflow(TextBuffer& oldBuffer,
+                          TextBuffer& newBuffer,
+                          const std::optional<Microsoft::Console::Types::Viewport> lastCharacterViewport,
+                          std::optional<std::reference_wrapper<PositionInformation>> positionInfo);
 
     std::vector<til::point_span> SearchText(const std::wstring_view& needle, bool caseInsensitive) const;
     std::vector<til::point_span> SearchText(const std::wstring_view& needle, bool caseInsensitive, til::CoordType rowBeg, til::CoordType rowEnd) const;

src/buffer/out/ut_textbuffer/ReflowTests.cpp

@@ -46,6 +46,8 @@ namespace
         std::vector<TestBuffer> buffers;
     };
 
+    static constexpr auto true_due_to_exact_wrap_bug{ true };
+
     static const TestCase testCases[] = {
         TestCase{
             L"No reflow required",
@@ -59,7 +61,7 @@ namespace
                         { L"EFG   ", false },
                         { L"      ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
@@ -70,7 +72,7 @@ namespace
                         { L"EFG  ", false },
                         { L"     ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 4, 5 },
@@ -81,7 +83,7 @@ namespace
                         { L"EFG ", false },
                         { L"    ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
             },
         },
@@ -97,40 +99,40 @@ namespace
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
                     {
                         { L"ABCDE", true },
-                        { L"F    ", false },
-                        { L"$    ", false },
+                        { L"F$   ", false }, // [BUG] EXACT WRAP. $ should be alone on next line.
+                        { L"     ", false },
                         { L"     ", false },
                         { L"     ", false },
                     },
-                    { 0, 2 }, // cursor on $
+                    { 1, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 6, 5 }, // grow width back to original
                     {
-                        { L"ABCDEF", false },
+                        { L"ABCDEF", true_due_to_exact_wrap_bug },
                         { L"$     ", false },
                         { L"      ", false },
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 7, 5 }, // grow width wider than original
                     {
-                        { L"ABCDEF ", false },
-                        { L"$      ", false },
+                        { L"ABCDEF$", true_due_to_exact_wrap_bug }, // EXACT WRAP BUG: $ should be alone on next line
+                        { L"       ", false },
                         { L"       ", false },
                         { L"       ", false },
                         { L"       ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 6, 0 } // cursor on $
                 },
             },
         },
@@ -146,7 +148,7 @@ namespace
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 1, 1 }, // cursor on $
+                    { 1, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
@@ -157,7 +159,7 @@ namespace
                         { L"     ", false },
                         { L"     ", false },
                     },
-                    { 2, 1 }, // cursor on $
+                    { 2, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 6, 5 }, // grow width back to original
@@ -168,7 +170,7 @@ namespace
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 1, 1 }, // cursor on $
+                    { 1, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 7, 5 }, // grow width wider than original
@@ -179,7 +181,7 @@ namespace
                         { L"       ", false },
                         { L"       ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
             },
         },
@@ -195,29 +197,29 @@ namespace
                         { L"EFG   ", false },
                         { L"      ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 7, 5 }, // reduce width by 1
                     {
                         { L"AB    $", true },
-                        { L"     CD", false }, // CD ends with a newline -> .wrap = false
+                        { L"     CD", true_due_to_exact_wrap_bug },
+                        { L"       ", false },
                         { L"EFG    ", false },
                         { L"       ", false },
-                        { L"       ", false },
                     },
-                    { 6, 0 }, // cursor on $
+                    { 6, 0 } // cursor on $
                 },
                 TestBuffer{
                     { 8, 5 },
                     {
                         { L"AB    $ ", true },
-                        { L"    CD  ", false },
-                        { L"EFG     ", false },
+                        { L"    CD  ", false }, // Goes to false because we hit the end of ..CD
+                        { L"EFG     ", false }, // [BUG] EFG moves up due to exact wrap bug above
                         { L"        ", false },
                         { L"        ", false },
                     },
-                    { 6, 0 }, // cursor on $
+                    { 6, 0 } // cursor on $
                 },
             },
         },
@@ -234,19 +236,19 @@ namespace
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 2, 1 }, // cursor on $
+                    { 2, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
                     {
                         //--012345--
                         { L"カタ ", true }, // KA TA [FORCED SPACER]
-                        { L"カナ$", false }, // KA NA
+                        { L"カナ$", true_due_to_exact_wrap_bug }, // KA NA
                         { L"     ", false },
                         { L"     ", false },
                         { L"     ", false },
                     },
-                    { 4, 1 }, // cursor on $
+                    { 4, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 6, 5 }, // grow width back to original
@@ -258,7 +260,7 @@ namespace
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 2, 1 }, // cursor on $
+                    { 2, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 7, 5 }, // grow width wider than original (by one; no visible change!)
@@ -270,7 +272,7 @@ namespace
                         { L"       ", false },
                         { L"       ", false },
                     },
-                    { 2, 1 }, // cursor on $
+                    { 2, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 8, 5 }, // grow width enough to fit second DBCS
@@ -282,7 +284,7 @@ namespace
                         { L"        ", false },
                         { L"        ", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
             },
         },
@@ -298,29 +300,41 @@ namespace
                         { L"MNOPQR", false },
                         { L"STUVWX", false },
                     },
-                    { 0, 1 }, // cursor on $
+                    { 0, 1 } // cursor on $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
                     {
-                        { L"$    ", false },
-                        { L"GHIJK", true },
-                        { L"L    ", false },
-                        { L"MNOPQ", true },
-                        { L"R    ", false },
+                        { L"F$   ", false },
+                        { L"GHIJK", true }, // [BUG] We should see GHIJK\n L\n MNOPQ\n R\n
+                        { L"LMNOP", true }, // The wrapping here is irregular
+                        { L"QRSTU", true },
+                        { L"VWX  ", false },
                     },
-                    { 0, 0 },
+                    { 1, 1 } // [BUG] cursor moves to 1,1 instead of sticking with the $
                 },
                 TestBuffer{
                     { 6, 5 }, // going back to 6,5, the data lost has been destroyed
                     {
-                        { L"$     ", false },
-                        { L"GHIJKL", false },
-                        { L"MNOPQR", false },
-                        { L"      ", false },
+                        //{ L"F$    ", false }, // [BUG] this line is erroneously destroyed too!
+                        { L"GHIJKL", true },
+                        { L"MNOPQR", true },
+                        { L"STUVWX", true },
                         { L"      ", false },
+                        { L"      ", false }, // [BUG] this line is added
                     },
-                    { 0, 0 },
+                    { 1, 1 }, // [BUG] cursor does not follow [H], it sticks at 1,1
+                },
+                TestBuffer{
+                    { 7, 5 }, // a number of errors are carried forward from the previous buffer
+                    {
+                        { L"GHIJKLM", true },
+                        { L"NOPQRST", true },
+                        { L"UVWX   ", false }, // [BUG] This line loses wrap for some reason
+                        { L"       ", false },
+                        { L"       ", false },
+                    },
+                    { 0, 1 }, // [BUG] The cursor moves to 0, 1 now, sticking with the [N] from before
                 },
             },
         },
@@ -339,18 +353,18 @@ namespace
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 1, 1 }, // cursor *after* $
+                    { 1, 1 } // cursor *after* $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
                     {
                         { L"ABCDE", true },
-                        { L"F    ", false },
-                        { L"$    ", false },
+                        { L"F$   ", false }, // [BUG] EXACT WRAP. $ should be alone on next line.
+                        { L"     ", false },
                         { L"     ", false },
                         { L"     ", false },
                     },
-                    { 1, 2 }, // cursor follows space after $ to next line
+                    { 2, 1 } // cursor follows space after $ to next line
                 },
             },
         },
@@ -366,7 +380,7 @@ namespace
                         { L"STUVWX", true },
                         { L"YZ0 $ ", false },
                     },
-                    { 5, 4 }, // cursor *after* $
+                    { 5, 4 } // cursor *after* $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
@@ -377,7 +391,7 @@ namespace
                         { L"UVWXY", true },
                         { L"Z0 $ ", false },
                     },
-                    { 4, 4 }, // cursor follows space after $ to newly introduced bottom line
+                    { 4, 4 } // cursor follows space after $ to newly introduced bottom line
                 },
             },
         },
@@ -388,36 +402,40 @@ namespace
                     { 6, 5 },
                     {
                         { L"ABCDEF", false },
+                        //       v cursor
                         { L"$     ", false },
+                        //       ^ cursor
                         { L"      ", false },
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 5, 1 }, // The cursor is 5 columns to the right of the $ (last column).
+                    { 5, 1 } // cursor in space far after $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
                     {
                         { L"ABCDE", true },
-                        { L"F    ", false },
-                        // The reflow implementation marks a wrapped cursor as a forced row-wrap (= the row is padded with whitespace), so that when
-                        // the buffer is enlarged again, we restore the original cursor position correctly. That's why it says .cursor={5,1} below.
-                        { L"$    ", true },
+                        { L"F$   ", true }, // [BUG] This line is marked wrapped, and I do not know why
+                        //   v cursor
+                        { L"     ", false },
+                        //   ^ cursor
                         { L"     ", false },
                         { L"     ", false },
                     },
-                    { 0, 3 }, // $ is now at 0,2 and the cursor used to be 5 columns to the right. -> 0,3
+                    { 1, 2 } // cursor stays same linear distance from $
                 },
                 TestBuffer{
                     { 6, 5 }, // grow back to original size
                     {
-                        { L"ABCDEF", false },
+                        { L"ABCDEF", true_due_to_exact_wrap_bug },
+                        //      v cursor [BUG] cursor does not retain linear distance from $
                         { L"$     ", false },
+                        //      ^ cursor
                         { L"      ", false },
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 5, 1 },
+                    { 4, 1 } // cursor stays same linear distance from $
                 },
             },
         },
@@ -428,37 +446,39 @@ namespace
                     { 6, 5 },
                     {
                         { L"ABCDEF", false },
+                        //       v cursor
                         { L"$     ", false },
+                        //       ^ cursor
                         { L"BLAH  ", false },
                         { L"BLAH  ", false },
                         { L"      ", false },
                     },
-                    { 5, 1 }, // The cursor is 5 columns to the right of the $ (last column).
+                    { 5, 1 } // cursor in space far after $
                 },
                 TestBuffer{
                     { 5, 5 }, // reduce width by 1
                     {
-                        { L"F    ", false },
-                        // The reflow implementation pads the row with the cursor with whitespace.
-                        // Search for "REFLOW_JANK_CURSOR_WRAP" to find the corresponding code.
-                        { L"$    ", true },
+                        { L"ABCDE", true },
+                        { L"F$   ", false },
+                        { L"BLAH ", false },
+                        { L"BLAH ", true }, // [BUG] this line wraps, no idea why
+                        //  v cursor [BUG] cursor erroneously moved to end of all content
                         { L"     ", false },
-                        { L"BLAH ", false },
-                        { L"BLAH ", false },
+                        //  ^ cursor
                     },
-                    { 0, 2 },
-                },
+                    { 0, 4 } },
                 TestBuffer{
                     { 6, 5 }, // grow back to original size
                     {
-                        { L"F     ", false },
+                        { L"ABCDEF", true },
                         { L"$     ", false },
                         { L"BLAH  ", false },
+                        //       v cursor [BUG] cursor is pulled up to previous line because it was marked wrapped
                         { L"BLAH  ", false },
+                        //       ^ cursor
                         { L"      ", false },
                     },
-                    { 5, 1 },
-                },
+                    { 5, 3 } },
             },
         },
         TestCase{
@@ -469,24 +489,27 @@ namespace
                     { 6, 5 },
                     {
                         { L"ABCDEF", false },
+                        //       v cursor
                         { L"$     ", false },
+                        //       ^ cursor
                         { L"      ", false },
                         { L"      ", false },
                         { L"      ", false },
                     },
-                    { 5, 1 }, // The cursor is 5 columns to the right of the $ (last column).
+                    { 5, 1 } // cursor in space far after $
                 },
                 TestBuffer{
                     { 2, 5 }, // reduce width aggressively
                     {
                         { L"CD", true },
-                        { L"EF", false },
+                        { L"EF", true },
                         { L"$ ", true },
                         { L"  ", true },
+                        //   v cursor
                         { L"  ", false },
+                        //   ^ cursor
                     },
-                    { 1, 4 },
-                },
+                    { 1, 4 } },
             },
         },
         TestCase{
@@ -496,24 +519,27 @@ namespace
                     { 6, 5 },
                     {
                         { L"ABCDEF", true },
+                        //       v cursor
                         { L"$     ", true },
+                        //       ^ cursor
                         { L"      ", true },
                         { L"      ", true },
                         { L"      ", true },
                     },
-                    { 5, 1 }, // cursor in space far after $
+                    { 5, 1 } // cursor in space far after $
                 },
                 TestBuffer{
                     { 2, 5 }, // reduce width aggressively
                     {
+                        { L"EF", true },
+                        { L"$ ", true },
                         { L"  ", true },
                         { L"  ", true },
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L"  ", true },
+                        //   v cursor [BUG] cursor does not maintain linear distance from $
+                        { L"  ", false },
+                        //   ^ cursor
                     },
-                    { 1, 0 },
-                },
+                    { 1, 4 } },
             },
         },
         TestCase{
@@ -523,12 +549,14 @@ namespace
                     { 6, 5 },
                     {
                         { L"ABCDEF", true },
+                        //       v cursor
                         { L"$     ", true },
+                        //       ^ cursor
                         { L"      ", true },
                         { L"      ", true },
                         { L"     Q", true },
                     },
-                    { 5, 1 }, // cursor in space far after $
+                    { 5, 1 } // cursor in space far after $
                 },
                 TestBuffer{
                     { 2, 5 }, // reduce width aggressively
@@ -536,11 +564,12 @@ namespace
                         { L"  ", true },
                         { L"  ", true },
                         { L"  ", true },
-                        { L"  ", true },
-                        { L"  ", true },
+                        { L" Q", true },
+                        //   v cursor [BUG] cursor jumps to end of world
+                        { L"  ", false }, // POTENTIAL [BUG] a whole new blank line is added for the cursor
+                        //   ^ cursor
                     },
-                    { 1, 0 },
-                },
+                    { 1, 4 } },
             },
         },
         TestCase{
@@ -550,24 +579,27 @@ namespace
                     { 6, 5 },
                     {
                         { L"ABCDEF", false },
+                        //       v cursor
                         { L"$     ", false },
+                        //       ^ cursor
                         { L"      ", false },
                         { L"      ", true },
                         { L"     Q", true },
                     },
-                    { 5, 1 }, // cursor in space far after $
+                    { 5, 1 } // cursor in space far after $
                 },
                 TestBuffer{
                     { 2, 5 }, // reduce width aggressively
                     {
+                        { L"  ", true },
+                        { L"  ", true },
+                        { L"  ", true },
+                        { L" Q", true },
+                        //  v  cursor [BUG] cursor jumps to different place than fully wrapped case
                         { L"  ", false },
-                        { L"  ", false },
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L"  ", true },
+                        //  ^  cursor
                     },
-                    { 1, 0 },
-                },
+                    { 0, 4 } },
             },
         },
         TestCase{
@@ -582,21 +614,24 @@ namespace
                         { L"$     ", false },
                         { L"     Q", true },
                         { L"      ", true },
+                        //       v cursor
                         { L"      ", true },
+                        //       ^ cursor
                     },
-                    { 5, 4 }, // cursor at end of buffer
+                    { 5, 4 } // cursor at end of buffer
                 },
                 TestBuffer{
                     { 2, 5 }, // reduce width aggressively
                     {
+                        { L"  ", true },
+                        { L"  ", true },
+                        { L" Q", true },
                         { L"  ", false },
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L"  ", true },
-                        { L"  ", true },
+                        //  v  cursor [BUG] cursor loses linear distance from Q; is this important?
+                        { L"  ", false },
+                        //  ^  cursor
                     },
-                    { 1, 0 },
-                },
+                    { 0, 4 } },
             },
         },
     };
@@ -726,7 +761,7 @@ class ReflowTests
     static std::unique_ptr<TextBuffer> _textBufferByReflowingTextBuffer(TextBuffer& originalBuffer, const til::size newSize)
     {
         auto buffer = std::make_unique<TextBuffer>(newSize, TextAttribute{ 0x7 }, 0, false, renderer);
-        TextBuffer::Reflow(originalBuffer, *buffer);
+        TextBuffer::Reflow(originalBuffer, *buffer, std::nullopt, std::nullopt);
         return buffer;
     }
 

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

@@ -14,7 +14,7 @@
     <ClCompile Include="ReflowTests.cpp" />
     <ClCompile Include="TextColorTests.cpp" />
     <ClCompile Include="TextAttributeTests.cpp" />
-    <ClCompile Include="precomp.cpp">
+    <ClCompile Include="..\precomp.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
   </ItemGroup>
@@ -30,7 +30,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="precomp.h" />
+    <ClInclude Include="..\precomp.h" />
   </ItemGroup>
   <ItemDefinitionGroup>
     <ClCompile>

src/cascadia/CascadiaPackage/Package-Can.appxmanifest

@@ -7,18 +7,17 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
   xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  xmlns:uap17="http://schemas.microsoft.com/appx/manifest/uap/windows10/17"
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
   xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
   xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   xmlns:virtualization="http://schemas.microsoft.com/appx/manifest/virtualization/windows10"
-  IgnorableNamespaces="uap mp rescap uap3 uap17 desktop6 virtualization">
+  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
+  IgnorableNamespaces="uap mp rescap uap3 desktop6 virtualization">
 
   <Identity
-    Name="Microsoft.WindowsTerminalCanary"
+    Name="WindowsTerminalCan"
     Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
     Version="0.0.1.0" />
 
@@ -34,12 +33,10 @@
         <virtualization:ExcludedKey>HKEY_CURRENT_USER\Console\%%Startup</virtualization:ExcludedKey>
       </virtualization:ExcludedKeys>
     </virtualization:RegistryWriteVirtualization>
-    <uap17:UpdateWhileInUse>defer</uap17:UpdateWhileInUse>
   </Properties>
 
   <Dependencies>
-    <!-- rescap:appLicensing only works on 22000+. Until that's fixed, MinVersion will not let people install it on Windows 10... -->
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.22000.0" MaxVersionTested="10.0.22621.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.19041.0" MaxVersionTested="10.0.22621.0" />
   </Dependencies>
 
   <Resources>
@@ -75,17 +72,17 @@
             <desktop:ExecutionAlias Alias="wt.exe" />
           </uap3:AppExecutionAlias>
         </uap3:Extension>
-        <uap3:Extension Category="windows.appExtensionHost">
-          <uap3:AppExtensionHost>
-            <uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
-          </uap3:AppExtensionHost>
-        </uap3:Extension>
         <uap5:Extension Category="windows.startupTask">
           <uap5:StartupTask
             TaskId="StartTerminalOnLoginTask"
             Enabled="false"
             DisplayName="ms-resource:AppNameCan" />
         </uap5:Extension>
+        <uap3:Extension Category="windows.appExtensionHost">
+              <uap3:AppExtensionHost>
+                <uap3:Name>com.microsoft.windows.terminal.settings</uap3:Name>
+              </uap3:AppExtensionHost>
+        </uap3:Extension>
         <uap3:Extension Category="windows.appExtension">
             <uap3:AppExtension Name="com.microsoft.windows.console.host"
                 Id="OpenConsole-Can"
@@ -150,10 +147,5 @@
     <Capability Name="internetClient" />
     <rescap:Capability Name="runFullTrust" />
     <rescap:Capability Name="unvirtualizedResources" />
-    <rescap:Capability Name="appLicensing" />
   </Capabilities>
-
-  <mp:PhoneIdentity
-    PhoneProductId="348ff861-8d83-47b2-a740-15f8a096dcae"
-    PhonePublisherId="00000000-0000-0000-0000-000000000000" />
 </Package>

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -7,7 +7,6 @@
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
   xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
   xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
-  xmlns:uap17="http://schemas.microsoft.com/appx/manifest/uap/windows10/17"
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
   xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
@@ -15,7 +14,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   xmlns:virtualization="http://schemas.microsoft.com/appx/manifest/virtualization/windows10"
   xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  IgnorableNamespaces="uap mp rescap uap3 uap17 desktop6 virtualization">
+  IgnorableNamespaces="uap mp rescap uap3 desktop6 virtualization">
 
   <Identity
     Name="WindowsTerminalDev"
@@ -34,7 +33,6 @@
         <virtualization:ExcludedKey>HKEY_CURRENT_USER\Console\%%Startup</virtualization:ExcludedKey>
       </virtualization:ExcludedKeys>
     </virtualization:RegistryWriteVirtualization>
-    <uap17:UpdateWhileInUse>defer</uap17:UpdateWhileInUse>
   </Properties>
 
   <Dependencies>

src/cascadia/CascadiaPackage/Package-Pre.appxmanifest

@@ -9,14 +9,13 @@
   xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
   xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
   xmlns:uap7="http://schemas.microsoft.com/appx/manifest/uap/windows10/7"
-  xmlns:uap17="http://schemas.microsoft.com/appx/manifest/uap/windows10/17"
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
   xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
   xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   xmlns:virtualization="http://schemas.microsoft.com/appx/manifest/virtualization/windows10"
-  IgnorableNamespaces="uap mp rescap uap3 uap17 desktop6 virtualization">
+  IgnorableNamespaces="uap mp rescap uap3 desktop6 virtualization">
 
   <Identity
     Name="Microsoft.WindowsTerminalPreview"
@@ -35,7 +34,6 @@
         <virtualization:ExcludedKey>HKEY_CURRENT_USER\Console\%%Startup</virtualization:ExcludedKey>
       </virtualization:ExcludedKeys>
     </virtualization:RegistryWriteVirtualization>
-    <uap17:UpdateWhileInUse>defer</uap17:UpdateWhileInUse>
   </Properties>
 
   <Dependencies>

src/cascadia/CascadiaPackage/Package.appxmanifest

@@ -9,14 +9,13 @@
   xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
   xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
   xmlns:uap7="http://schemas.microsoft.com/appx/manifest/uap/windows10/7"
-  xmlns:uap17="http://schemas.microsoft.com/appx/manifest/uap/windows10/17"
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
   xmlns:desktop5="http://schemas.microsoft.com/appx/manifest/desktop/windows10/5"
   xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   xmlns:virtualization="http://schemas.microsoft.com/appx/manifest/virtualization/windows10"
-  IgnorableNamespaces="uap mp rescap uap3 uap17 desktop6 virtualization">
+  IgnorableNamespaces="uap mp rescap uap3 desktop6 virtualization">
 
   <Identity
     Name="Microsoft.WindowsTerminal"
@@ -35,7 +34,6 @@
         <virtualization:ExcludedKey>HKEY_CURRENT_USER\Console\%%Startup</virtualization:ExcludedKey>
       </virtualization:ExcludedKeys>
     </virtualization:RegistryWriteVirtualization>
-    <uap17:UpdateWhileInUse>defer</uap17:UpdateWhileInUse>
   </Properties>
 
   <Dependencies>

src/cascadia/LocalTests_SettingsModel/DeserializationTests.cpp

@@ -74,8 +74,6 @@ namespace SettingsModelLocalTests
         TEST_METHOD(TestInheritedCommand);
         TEST_METHOD(LoadFragmentsWithMultipleUpdates);
 
-        TEST_METHOD(MigrateReloadEnvVars);
-
     private:
         static winrt::com_ptr<implementation::CascadiaSettings> createSettings(const std::string_view& userJSON)
         {
@@ -2022,40 +2020,4 @@ namespace SettingsModelLocalTests
         // GH#12520: Fragments should be able to override the name of builtin profiles.
         VERIFY_ARE_EQUAL(L"NewName", loader.userSettings.profiles[0]->Name());
     }
-
-    void DeserializationTests::MigrateReloadEnvVars()
-    {
-        static constexpr std::string_view settings1Json{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "compatibility.reloadEnvironmentVariables": false,
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "commandline": "cmd.exe"
-                }
-            ],
-            "actions": [
-                {
-                    "name": "foo",
-                    "command": "closePane",
-                    "keys": "ctrl+shift+w"
-                }
-            ]
-        })" };
-
-        implementation::SettingsLoader loader{ settings1Json, DefaultJson };
-        loader.MergeInboxIntoUserSettings();
-        loader.FinalizeLayering();
-
-        VERIFY_IS_TRUE(loader.FixupUserSettings(), L"Validate that this will indicate we need to write them back to disk");
-
-        const auto settings = winrt::make_self<implementation::CascadiaSettings>(std::move(loader));
-
-        Log::Comment(L"Ensure that the profile defaults have the new setting added");
-        VERIFY_IS_TRUE(settings->ProfileDefaults().HasReloadEnvironmentVariables());
-        VERIFY_IS_FALSE(settings->ProfileDefaults().ReloadEnvironmentVariables());
-    }
 }

src/cascadia/LocalTests_SettingsModel/SerializationTests.cpp

@@ -42,9 +42,6 @@ namespace SettingsModelLocalTests
         TEST_METHOD(CascadiaSettings);
         TEST_METHOD(LegacyFontSettings);
 
-        TEST_METHOD(RoundtripReloadEnvVars);
-        TEST_METHOD(DontRoundtripNoReloadEnvVars);
-
     private:
         // Method Description:
         // - deserializes and reserializes a json string representing a settings object model of type T
@@ -516,114 +513,4 @@ namespace SettingsModelLocalTests
 
         VERIFY_ARE_EQUAL(toString(jsonOutput), toString(result));
     }
-
-    void SerializationTests::RoundtripReloadEnvVars()
-    {
-        static constexpr std::string_view oldSettingsJson{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "compatibility.reloadEnvironmentVariables": false,
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "commandline": "cmd.exe"
-                }
-            ],
-            "actions": [
-                {
-                    "name": "foo",
-                    "command": "closePane",
-                    "keys": "ctrl+shift+w"
-                }
-            ]
-        })" };
-
-        static constexpr std::string_view newSettingsJson{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles":
-            {
-                "defaults":
-                {
-                    "compatibility.reloadEnvironmentVariables": false
-                },
-                "list":
-                [
-                    {
-                        "name": "profile0",
-                        "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-                        "historySize": 1,
-                        "commandline": "cmd.exe"
-                    }
-                ]
-            },
-            "actions": [
-                {
-                    "name": "foo",
-                    "command": "closePane",
-                    "keys": "ctrl+shift+w"
-                }
-            ]
-        })" };
-
-        implementation::SettingsLoader oldLoader{ oldSettingsJson, DefaultJson };
-        oldLoader.MergeInboxIntoUserSettings();
-        oldLoader.FinalizeLayering();
-        VERIFY_IS_TRUE(oldLoader.FixupUserSettings(), L"Validate that this will indicate we need to write them back to disk");
-        const auto oldSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(oldLoader));
-        const auto oldResult{ oldSettings->ToJson() };
-
-        implementation::SettingsLoader newLoader{ newSettingsJson, DefaultJson };
-        newLoader.MergeInboxIntoUserSettings();
-        newLoader.FinalizeLayering();
-        newLoader.FixupUserSettings();
-        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
-        const auto newResult{ newSettings->ToJson() };
-
-        VERIFY_ARE_EQUAL(toString(newResult), toString(oldResult));
-    }
-
-    void SerializationTests::DontRoundtripNoReloadEnvVars()
-    {
-        // Kinda like the above test, but confirming that _nothing_ happens if
-        // we don't have a setting to migrate.
-
-        static constexpr std::string_view oldSettingsJson{ R"(
-        {
-            "defaultProfile": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-            "profiles": [
-                {
-                    "name": "profile0",
-                    "guid": "{6239a42c-0000-49a3-80bd-e8fdd045185c}",
-                    "historySize": 1,
-                    "commandline": "cmd.exe"
-                }
-            ],
-            "actions": [
-                {
-                    "name": "foo",
-                    "command": "closePane",
-                    "keys": "ctrl+shift+w"
-                }
-            ]
-        })" };
-
-        implementation::SettingsLoader oldLoader{ oldSettingsJson, DefaultJson };
-        oldLoader.MergeInboxIntoUserSettings();
-        oldLoader.FinalizeLayering();
-        oldLoader.FixupUserSettings();
-        const auto oldSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(oldLoader));
-        const auto oldResult{ oldSettings->ToJson() };
-
-        Log::Comment(L"Now, create a _new_ settings object from the re-serialization of the first");
-        implementation::SettingsLoader newLoader{ toString(oldResult), DefaultJson };
-        newLoader.MergeInboxIntoUserSettings();
-        newLoader.FinalizeLayering();
-        newLoader.FixupUserSettings();
-        const auto newSettings = winrt::make_self<implementation::CascadiaSettings>(std::move(newLoader));
-        VERIFY_IS_FALSE(newSettings->ProfileDefaults().HasReloadEnvironmentVariables(),
-                        L"Ensure that the new settings object didn't find a reloadEnvironmentVariables");
-    }
 }

src/cascadia/LocalTests_SettingsModel/ThemeTests.cpp

@@ -60,8 +60,7 @@ namespace SettingsModelLocalTests
             "tabRow":
             {
                 "background": "#FFFF8800",
-                "unfocusedBackground": "#FF8844",
-                "iconStyle": "default"
+                "unfocusedBackground": "#FF8844"
             },
             "window":
             {

src/cascadia/LocalTests_SettingsModel/pch.h

@@ -64,7 +64,6 @@ Author(s):
 
 // Manually include til after we include Windows.Foundation to give it winrt superpowers
 #include "til.h"
-#include <til/winrt.h>
 
 // Common includes for most tests:
 #include "../../inc/conattrs.hpp"

src/cascadia/PublicTerminalCore/HwndTerminal.cpp

@@ -43,13 +43,13 @@ try
         return DefWindowProc(hwnd, WM_NCCREATE, wParam, lParam);
     }
 #pragma warning(suppress : 26490) // Win32 APIs can only store void*, have to use reinterpret_cast
-    const auto publicTerminal = reinterpret_cast<HwndTerminal*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
+    auto terminal = reinterpret_cast<HwndTerminal*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
 
-    if (publicTerminal)
+    if (terminal)
     {
         if (_IsMouseMessage(uMsg))
         {
-            if (publicTerminal->_CanSendVTMouseInput() && publicTerminal->_SendMouseEvent(uMsg, wParam, lParam))
+            if (terminal->_CanSendVTMouseInput() && terminal->_SendMouseEvent(uMsg, wParam, lParam))
             {
                 // GH#6401: Capturing the mouse ensures that we get drag/release events
                 // even if the user moves outside the window.
@@ -81,14 +81,14 @@ try
         case WM_GETOBJECT:
             if (lParam == UiaRootObjectId)
             {
-                return UiaReturnRawElementProvider(hwnd, wParam, lParam, publicTerminal->_GetUiaProvider());
+                return UiaReturnRawElementProvider(hwnd, wParam, lParam, terminal->_GetUiaProvider());
             }
             break;
         case WM_LBUTTONDOWN:
-            LOG_IF_FAILED(publicTerminal->_StartSelection(lParam));
+            LOG_IF_FAILED(terminal->_StartSelection(lParam));
             return 0;
         case WM_LBUTTONUP:
-            publicTerminal->_singleClickTouchdownPos = std::nullopt;
+            terminal->_singleClickTouchdownPos = std::nullopt;
             [[fallthrough]];
         case WM_MBUTTONUP:
         case WM_RBUTTONUP:
@@ -97,31 +97,30 @@ try
         case WM_MOUSEMOVE:
             if (WI_IsFlagSet(wParam, MK_LBUTTON))
             {
-                LOG_IF_FAILED(publicTerminal->_MoveSelection(lParam));
+                LOG_IF_FAILED(terminal->_MoveSelection(lParam));
                 return 0;
             }
             break;
         case WM_RBUTTONDOWN:
-            if (publicTerminal->_terminal && publicTerminal->_terminal->IsSelectionActive())
+            if (const auto& termCore{ terminal->_terminal }; termCore && termCore->IsSelectionActive())
             {
                 try
                 {
-                    const auto lock = publicTerminal->_terminal->LockForWriting();
-                    const auto bufferData = publicTerminal->_terminal->RetrieveSelectedTextFromBuffer(false);
-                    LOG_IF_FAILED(publicTerminal->_CopyTextToSystemClipboard(bufferData, true));
-                    publicTerminal->_ClearSelection();
+                    const auto bufferData = termCore->RetrieveSelectedTextFromBuffer(false);
+                    LOG_IF_FAILED(terminal->_CopyTextToSystemClipboard(bufferData, true));
+                    TerminalClearSelection(terminal);
                 }
                 CATCH_LOG();
             }
             else
             {
-                publicTerminal->_PasteTextFromClipboard();
+                terminal->_PasteTextFromClipboard();
             }
             return 0;
         case WM_DESTROY:
             // Release Terminal's hwnd so Teardown doesn't try to destroy it again
-            publicTerminal->_hwnd.release();
-            publicTerminal->Teardown();
+            terminal->_hwnd.release();
+            terminal->Teardown();
             return 0;
         default:
             break;
@@ -196,8 +195,6 @@ HwndTerminal::~HwndTerminal()
 HRESULT HwndTerminal::Initialize()
 {
     _terminal = std::make_unique<::Microsoft::Terminal::Core::Terminal>();
-    const auto lock = _terminal->LockForWriting();
-
     auto renderThread = std::make_unique<::Microsoft::Console::Render::RenderThread>();
     auto* const localPointerToThread = renderThread.get();
     auto& renderSettings = _terminal->GetRenderSettings();
@@ -272,7 +269,7 @@ void HwndTerminal::RegisterScrollCallback(std::function<void(int, int, int)> cal
 
 void HwndTerminal::_WriteTextToConnection(const std::wstring_view input) noexcept
 {
-    if (input.empty() || !_pfnWriteCallback)
+    if (!_pfnWriteCallback)
     {
         return;
     }
@@ -307,6 +304,7 @@ void HwndTerminal::_UpdateFont(int newDpi)
         return;
     }
     _currentDpi = newDpi;
+    auto lock = _terminal->LockForWriting();
 
     // TODO: MSFT:20895307 If the font doesn't exist, this doesn't
     //      actually fail. We need a way to gracefully fallback.
@@ -325,10 +323,10 @@ IRawElementProviderSimple* HwndTerminal::_GetUiaProvider() noexcept
             {
                 return nullptr;
             }
+            auto lock = _terminal->LockForWriting();
             LOG_IF_FAILED(::Microsoft::WRL::MakeAndInitialize<HwndTerminalAutomationPeer>(&_uiaProvider, this->GetRenderData(), this));
             _uiaEngine = std::make_unique<::Microsoft::Console::Render::UiaEngine>(_uiaProvider.Get());
             LOG_IF_FAILED(_uiaEngine->Enable());
-            const auto lock = _terminal->LockForWriting();
             _renderer->AddRenderEngine(_uiaEngine.get());
         }
         catch (...)
@@ -346,7 +344,7 @@ HRESULT HwndTerminal::Refresh(const til::size windowSize, _Out_ til::size* dimen
     RETURN_HR_IF_NULL(E_NOT_VALID_STATE, _terminal);
     RETURN_HR_IF_NULL(E_INVALIDARG, dimensions);
 
-    const auto lock = _terminal->LockForWriting();
+    auto lock = _terminal->LockForWriting();
 
     _terminal->ClearSelection();
 
@@ -383,45 +381,37 @@ void HwndTerminal::SendOutput(std::wstring_view data)
     {
         return;
     }
-    const auto lock = _terminal->LockForWriting();
     _terminal->Write(data);
 }
 
 HRESULT _stdcall CreateTerminal(HWND parentHwnd, _Out_ void** hwnd, _Out_ void** terminal)
 {
-    auto publicTerminal = std::make_unique<HwndTerminal>(parentHwnd);
+    auto _terminal = std::make_unique<HwndTerminal>(parentHwnd);
+    RETURN_IF_FAILED(_terminal->Initialize());
 
-    RETURN_IF_FAILED(publicTerminal->Initialize());
-
-    *hwnd = publicTerminal->GetHwnd();
-    *terminal = publicTerminal.release();
+    *hwnd = _terminal->GetHwnd();
+    *terminal = _terminal.release();
 
     return S_OK;
 }
 
 void _stdcall TerminalRegisterScrollCallback(void* terminal, void __stdcall callback(int, int, int))
-try
 {
-    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
+    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     publicTerminal->RegisterScrollCallback(callback);
 }
-CATCH_LOG()
 
 void _stdcall TerminalRegisterWriteCallback(void* terminal, const void __stdcall callback(wchar_t*))
-try
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     publicTerminal->RegisterWriteCallback(callback);
 }
-CATCH_LOG()
 
 void _stdcall TerminalSendOutput(void* terminal, LPCWSTR data)
-try
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     publicTerminal->SendOutput(data);
 }
-CATCH_LOG()
 
 /// <summary>
 /// Triggers a terminal resize using the new width and height in pixel.
@@ -456,18 +446,13 @@ HRESULT _stdcall TerminalTriggerResize(_In_ void* terminal, _In_ til::CoordType
 /// <param name="dimensionsInPixels">Out parameter with the new size of the renderer.</param>
 /// <returns>HRESULT of the attempted resize.</returns>
 HRESULT _stdcall TerminalTriggerResizeWithDimension(_In_ void* terminal, _In_ til::size dimensionsInCharacters, _Out_ til::size* dimensionsInPixels)
-try
 {
     RETURN_HR_IF_NULL(E_INVALIDARG, dimensionsInPixels);
 
     const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
 
-    Viewport viewInPixels;
-    {
-        const auto viewInCharacters = Viewport::FromDimensions(dimensionsInCharacters);
-        const auto lock = publicTerminal->_terminal->LockForReading();
-        viewInPixels = publicTerminal->_renderEngine->GetViewportInPixels(viewInCharacters);
-    }
+    const auto viewInCharacters = Viewport::FromDimensions(dimensionsInCharacters);
+    const auto viewInPixels = publicTerminal->_renderEngine->GetViewportInPixels(viewInCharacters);
 
     dimensionsInPixels->width = viewInPixels.Width();
     dimensionsInPixels->height = viewInPixels.Height();
@@ -476,7 +461,6 @@ try
 
     return TerminalTriggerResize(terminal, viewInPixels.Width(), viewInPixels.Height(), &unused);
 }
-CATCH_RETURN()
 
 /// <summary>
 /// Calculates the amount of rows and columns that fit in the provided width and height.
@@ -487,12 +471,10 @@ CATCH_RETURN()
 /// <param name="dimensions">Out parameter containing the columns and rows that fit the new size.</param>
 /// <returns>HRESULT of the calculation.</returns>
 HRESULT _stdcall TerminalCalculateResize(_In_ void* terminal, _In_ til::CoordType width, _In_ til::CoordType height, _Out_ til::size* dimensions)
-try
 {
     const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
 
     const auto viewInPixels = Viewport::FromDimensions({ width, height });
-    const auto lock = publicTerminal->_terminal->LockForReading();
     const auto viewInCharacters = publicTerminal->_renderEngine->GetViewportInCharacters(viewInPixels);
 
     dimensions->width = viewInCharacters.Width();
@@ -500,27 +482,20 @@ try
 
     return S_OK;
 }
-CATCH_RETURN()
 
 void _stdcall TerminalDpiChanged(void* terminal, int newDpi)
-try
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
-    const auto lock = publicTerminal->_terminal->LockForWriting();
     publicTerminal->_UpdateFont(newDpi);
 }
-CATCH_LOG()
 
 void _stdcall TerminalUserScroll(void* terminal, int viewTop)
-try
 {
     if (const auto publicTerminal = static_cast<const HwndTerminal*>(terminal); publicTerminal && publicTerminal->_terminal)
     {
-        const auto lock = publicTerminal->_terminal->LockForWriting();
         publicTerminal->_terminal->UserScrollViewport(viewTop);
     }
 }
-CATCH_LOG()
 
 const unsigned int HwndTerminal::_NumberOfClicks(til::point point, std::chrono::steady_clock::time_point timestamp) noexcept
 {
@@ -547,7 +522,7 @@ try
         GET_Y_LPARAM(lParam),
     };
 
-    const auto lock = _terminal->LockForWriting();
+    auto lock = _terminal->LockForWriting();
     const auto altPressed = GetKeyState(VK_MENU) < 0;
     const til::size fontSize{ this->_actualFont.GetSize() };
 
@@ -591,7 +566,7 @@ try
         GET_Y_LPARAM(lParam),
     };
 
-    const auto lock = _terminal->LockForWriting();
+    auto lock = _terminal->LockForWriting();
     const til::size fontSize{ this->_actualFont.GetSize() };
 
     RETURN_HR_IF(E_NOT_VALID_STATE, fontSize.area() == 0); // either dimension = 0, area == 0
@@ -621,57 +596,45 @@ try
 }
 CATCH_RETURN();
 
-void HwndTerminal::_ClearSelection()
+void HwndTerminal::_ClearSelection() noexcept
+try
 {
     if (!_terminal)
     {
         return;
     }
+    auto lock{ _terminal->LockForWriting() };
     _terminal->ClearSelection();
     _renderer->TriggerSelection();
 }
+CATCH_LOG();
 
 void _stdcall TerminalClearSelection(void* terminal)
-try
 {
-    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
-    const auto lock = publicTerminal->_terminal->LockForWriting();
+    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     publicTerminal->_ClearSelection();
 }
-CATCH_LOG()
 
 bool _stdcall TerminalIsSelectionActive(void* terminal)
-try
 {
     if (const auto publicTerminal = static_cast<const HwndTerminal*>(terminal); publicTerminal && publicTerminal->_terminal)
     {
-        const auto lock = publicTerminal->_terminal->LockForReading();
         return publicTerminal->_terminal->IsSelectionActive();
     }
     return false;
 }
-catch (...)
-{
-    LOG_CAUGHT_EXCEPTION();
-    return false;
-}
 
 // Returns the selected text in the terminal.
 const wchar_t* _stdcall TerminalGetSelection(void* terminal)
-try
 {
-    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
+    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     if (!publicTerminal || !publicTerminal->_terminal)
     {
         return nullptr;
     }
 
-    TextBuffer::TextAndColor bufferData;
-    {
-        const auto lock = publicTerminal->_terminal->LockForWriting();
-        bufferData = publicTerminal->_terminal->RetrieveSelectedTextFromBuffer(false);
-        publicTerminal->_ClearSelection();
-    }
+    const auto bufferData = publicTerminal->_terminal->RetrieveSelectedTextFromBuffer(false);
+    publicTerminal->_ClearSelection();
 
     // convert text: vector<string> --> string
     std::wstring selectedText;
@@ -683,11 +646,6 @@ try
     auto returnText = wil::make_cotaskmem_string_nothrow(selectedText.c_str());
     return returnText.release();
 }
-catch (...)
-{
-    LOG_CAUGHT_EXCEPTION();
-    return nullptr;
-}
 
 static ControlKeyStates getControlKeyState() noexcept
 {
@@ -725,7 +683,6 @@ bool HwndTerminal::_CanSendVTMouseInput() const noexcept
 {
     // Only allow the transit of mouse events if shift isn't pressed.
     const auto shiftPressed = GetKeyState(VK_SHIFT) < 0;
-    const auto lock = _terminal->LockForReading();
     return !shiftPressed && _focused && _terminal && _terminal->IsTrackingMouseInput();
 }
 
@@ -758,17 +715,7 @@ try
         WI_IsFlagSet(GetKeyState(VK_RBUTTON), KeyPressed)
     };
 
-    TerminalInput::OutputType out;
-    {
-        const auto lock = _terminal->LockForReading();
-        out = _terminal->SendMouseEvent(cursorPosition / fontSize, uMsg, getControlKeyState(), wheelDelta, state);
-    }
-    if (out)
-    {
-        _WriteTextToConnection(*out);
-        return true;
-    }
-    return false;
+    return _terminal->SendMouseEvent(cursorPosition / fontSize, uMsg, getControlKeyState(), wheelDelta, state);
 }
 catch (...)
 {
@@ -793,16 +740,7 @@ try
     {
         _uiaProvider->RecordKeyEvent(vkey);
     }
-
-    TerminalInput::OutputType out;
-    {
-        const auto lock = _terminal->LockForReading();
-        out = _terminal->SendKeyEvent(vkey, scanCode, modifiers, keyDown);
-    }
-    if (out)
-    {
-        _WriteTextToConnection(*out);
-    }
+    _terminal->SendKeyEvent(vkey, scanCode, modifiers, keyDown);
 }
 CATCH_LOG();
 
@@ -813,58 +751,43 @@ try
     {
         return;
     }
-
-    TerminalInput::OutputType out;
+    else if (_terminal->IsSelectionActive())
     {
-        const auto lock = _terminal->LockForWriting();
-
-        if (_terminal->IsSelectionActive())
+        _ClearSelection();
+        if (ch == UNICODE_ESC)
         {
-            _ClearSelection();
-            if (ch == UNICODE_ESC)
-            {
-                // ESC should clear any selection before it triggers input.
-                // Other characters pass through.
-                return;
-            }
-        }
-
-        if (ch == UNICODE_TAB)
-        {
-            // TAB was handled as a keydown event (cf. Terminal::SendKeyEvent)
+            // ESC should clear any selection before it triggers input.
+            // Other characters pass through.
             return;
         }
-
-        auto modifiers = getControlKeyState();
-        if (WI_IsFlagSet(flags, ENHANCED_KEY))
-        {
-            modifiers |= ControlKeyStates::EnhancedKey;
-        }
-
-        out = _terminal->SendCharEvent(ch, scanCode, modifiers);
     }
-    if (out)
+
+    if (ch == UNICODE_TAB)
     {
-        _WriteTextToConnection(*out);
+        // TAB was handled as a keydown event (cf. Terminal::SendKeyEvent)
+        return;
     }
+
+    auto modifiers = getControlKeyState();
+    if (WI_IsFlagSet(flags, ENHANCED_KEY))
+    {
+        modifiers |= ControlKeyStates::EnhancedKey;
+    }
+    _terminal->SendCharEvent(ch, scanCode, modifiers);
 }
 CATCH_LOG();
 
 void _stdcall TerminalSendKeyEvent(void* terminal, WORD vkey, WORD scanCode, WORD flags, bool keyDown)
-try
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     publicTerminal->_SendKeyEvent(vkey, scanCode, flags, keyDown);
 }
-CATCH_LOG()
 
 void _stdcall TerminalSendCharEvent(void* terminal, wchar_t ch, WORD scanCode, WORD flags)
-try
 {
     const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     publicTerminal->_SendCharEvent(ch, scanCode, flags);
 }
-CATCH_LOG()
 
 void _stdcall DestroyTerminal(void* terminal)
 {
@@ -880,9 +803,8 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
     {
         return;
     }
-
     {
-        const auto lock = publicTerminal->_terminal->LockForWriting();
+        auto lock = publicTerminal->_terminal->LockForWriting();
 
         auto& renderSettings = publicTerminal->_terminal->GetRenderSettings();
         renderSettings.SetColorTableEntry(TextColor::DEFAULT_FOREGROUND, theme.DefaultForeground);
@@ -896,13 +818,13 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
             // It's using gsl::at to check the index is in bounds, but the analyzer still calls this array-to-pointer-decay
             [[gsl::suppress(bounds .3)]] renderSettings.SetColorTableEntry(tableIndex, gsl::at(theme.ColorTable, tableIndex));
         }
-
-        publicTerminal->_terminal->SetCursorStyle(static_cast<DispatchTypes::CursorStyle>(theme.CursorStyle));
-
-        publicTerminal->_desiredFont = { fontFamily, 0, DEFAULT_FONT_WEIGHT, static_cast<float>(fontSize), CP_UTF8 };
-        publicTerminal->_UpdateFont(newDpi);
     }
 
+    publicTerminal->_terminal->SetCursorStyle(static_cast<DispatchTypes::CursorStyle>(theme.CursorStyle));
+
+    publicTerminal->_desiredFont = { fontFamily, 0, DEFAULT_FONT_WEIGHT, static_cast<float>(fontSize), CP_UTF8 };
+    publicTerminal->_UpdateFont(newDpi);
+
     // When the font changes the terminal dimensions need to be recalculated since the available row and column
     // space will have changed.
     RECT windowRect;
@@ -914,35 +836,29 @@ void _stdcall TerminalSetTheme(void* terminal, TerminalTheme theme, LPCWSTR font
 }
 
 void _stdcall TerminalBlinkCursor(void* terminal)
-try
 {
     const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
-    if (!publicTerminal || !publicTerminal->_terminal)
+    if (!publicTerminal || !publicTerminal->_terminal || (!publicTerminal->_terminal->IsCursorBlinkingAllowed() && publicTerminal->_terminal->IsCursorVisible()))
     {
         return;
     }
 
-    const auto lock = publicTerminal->_terminal->LockForWriting();
-    publicTerminal->_terminal->BlinkCursor();
+    publicTerminal->_terminal->SetCursorOn(!publicTerminal->_terminal->IsCursorOn());
 }
-CATCH_LOG()
 
 void _stdcall TerminalSetCursorVisible(void* terminal, const bool visible)
-try
 {
     const auto publicTerminal = static_cast<const HwndTerminal*>(terminal);
     if (!publicTerminal || !publicTerminal->_terminal)
     {
         return;
     }
-    const auto lock = publicTerminal->_terminal->LockForWriting();
     publicTerminal->_terminal->SetCursorOn(visible);
 }
-CATCH_LOG()
 
 void __stdcall TerminalSetFocus(void* terminal)
 {
-    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
+    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     publicTerminal->_focused = true;
     if (auto uiaEngine = publicTerminal->_uiaEngine.get())
     {
@@ -952,7 +868,7 @@ void __stdcall TerminalSetFocus(void* terminal)
 
 void __stdcall TerminalKillFocus(void* terminal)
 {
-    const auto publicTerminal = static_cast<HwndTerminal*>(terminal);
+    auto publicTerminal = static_cast<HwndTerminal*>(terminal);
     publicTerminal->_focused = false;
     if (auto uiaEngine = publicTerminal->_uiaEngine.get())
     {
@@ -1007,11 +923,7 @@ try
         {
             const auto& fontData = _actualFont;
             const int iFontHeightPoints = fontData.GetUnscaledSize().height; // this renderer uses points already
-            COLORREF bgColor;
-            {
-                const auto lock = _terminal->LockForReading();
-                bgColor = _terminal->GetAttributeColors({}).second;
-            }
+            const auto bgColor = _terminal->GetAttributeColors({}).second;
 
             auto HTMLToPlaceOnClip = TextBuffer::GenHTML(rows, iFontHeightPoints, fontData.GetFaceName(), bgColor);
             _CopyToSystemClipboard(HTMLToPlaceOnClip, L"HTML Format");
@@ -1081,16 +993,30 @@ void HwndTerminal::_PasteTextFromClipboard() noexcept
         return;
     }
 
-    if (const auto pwstr = static_cast<PCWCH>(GlobalLock(ClipboardDataHandle)))
-    {
-        _WriteTextToConnection(pwstr);
-    }
+    auto pwstr = static_cast<PCWCH>(GlobalLock(ClipboardDataHandle));
+
+    _StringPaste(pwstr);
 
     GlobalUnlock(ClipboardDataHandle);
 
     CloseClipboard();
 }
 
+void HwndTerminal::_StringPaste(const wchar_t* const pData) noexcept
+{
+    if (pData == nullptr)
+    {
+        return;
+    }
+
+    try
+    {
+        std::wstring text(pData);
+        _WriteTextToConnection(text);
+    }
+    CATCH_LOG();
+}
+
 til::size HwndTerminal::GetFontSize() const noexcept
 {
     return _actualFont.GetSize();
@@ -1119,7 +1045,6 @@ void HwndTerminal::ChangeViewport(const til::inclusive_rect& NewWindow)
     {
         return;
     }
-    const auto lock = _terminal->LockForWriting();
     _terminal->UserScrollViewport(NewWindow.top);
 }
 

src/cascadia/PublicTerminalCore/HwndTerminal.hpp

@@ -112,13 +112,14 @@ private:
     HRESULT _CopyTextToSystemClipboard(const TextBuffer::TextAndColor& rows, const bool fAlsoCopyFormatting);
     HRESULT _CopyToSystemClipboard(std::string stringToCopy, LPCWSTR lpszFormat);
     void _PasteTextFromClipboard() noexcept;
+    void _StringPaste(const wchar_t* const pData) noexcept;
 
     const unsigned int _NumberOfClicks(til::point clickPos, std::chrono::steady_clock::time_point clickTime) noexcept;
     HRESULT _StartSelection(LPARAM lParam) noexcept;
     HRESULT _MoveSelection(LPARAM lParam) noexcept;
     IRawElementProviderSimple* _GetUiaProvider() noexcept;
 
-    void _ClearSelection();
+    void _ClearSelection() noexcept;
 
     bool _CanSendVTMouseInput() const noexcept;
     bool _SendMouseEvent(UINT uMsg, WPARAM wParam, LPARAM lParam) noexcept;

src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{84848BFA-931D-42CE-9ADF-01EE54DE7890}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>PublicTerminalCore</RootNamespace>
+    <ProjectName>PublicTerminalCore</ProjectName>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)src\common.build.pre.props" />
+  <Import Project="$(SolutionDir)src\common.nugetversions.props" />
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <PrecompiledHeader>Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="HwndTerminal.cpp" />
+    <ClCompile Include="HwndTerminalAutomationPeer.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="HwndTerminal.hpp" />
+    <ClInclude Include="HwndTerminalAutomationPeer.hpp" />
+    <ClInclude Include="pch.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(SolutionDir)src\terminal\input\lib\terminalinput.vcxproj">
+      <Project>{1cf55140-ef6a-4736-a403-957e4f7430bb}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)src\cascadia\TerminalCore\lib\TerminalCore-lib.vcxproj">
+      <Project>{ca5cad1a-abcd-429c-b551-8562ec954746}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)src\types\lib\types.vcxproj">
+      <Project>{18D09A24-8240-42D6-8CB6-236EEE820263}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)src\renderer\atlas\atlas.vcxproj">
+      <Project>{8222900C-8B6C-452A-91AC-BE95DB04B95F}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)src\renderer\base\lib\base.vcxproj">
+      <Project>{af0a096a-8b3a-4949-81ef-7df8f0fee91f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)src\renderer\dx\lib\dx.vcxproj">
+      <Project>{48d21369-3d7b-4431-9967-24e81292cf62}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\renderer\uia\lib\uia.vcxproj">
+      <Project>{48d21369-3d7b-4431-9967-24e81292cf63}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <Import Project="$(SolutionDir)src\common.build.post.props" />
+  <Import Project="$(SolutionDir)src\common.nugetversions.targets" />
+
+  <!-- LATE LINK LINE OVERRIDES. This project must link named forwarders
+       instead of APISet forwarders for easier Windows 7 compatibility. -->
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>delayimp.lib;Uiautomationcore.lib;onecoreuap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <DelayLoadDLLs>uiautomationcore.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>

src/cascadia/PublicTerminalCore/PublicTerminalCore.vcxproj.filters

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Natvis Include="$(SolutionDir)tools\ConsoleTypes.natvis" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="pch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="HwndTerminal.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="HwndTerminalAutomationPeer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="pch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="HwndTerminal.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="HwndTerminalAutomationPeer.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

src/cascadia/PublicTerminalCore/pch.cpp

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

src/cascadia/PublicTerminalCore/pch.h

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN // If this is not defined, windows.h includes commdlg.h which defines FindText globally and conflicts with UIAutomation ITextRangeProvider.
+#define NOMCX
+#define NOHELP
+#define NOCOMM
+#endif
+
+#include <LibraryIncludes.h>
+#include <UIAutomationCore.h>

src/cascadia/Remoting/CommandlineArgs.h

@@ -15,12 +15,10 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
 
         CommandlineArgs(const winrt::array_view<const winrt::hstring>& args,
                         winrt::hstring currentDirectory,
-                        const uint32_t showWindowCommand,
-                        winrt::hstring envString) :
+                        const uint32_t showWindowCommand) :
             _args{ args.begin(), args.end() },
             _cwd{ currentDirectory },
-            _ShowWindowCommand{ showWindowCommand },
-            CurrentEnvironment{ envString }
+            _ShowWindowCommand{ showWindowCommand }
         {
         }
 
@@ -29,8 +27,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         void Commandline(const winrt::array_view<const winrt::hstring>& value);
         winrt::com_array<winrt::hstring> Commandline();
 
-        til::property<winrt::hstring> CurrentEnvironment;
-
         WINRT_PROPERTY(uint32_t, ShowWindowCommand, SW_NORMAL); // SW_NORMAL is 1, 0 is SW_HIDE
 
     private:

src/cascadia/Remoting/Monarch.h

@@ -50,8 +50,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
             _WindowName{ windowInfo.WindowName() },
             _args{ command.Commandline() },
             _CurrentDirectory{ command.CurrentDirectory() },
-            _ShowWindowCommand{ command.ShowWindowCommand() },
-            _CurrentEnvironment{ command.CurrentEnvironment() } {};
+            _ShowWindowCommand{ command.ShowWindowCommand() } {};
 
         WindowRequestedArgs(const winrt::hstring& window, const winrt::hstring& content, const Windows::Foundation::IReference<Windows::Foundation::Rect>& bounds) :
             _Id{ 0u },
@@ -69,7 +68,6 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         WINRT_PROPERTY(winrt::hstring, CurrentDirectory);
         WINRT_PROPERTY(winrt::hstring, Content);
         WINRT_PROPERTY(uint32_t, ShowWindowCommand, SW_NORMAL);
-        WINRT_PROPERTY(winrt::hstring, CurrentEnvironment);
         WINRT_PROPERTY(Windows::Foundation::IReference<Windows::Foundation::Rect>, InitialBounds);
 
     private:

src/cascadia/Remoting/Monarch.idl

@@ -27,7 +27,6 @@ namespace Microsoft.Terminal.Remoting
         String[] Commandline { get; };
         String CurrentDirectory { get; };
         UInt32 ShowWindowCommand { get; };
-        String CurrentEnvironment { get; };
 
         String Content { get; };
         Windows.Foundation.IReference<Windows.Foundation.Rect> InitialBounds { get; };

src/cascadia/Remoting/Peasant.idl

@@ -7,12 +7,11 @@ namespace Microsoft.Terminal.Remoting
     runtimeclass CommandlineArgs
     {
         CommandlineArgs();
-        CommandlineArgs(String[] args, String cwd, UInt32 showWindowCommand, String env);
+        CommandlineArgs(String[] args, String cwd, UInt32 showWindowCommand);
 
         String[] Commandline { get; set; };
         String CurrentDirectory { get; };
         UInt32 ShowWindowCommand { get; };
-        String CurrentEnvironment { get; };
     };
 
     runtimeclass RenameRequestArgs

src/cascadia/Remoting/WindowManager.cpp

@@ -349,10 +349,7 @@ namespace winrt::Microsoft::Terminal::Remoting::implementation
         // If the name wasn't specified, this will be an empty string.
         p->WindowName(args.WindowName());
 
-        p->ExecuteCommandline(*winrt::make_self<CommandlineArgs>(args.Commandline(),
-                                                                 args.CurrentDirectory(),
-                                                                 args.ShowWindowCommand(),
-                                                                 args.CurrentEnvironment()));
+        p->ExecuteCommandline(*winrt::make_self<CommandlineArgs>(args.Commandline(), args.CurrentDirectory(), args.ShowWindowCommand()));
 
         _monarch.AddPeasant(*p);
 

src/cascadia/Remoting/pch.h

@@ -52,4 +52,3 @@ TRACELOGGING_DECLARE_PROVIDER(g_hRemotingProvider);
 #include "til.h"
 
 #include <cppwinrt_utils.h>
-#include <til/winrt.h>

src/cascadia/TerminalApp/AboutDialog.cpp

@@ -86,55 +86,14 @@ namespace winrt::TerminalApp::implementation
             co_await wil::resume_foreground(strongThis->Dispatcher());
             UpdatesAvailable(true);
 #else // release build, likely has a store context
-            bool packageManagerAnswered{ false };
-
-            try
+            if (auto storeContext{ winrt::Windows::Services::Store::StoreContext::GetDefault() })
             {
-                if (auto currentPackage{ winrt::Windows::ApplicationModel::Package::Current() })
+                const auto updates = co_await storeContext.GetAppAndOptionalStorePackageUpdatesAsync();
+                co_await wil::resume_foreground(strongThis->Dispatcher());
+                const auto numUpdates = updates.Size();
+                if (numUpdates > 0)
                 {
-                    // We need to look up our package in the Package Manager; we cannot use Current
-                    winrt::Windows::Management::Deployment::PackageManager pm;
-                    if (auto lookedUpPackage{ pm.FindPackageForUser(winrt::hstring{}, currentPackage.Id().FullName()) })
-                    {
-                        using winrt::Windows::ApplicationModel::PackageUpdateAvailability;
-                        auto availabilityResult = co_await lookedUpPackage.CheckUpdateAvailabilityAsync();
-                        co_await wil::resume_foreground(strongThis->Dispatcher());
-                        auto availability = availabilityResult.Availability();
-                        switch (availability)
-                        {
-                        case PackageUpdateAvailability::Available:
-                        case PackageUpdateAvailability::Required:
-                        case PackageUpdateAvailability::NoUpdates:
-                            UpdatesAvailable(availability != PackageUpdateAvailability::NoUpdates);
-                            packageManagerAnswered = true;
-                            break;
-                        case PackageUpdateAvailability::Error:
-                        case PackageUpdateAvailability::Unknown:
-                        default:
-                            // Do not set packageManagerAnswered, which will trigger the store check.
-                            break;
-                        }
-                    }
-                }
-            }
-            catch (...)
-            {
-            } // Do nothing on failure
-
-            if (!packageManagerAnswered)
-            {
-                if (auto storeContext{ winrt::Windows::Services::Store::StoreContext::GetDefault() })
-                {
-                    const auto updates = co_await storeContext.GetAppAndOptionalStorePackageUpdatesAsync();
-                    co_await wil::resume_foreground(strongThis->Dispatcher());
-                    if (updates)
-                    {
-                        const auto numUpdates = updates.Size();
-                        if (numUpdates > 0)
-                        {
-                            UpdatesAvailable(true);
-                        }
-                    }
+                    UpdatesAvailable(true);
                 }
             }
 #endif

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -1419,10 +1419,4 @@ namespace winrt::TerminalApp::implementation
         }
         args.Handled(true);
     }
-    void TerminalPage::_HandleOpenAbout(const IInspectable& /*sender*/,
-                                        const ActionEventArgs& args)
-    {
-        _ShowAboutDialog();
-        args.Handled(true);
-    }
 }

src/cascadia/TerminalApp/AppCommandlineArgs.cpp

@@ -571,11 +571,6 @@ void AppCommandlineArgs::_addNewTerminalArgs(AppCommandlineArgs::NewTerminalSubc
 
     subcommand.appendCommandLineOption = subcommand.subcommand->add_flag("--appendCommandLine", _appendCommandLineOption, RS_A(L"CmdAppendCommandLineDesc"));
 
-    subcommand.inheritEnvOption = subcommand.subcommand->add_flag(
-        "--inheritEnvironment,!--reloadEnvironment",
-        _inheritEnvironment,
-        RS_A(L"CmdInheritEnvDesc"));
-
     // Using positionals_at_end allows us to support "wt new-tab -d wsl -d Ubuntu"
     // without CLI11 thinking that we've specified -d twice.
     // There's an alternate construction where we make all subcommands "prefix commands",
@@ -597,8 +592,7 @@ NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewT
 {
     NewTerminalArgs args{};
 
-    const auto hasCommandline{ !_commandline.empty() };
-    if (hasCommandline)
+    if (!_commandline.empty())
     {
         std::ostringstream cmdlineBuffer;
 
@@ -668,13 +662,6 @@ NewTerminalArgs AppCommandlineArgs::_getNewTerminalArgs(AppCommandlineArgs::NewT
         args.AppendCommandLine(_appendCommandLineOption);
     }
 
-    bool inheritEnv = hasCommandline;
-    if (*subcommand.inheritEnvOption)
-    {
-        inheritEnv = _inheritEnvironment;
-    }
-    args.ReloadEnvironmentVariables(!inheritEnv);
-
     return args;
 }
 

src/cascadia/TerminalApp/AppCommandlineArgs.h

@@ -68,7 +68,6 @@ private:
         CLI::Option* suppressApplicationTitleOption;
         CLI::Option* colorSchemeOption;
         CLI::Option* appendCommandLineOption;
-        CLI::Option* inheritEnvOption;
     };
 
     struct NewPaneSubcommand : public NewTerminalSubcommand
@@ -101,7 +100,6 @@ private:
     std::string _startingTabColor;
     std::string _startingColorScheme;
     bool _suppressApplicationTitle{ false };
-    bool _inheritEnvironment{ false };
 
     winrt::Microsoft::Terminal::Settings::Model::FocusDirection _moveFocusDirection{ winrt::Microsoft::Terminal::Settings::Model::FocusDirection::None };
     winrt::Microsoft::Terminal::Settings::Model::FocusDirection _swapPaneDirection{ winrt::Microsoft::Terminal::Settings::Model::FocusDirection::None };

src/cascadia/TerminalApp/Pane.cpp

@@ -1040,7 +1040,6 @@ winrt::fire_and_forget Pane::_ControlConnectionStateChangedHandler(const winrt::
         newConnectionState = coreState.ConnectionState();
     }
 
-    const auto previousConnectionState = std::exchange(_connectionState, newConnectionState);
     if (newConnectionState < ConnectionState::Closed)
     {
         // Pane doesn't care if the connection isn't entering a terminal state.
@@ -1067,6 +1066,7 @@ winrt::fire_and_forget Pane::_ControlConnectionStateChangedHandler(const winrt::
         co_return;
     }
 
+    const auto previousConnectionState = std::exchange(_connectionState, newConnectionState);
     if (previousConnectionState < ConnectionState::Connected && newConnectionState >= ConnectionState::Failed)
     {
         // A failure to complete the connection (before it has _connected_) is not covered by "closeOnExit".
@@ -1384,18 +1384,6 @@ Profile Pane::GetFocusedProfile()
     return lastFocused ? lastFocused->_profile : nullptr;
 }
 
-// Method Description:
-// - Returns true if the connection state of this pane is closed. If this Pane is not a leaf this will
-//   return false.
-// Arguments:
-// - <none>
-// Return Value:
-// - true if the connection state of this Pane is closed.
-bool Pane::IsConnectionClosed() const
-{
-    return _control && _control.ConnectionState() >= ConnectionState::Closed;
-}
-
 // Method Description:
 // - Returns true if this pane was the last pane to be focused in a tree of panes.
 // Arguments:
@@ -2530,7 +2518,6 @@ std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> Pane::_Split(SplitDirect
         _profile = nullptr;
         _control = { nullptr };
         _firstChild->_isDefTermSession = _isDefTermSession;
-        _firstChild->_broadcastEnabled = _broadcastEnabled;
     }
 
     _splitState = actualSplitType;
@@ -3186,9 +3173,6 @@ void Pane::EnableBroadcast(bool enabled)
     if (_IsLeaf())
     {
         _broadcastEnabled = enabled;
-        _control.CursorVisibility(enabled ?
-                                      CursorDisplayState::Shown :
-                                      CursorDisplayState::Default);
         UpdateVisuals();
     }
     else

src/cascadia/TerminalApp/Pane.h

@@ -75,7 +75,6 @@ public:
     winrt::Microsoft::Terminal::Control::TermControl GetLastFocusedTerminalControl();
     winrt::Microsoft::Terminal::Control::TermControl GetTerminalControl();
     winrt::Microsoft::Terminal::Settings::Model::Profile GetFocusedProfile();
-    bool IsConnectionClosed() const;
 
     // Method Description:
     // - If this is a leaf pane, return its profile.

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

@@ -371,10 +371,6 @@
     <value>Open the tab with tabTitle overriding default title and suppressing title change messages from the application</value>
     <comment>{Locked="\"tabTitle\""}</comment>
   </data>
-  <data name="CmdInheritEnvDesc" xml:space="preserve">
-    <value>Inherit the terminal's own environment variables when creating the new tab or pane, rather than creating a fresh environment block. This defaults to set when a "command" is passed. </value>
-    <comment>{Locked="\"command\""}</comment>
-  </data>
   <data name="CmdColorSchemeArgDesc" xml:space="preserve">
     <value>Open the tab with the specified color scheme, instead of the profile's set "colorScheme"</value>
     <comment>{Locked="\"colorScheme\""}</comment>
@@ -882,11 +878,7 @@
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
     <value>Active pane moved to "{0}" tab in "{1}" window</value>
-    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
-  </data>
-  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
-    <value>Active pane moved to "{0}" window</value>
-    <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to.</comment>
   </data>
   <data name="TerminalPage_PaneMovedAnnouncement_NewWindow" xml:space="preserve">
     <value>Active pane moved to new window</value>
@@ -899,10 +891,4 @@
   <data name="CmdAppendCommandLineDesc" xml:space="preserve">
     <value>If set, the command will be appended to the profile's default command instead of replacing it.</value>
   </data>
-  <data name="RestartConnectionText" xml:space="preserve">
-    <value>Restart Connection</value>
-  </data>
-  <data name="RestartConnectionToolTip" xml:space="preserve">
-    <value>Restart the active pane connection</value>
-  </data>
 </root>

src/cascadia/TerminalApp/SettingsTab.cpp

@@ -114,7 +114,7 @@ namespace winrt::TerminalApp::implementation
 
         // The TabViewItem Icon needs MUX while the IconSourceElement in the CommandPalette needs WUX...
         Icon(winrt::hstring{ glyph });
-        TabViewItem().IconSource(IconPathConverter::IconSourceMUX(glyph, false));
+        TabViewItem().IconSource(IconPathConverter::IconSourceMUX(glyph));
     }
 
     winrt::Windows::UI::Xaml::Media::Brush SettingsTab::_BackgroundBrush()

src/cascadia/TerminalApp/TabBase.cpp

@@ -25,6 +25,10 @@ namespace winrt
 
 namespace winrt::TerminalApp::implementation
 {
+    WUX::FocusState TabBase::FocusState() const noexcept
+    {
+        return _focusState;
+    }
 
     // Method Description:
     // - Prepares this tab for being removed from the UI hierarchy
@@ -586,63 +590,4 @@ namespace winrt::TerminalApp::implementation
             VisualStateManager::GoToState(item, L"Normal", true);
         }
     }
-
-    TabCloseButtonVisibility TabBase::CloseButtonVisibility()
-    {
-        return _closeButtonVisibility;
-    }
-
-    // Method Description:
-    // - set our internal state to track if we were requested to have a visible
-    //   tab close button or not.
-    // - This is called every time the active tab changes. That way, the changes
-    //   in focused tab can be reflected for the "ActiveOnly" state.
-    void TabBase::CloseButtonVisibility(TabCloseButtonVisibility visibility)
-    {
-        _closeButtonVisibility = visibility;
-        _updateIsClosable();
-    }
-
-    // Method Description:
-    // - Update our close button's visibility, to reflect both the ReadOnly
-    //   state of the tab content, and also if if we were told to have a visible
-    //   close button at all.
-    //   - the tab being read-only takes precedence. That will always suppress
-    //     the close button.
-    //   - Otherwise we'll use the state set in CloseButtonVisibility to control
-    //     the tab's visibility.
-    void TabBase::_updateIsClosable()
-    {
-        bool isClosable = true;
-
-        if (ReadOnly())
-        {
-            isClosable = false;
-        }
-        else
-        {
-            switch (_closeButtonVisibility)
-            {
-            case TabCloseButtonVisibility::Never:
-                isClosable = false;
-                break;
-            case TabCloseButtonVisibility::Hover:
-                isClosable = true;
-                break;
-            case TabCloseButtonVisibility::ActiveOnly:
-                isClosable = _focused();
-                break;
-            default:
-                isClosable = true;
-                break;
-            }
-        }
-        TabViewItem().IsClosable(isClosable);
-    }
-
-    bool TabBase::_focused() const noexcept
-    {
-        return _focusState != FocusState::Unfocused;
-    }
-
 }

src/cascadia/TerminalApp/TabBase.h

@@ -16,6 +16,7 @@ namespace winrt::TerminalApp::implementation
     {
     public:
         virtual void Focus(winrt::Windows::UI::Xaml::FocusState focusState) = 0;
+        winrt::Windows::UI::Xaml::FocusState FocusState() const noexcept;
 
         virtual void Shutdown();
         void SetDispatch(const winrt::TerminalApp::ShortcutActionDispatch& dispatch);
@@ -29,9 +30,6 @@ namespace winrt::TerminalApp::implementation
                         const winrt::Microsoft::Terminal::Settings::Model::ThemeColor& unfocused,
                         const til::color& tabRowColor);
 
-        Microsoft::Terminal::Settings::Model::TabCloseButtonVisibility CloseButtonVisibility();
-        void CloseButtonVisibility(Microsoft::Terminal::Settings::Model::TabCloseButtonVisibility visible);
-
         WINRT_CALLBACK(RequestFocusActiveControl, winrt::delegate<void()>);
 
         WINRT_CALLBACK(Closed, winrt::Windows::Foundation::EventHandler<winrt::Windows::Foundation::IInspectable>);
@@ -62,8 +60,6 @@ namespace winrt::TerminalApp::implementation
         winrt::Microsoft::Terminal::Settings::Model::ThemeColor _unfocusedThemeColor{ nullptr };
         til::color _tabRowColor;
 
-        Microsoft::Terminal::Settings::Model::TabCloseButtonVisibility _closeButtonVisibility{ Microsoft::Terminal::Settings::Model::TabCloseButtonVisibility::Always };
-
         virtual void _CreateContextMenu();
         virtual winrt::hstring _CreateToolTipTitle();
 
@@ -82,9 +78,6 @@ namespace winrt::TerminalApp::implementation
         void _RefreshVisualState();
         virtual winrt::Windows::UI::Xaml::Media::Brush _BackgroundBrush() = 0;
 
-        bool _focused() const noexcept;
-        void _updateIsClosable();
-
         friend class ::TerminalAppLocalTests::TabTests;
     };
 }

src/cascadia/TerminalApp/TabBase.idl

@@ -9,10 +9,10 @@ namespace TerminalApp
         String Title { get; };
         String Icon { get; };
         Boolean ReadOnly { get; };
-        Microsoft.Terminal.Settings.Model.TabCloseButtonVisibility CloseButtonVisibility { get; set; };
 
         Microsoft.UI.Xaml.Controls.TabViewItem TabViewItem { get; };
         Windows.UI.Xaml.FrameworkElement Content { get; };
+        Windows.UI.Xaml.FocusState FocusState { get; };
 
         UInt32 TabViewIndex;
         UInt32 TabViewNumTabs;

src/cascadia/TerminalApp/TabHeaderControl.xaml

@@ -43,12 +43,6 @@
                   FontSize="12"
                   Glyph=""
                   Visibility="{x:Bind TabStatus.IsReadOnlyActive, Mode=OneWay}" />
-        <FontIcon x:Name="HeaderClosedIcon"
-                  Margin="0,0,8,0"
-                  FontFamily="{ThemeResource SymbolThemeFontFamily}"
-                  FontSize="12"
-                  Glyph="&#xEA39;"
-                  Visibility="{x:Bind TabStatus.IsConnectionClosed, Mode=OneWay}" />
         <FontIcon x:Name="HeaderBroadcastIcon"
                   Margin="0,0,8,0"
                   FontFamily="{ThemeResource SymbolThemeFontFamily}"

src/cascadia/TerminalApp/TabManagement.cpp

@@ -176,9 +176,7 @@ namespace winrt::TerminalApp::implementation
         {
             if (!profile.Icon().empty())
             {
-                const auto theme = _settings.GlobalSettings().CurrentTheme();
-                const auto iconStyle = (theme && theme.Tab()) ? theme.Tab().IconStyle() : IconStyle::Default;
-                newTabImpl->UpdateIcon(profile.Icon(), iconStyle);
+                newTabImpl->UpdateIcon(profile.Icon());
             }
         }
 
@@ -243,9 +241,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (const auto profile = tab.GetFocusedProfile())
         {
-            const auto theme = _settings.GlobalSettings().CurrentTheme();
-            const auto iconStyle = (theme && theme.Tab()) ? theme.Tab().IconStyle() : IconStyle::Default;
-            tab.UpdateIcon(profile.Icon(), iconStyle);
+            tab.UpdateIcon(profile.Icon());
         }
     }
 
@@ -305,12 +301,7 @@ namespace winrt::TerminalApp::implementation
             // In the future, it may be preferable to just duplicate the
             // current control's live settings (which will include changes
             // made through VT).
-            uint32_t insertPosition = _tabs.Size();
-            if (_settings.GlobalSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
-            {
-                insertPosition = tab.TabViewIndex() + 1;
-            }
-            _CreateNewTabFromPane(_MakePane(nullptr, tab, nullptr), insertPosition);
+            _CreateNewTabFromPane(_MakePane(nullptr, tab, nullptr), tab.TabViewIndex() + 1);
 
             const auto runtimeTabText{ tab.GetTabText() };
             if (!runtimeTabText.empty())
@@ -515,7 +506,7 @@ namespace winrt::TerminalApp::implementation
                 // * B (tabIndex=1): We'll want to focus tab A (now in index 0)
                 // * C (tabIndex=2): We'll want to focus tab B (now in index 1)
                 // * D (tabIndex=3): We'll want to focus tab C (now in index 2)
-                const auto newSelectedIndex = std::clamp<int32_t>(tabIndex - 1, 0, _tabs.Size() - 1);
+                const auto newSelectedIndex = std::clamp<int32_t>(tabIndex - 1, 0, _tabs.Size());
                 // _UpdatedSelectedTab will do the work of setting up the new tab as
                 // the focused one, and unfocusing all the others.
                 auto newSelectedTab{ _tabs.GetAt(newSelectedIndex) };
@@ -682,7 +673,7 @@ namespace winrt::TerminalApp::implementation
     {
         uint32_t tabIndexFromControl{};
         const auto items{ _tabView.TabItems() };
-        if (items.IndexOf(tabViewItem, tabIndexFromControl) && tabIndexFromControl < _tabs.Size())
+        if (items.IndexOf(tabViewItem, tabIndexFromControl))
         {
             // If IndexOf returns true, we've actually got an index
             return _tabs.GetAt(tabIndexFromControl);
@@ -945,7 +936,7 @@ namespace winrt::TerminalApp::implementation
             {
                 tab.Focus(FocusState::Programmatic);
                 _UpdateMRUTab(tab);
-                _updateAllTabCloseButtons();
+                _updateAllTabCloseButtons(tab);
             }
 
             tab.TabViewItem().StartBringIntoView();
@@ -1039,8 +1030,7 @@ namespace winrt::TerminalApp::implementation
     // - suggestedNewTabIndex: the new index of the tab, might get clamped to fit int the tabs row boundaries
     // Return Value:
     // - <none>
-    void TerminalPage::_TryMoveTab(const uint32_t currentTabIndex,
-                                   const int32_t suggestedNewTabIndex)
+    void TerminalPage::_TryMoveTab(const uint32_t currentTabIndex, const int32_t suggestedNewTabIndex)
     {
         auto newTabIndex = gsl::narrow_cast<uint32_t>(std::clamp<int32_t>(suggestedNewTabIndex, 0, _tabs.Size() - 1));
         if (currentTabIndex != newTabIndex)
@@ -1082,21 +1072,16 @@ namespace winrt::TerminalApp::implementation
 
         if (from.has_value() && to.has_value() && to != from)
         {
-            try
-            {
-                auto& tabs{ _tabs };
-                auto tab = tabs.GetAt(from.value());
-                tabs.RemoveAt(from.value());
-                tabs.InsertAt(to.value(), tab);
-                _UpdateTabIndices();
-            }
-            CATCH_LOG();
+            auto& tabs{ _tabs };
+            auto tab = tabs.GetAt(from.value());
+            tabs.RemoveAt(from.value());
+            tabs.InsertAt(to.value(), tab);
+            _UpdateTabIndices();
         }
 
         _rearranging = false;
 
-        if (to.has_value() &&
-            *to < gsl::narrow_cast<int32_t>(TabRow().TabView().TabItems().Size()))
+        if (to.has_value())
         {
             // Selecting the dropped tab
             TabRow().TabView().SelectedIndex(to.value());
@@ -1129,7 +1114,7 @@ namespace winrt::TerminalApp::implementation
             {
                 tab.Focus(FocusState::Programmatic);
                 _UpdateMRUTab(tab);
-                _updateAllTabCloseButtons();
+                _updateAllTabCloseButtons(tab);
             }
         }
     }

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -556,8 +556,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     winrt::fire_and_forget TerminalPage::ProcessStartupActions(Windows::Foundation::Collections::IVector<ActionAndArgs> actions,
                                                                const bool initial,
-                                                               const winrt::hstring cwd,
-                                                               const winrt::hstring env)
+                                                               const winrt::hstring cwd)
     {
         auto weakThis{ get_weak() };
 
@@ -577,12 +576,6 @@ namespace winrt::TerminalApp::implementation
             _WindowProperties.VirtualWorkingDirectory(originalVirtualCwd);
         });
 
-        // Literally the same thing with env vars too
-        auto originalVirtualEnv{ _WindowProperties.VirtualEnvVars() };
-        auto restoreEnv = wil::scope_exit([&originalVirtualEnv, this]() {
-            _WindowProperties.VirtualEnvVars(originalVirtualEnv);
-        });
-
         if (cwd.empty())
         {
             // We didn't actually need to change the virtual CWD, so we don't
@@ -594,15 +587,6 @@ namespace winrt::TerminalApp::implementation
             _WindowProperties.VirtualWorkingDirectory(cwd);
         }
 
-        if (env.empty())
-        {
-            restoreEnv.release();
-        }
-        else
-        {
-            _WindowProperties.VirtualEnvVars(env);
-        }
-
         if (auto page{ weakThis.get() })
         {
             for (const auto& action : actions)
@@ -1229,8 +1213,6 @@ namespace winrt::TerminalApp::implementation
             auto valueSet = TerminalConnection::ConptyConnection::CreateSettings(azBridgePath.native(),
                                                                                  L".",
                                                                                  L"Azure",
-                                                                                 false,
-                                                                                 L"",
                                                                                  nullptr,
                                                                                  settings.InitialRows(),
                                                                                  settings.InitialCols(),
@@ -1271,8 +1253,6 @@ namespace winrt::TerminalApp::implementation
             auto valueSet = TerminalConnection::ConptyConnection::CreateSettings(settings.Commandline(),
                                                                                  newWorkingDirectory,
                                                                                  settings.StartingTitle(),
-                                                                                 settings.ReloadEnvironmentVariables(),
-                                                                                 _WindowProperties.VirtualEnvVars(),
                                                                                  environment,
                                                                                  settings.InitialRows(),
                                                                                  settings.InitialCols(),
@@ -1280,6 +1260,8 @@ namespace winrt::TerminalApp::implementation
                                                                                  profile.Guid());
 
             valueSet.Insert(L"passthroughMode", Windows::Foundation::PropertyValue::CreateBoolean(settings.VtPassthrough()));
+            valueSet.Insert(L"reloadEnvironmentVariables",
+                            Windows::Foundation::PropertyValue::CreateBoolean(_settings.GlobalSettings().ReloadEnvironmentVariables()));
 
             if (inheritCursor)
             {
@@ -1678,19 +1660,9 @@ namespace winrt::TerminalApp::implementation
         {
             term.CompletionsChanged({ get_weak(), &TerminalPage::_ControlCompletionsChangedHandler });
         }
-        winrt::weak_ref<TermControl> weakTerm{ term };
-        term.ContextMenu().Opening([weak = get_weak(), weakTerm](auto&& sender, auto&& /*args*/) {
-            if (const auto& page{ weak.get() })
-            {
-                page->_PopulateContextMenu(weakTerm.get(), sender.try_as<MUX::Controls::CommandBarFlyout>(), false);
-            }
-        });
-        term.SelectionContextMenu().Opening([weak = get_weak(), weakTerm](auto&& sender, auto&& /*args*/) {
-            if (const auto& page{ weak.get() })
-            {
-                page->_PopulateContextMenu(weakTerm.get(), sender.try_as<MUX::Controls::CommandBarFlyout>(), true);
-            }
-        });
+
+        term.ContextMenu().Opening({ this, &TerminalPage::_ContextMenuOpened });
+        term.SelectionContextMenu().Opening({ this, &TerminalPage::_SelectionMenuOpened });
     }
 
     // Method Description:
@@ -1734,11 +1706,6 @@ namespace winrt::TerminalApp::implementation
         hostingTab.TaskbarProgressChanged({ get_weak(), &TerminalPage::_SetTaskbarProgressHandler });
     }
 
-    void TerminalPage::_RegisterPaneEvents(std::shared_ptr<Pane>& pane)
-    {
-        pane->RestartTerminalRequested({ get_weak(), &TerminalPage::_restartPaneConnection });
-    }
-
     // Method Description:
     // - Helper to manually exit "zoom" when certain actions take place.
     //   Anything that modifies the state of the pane tree should probably
@@ -1983,11 +1950,6 @@ namespace winrt::TerminalApp::implementation
             _settings.GlobalSettings().ConfirmCloseAllTabs() &&
             !_displayingCloseDialog)
         {
-            if (_newTabButton && _newTabButton.Flyout())
-            {
-                _newTabButton.Flyout().Hide();
-            }
-            _DismissTabContextMenus();
             _displayingCloseDialog = true;
             auto warningResult = co_await _ShowCloseWarningDialog();
             _displayingCloseDialog = false;
@@ -2068,6 +2030,9 @@ namespace winrt::TerminalApp::implementation
             {
                 if (const auto pane{ terminalTab->GetActivePane() })
                 {
+                    // Get the tab title _before_ moving things around in case the tabIdx doesn't point to the right one after the move
+                    const auto tabTitle = _tabs.GetAt(tabIdx).Title();
+
                     auto startupActions = pane->BuildStartupActions(0, 1, true, true);
                     _DetachPaneFromWindow(pane);
                     _MoveContent(std::move(startupActions.args), windowId, tabIdx);
@@ -2086,7 +2051,7 @@ namespace winrt::TerminalApp::implementation
                         {
                             autoPeer.RaiseNotificationEvent(Automation::Peers::AutomationNotificationKind::ActionCompleted,
                                                             Automation::Peers::AutomationNotificationProcessing::ImportantMostRecent,
-                                                            fmt::format(std::wstring_view{ RS_(L"TerminalPage_PaneMovedAnnouncement_ExistingWindow2") }, windowId),
+                                                            fmt::format(std::wstring_view{ RS_(L"TerminalPage_PaneMovedAnnouncement_ExistingWindow") }, tabTitle, windowId),
                                                             L"TerminalPageMovePaneToExistingWindow" /* unique name for this notification category */);
                         }
                     }
@@ -2103,7 +2068,7 @@ namespace winrt::TerminalApp::implementation
 
         // Moving the pane from the current tab might close it, so get the next
         // tab before its index changes.
-        if (tabIdx < _tabs.Size())
+        if (_tabs.Size() > tabIdx)
         {
             auto targetTab = _GetTerminalTabImpl(_tabs.GetAt(tabIdx));
             // if the selected tab is not a host of terminals (e.g. settings)
@@ -2383,14 +2348,7 @@ namespace winrt::TerminalApp::implementation
         }
 
         _UnZoomIfNeeded();
-        auto [original, _] = activeTab->SplitPane(*realSplitType, splitSize, newPane);
-
-        // When we split the pane, the Pane itself will create a _new_ Pane
-        // instance for the original content. We need to make sure we also
-        // re-add our event handler to that newly created pane.
-        //
-        // _MakePane will already call this for the newly created pane.
-        _RegisterPaneEvents(original);
+        activeTab->SplitPane(*realSplitType, splitSize, newPane);
 
         // After GH#6586, the control will no longer focus itself
         // automatically when it's finished being laid out. Manually focus
@@ -2642,91 +2600,62 @@ namespace winrt::TerminalApp::implementation
     // - Does some of this in a background thread, as to not hang/crash the UI thread.
     // Arguments:
     // - eventArgs: the PasteFromClipboard event sent from the TermControl
-    fire_and_forget TerminalPage::_PasteFromClipboardHandler(const IInspectable /*sender*/, const PasteFromClipboardEventArgs eventArgs)
-    try
+    fire_and_forget TerminalPage::_PasteFromClipboardHandler(const IInspectable /*sender*/,
+                                                             const PasteFromClipboardEventArgs eventArgs)
     {
-        // The old Win32 clipboard API as used below is somewhere in the order of 300-1000x faster than
-        // the WinRT one on average, depending on CPU load. Don't use the WinRT clipboard API if you can.
-        const auto weakThis = get_weak();
-        const auto dispatcher = Dispatcher();
-        const auto globalSettings = _settings.GlobalSettings();
-        winrt::hstring text;
+        const auto data = Clipboard::GetContent();
 
-        // GetClipboardData might block for up to 30s for delay-rendered contents.
+        // This will switch the execution of the function to a background (not
+        // UI) thread. This is IMPORTANT, because the getting the clipboard data
+        // will crash on the UI thread, because the main thread is a STA.
         co_await winrt::resume_background();
 
+        try
         {
-            // According to various reports on the internet, OpenClipboard might
-            // fail to acquire the internal lock, for instance due to rdpclip.exe.
-            for (int attempts = 1;;)
+            hstring text = L"";
+            if (data.Contains(StandardDataFormats::Text()))
             {
-                if (OpenClipboard(nullptr))
+                text = co_await data.GetTextAsync();
+            }
+            // Windows Explorer's "Copy address" menu item stores a StorageItem in the clipboard, and no text.
+            else if (data.Contains(StandardDataFormats::StorageItems()))
+            {
+                auto items = co_await data.GetStorageItemsAsync();
+                if (items.Size() > 0)
                 {
-                    break;
+                    auto item = items.GetAt(0);
+                    text = item.Path();
                 }
+            }
 
-                if (attempts > 5)
+            if (_settings.GlobalSettings().TrimPaste())
+            {
+                text = { Utils::TrimPaste(text) };
+                if (text.empty())
                 {
+                    // Text is all white space, nothing to paste
                     co_return;
                 }
-
-                attempts++;
-                Sleep(10 * attempts);
             }
 
-            const auto clipboardCleanup = wil::scope_exit([]() {
-                CloseClipboard();
-            });
-
-            const auto data = GetClipboardData(CF_UNICODETEXT);
-            if (!data)
+            // If the requesting terminal is in bracketed paste mode, then we don't need to warn about a multi-line paste.
+            auto warnMultiLine = _settings.GlobalSettings().WarnAboutMultiLinePaste() &&
+                                 !eventArgs.BracketedPasteEnabled();
+            if (warnMultiLine)
             {
-                co_return;
+                const auto isNewLineLambda = [](auto c) { return c == L'\n' || c == L'\r'; };
+                const auto hasNewLine = std::find_if(text.cbegin(), text.cend(), isNewLineLambda) != text.cend();
+                warnMultiLine = hasNewLine;
             }
 
-            const auto str = static_cast<const wchar_t*>(GlobalLock(data));
-            if (!str)
+            constexpr const std::size_t minimumSizeForWarning = 1024 * 5; // 5 KiB
+            const auto warnLargeText = text.size() > minimumSizeForWarning &&
+                                       _settings.GlobalSettings().WarnAboutLargePaste();
+
+            if (warnMultiLine || warnLargeText)
             {
-                co_return;
-            }
+                co_await wil::resume_foreground(Dispatcher());
 
-            const auto dataCleanup = wil::scope_exit([&]() {
-                GlobalUnlock(data);
-            });
-
-            const auto maxLength = GlobalSize(data) / sizeof(wchar_t);
-            const auto length = wcsnlen(str, maxLength);
-            text = winrt::hstring{ str, gsl::narrow_cast<uint32_t>(length) };
-        }
-
-        if (globalSettings.TrimPaste())
-        {
-            text = { Utils::TrimPaste(text) };
-            if (text.empty())
-            {
-                // Text is all white space, nothing to paste
-                co_return;
-            }
-        }
-
-        // If the requesting terminal is in bracketed paste mode, then we don't need to warn about a multi-line paste.
-        auto warnMultiLine = globalSettings.WarnAboutMultiLinePaste() && !eventArgs.BracketedPasteEnabled();
-        if (warnMultiLine)
-        {
-            const auto isNewLineLambda = [](auto c) { return c == L'\n' || c == L'\r'; };
-            const auto hasNewLine = std::find_if(text.cbegin(), text.cend(), isNewLineLambda) != text.cend();
-            warnMultiLine = hasNewLine;
-        }
-
-        constexpr const std::size_t minimumSizeForWarning = 1024 * 5; // 5 KiB
-        const auto warnLargeText = text.size() > minimumSizeForWarning && globalSettings.WarnAboutLargePaste();
-
-        if (warnMultiLine || warnLargeText)
-        {
-            co_await wil::resume_foreground(dispatcher);
-
-            if (const auto strongThis = weakThis.get())
-            {
                 // We have to initialize the dialog here to be able to change the text of the text block within it
                 FindName(L"MultiLinePasteDialog").try_as<WUX::Controls::ContentDialog>();
                 ClipboardText().Text(text);
@@ -2754,15 +2683,10 @@ namespace winrt::TerminalApp::implementation
                 }
             }
 
-            co_await winrt::resume_background();
+            eventArgs.HandleClipboardData(text);
         }
-
-        // This will end up calling ConptyConnection::WriteInput which calls WriteFile which may block for
-        // an indefinite amount of time. Avoid freezes and deadlocks by running this on a background thread.
-        assert(!dispatcher.HasThreadAccess());
-        eventArgs.HandleClipboardData(std::move(text));
+        CATCH_LOG();
     }
-    CATCH_LOG();
 
     void TerminalPage::_OpenHyperlinkHandler(const IInspectable /*sender*/, const Microsoft::Terminal::Control::OpenHyperlinkEventArgs eventArgs)
     {
@@ -3174,7 +3098,7 @@ namespace winrt::TerminalApp::implementation
             original->SetActive();
         }
 
-        _RegisterPaneEvents(resultPane);
+        resultPane->RestartTerminalRequested({ get_weak(), &TerminalPage::_restartPaneConnection });
 
         return resultPane;
     }
@@ -3359,23 +3283,44 @@ namespace winrt::TerminalApp::implementation
         // Begin Theme handling
         _updateThemeColors();
 
-        _updateAllTabCloseButtons();
+        _updateAllTabCloseButtons(_GetFocusedTab());
     }
 
-    void TerminalPage::_updateAllTabCloseButtons()
+    void TerminalPage::_updateAllTabCloseButtons(const winrt::TerminalApp::TabBase& focusedTab)
     {
         // Update the state of the CloseButtonOverlayMode property of
         // our TabView, to match the tab.showCloseButton property in the theme.
         //
         // Also update every tab's individual IsClosable to match the same property.
         const auto theme = _settings.GlobalSettings().CurrentTheme();
-        const auto visibility = (theme && theme.Tab()) ?
-                                    theme.Tab().ShowCloseButton() :
-                                    Settings::Model::TabCloseButtonVisibility::Always;
+        const auto visibility = theme && theme.Tab() ? theme.Tab().ShowCloseButton() : Settings::Model::TabCloseButtonVisibility::Always;
 
         for (const auto& tab : _tabs)
         {
-            tab.CloseButtonVisibility(visibility);
+            switch (visibility)
+            {
+            case Settings::Model::TabCloseButtonVisibility::Never:
+                tab.TabViewItem().IsClosable(false);
+                break;
+            case Settings::Model::TabCloseButtonVisibility::Hover:
+                tab.TabViewItem().IsClosable(true);
+                break;
+            case Settings::Model::TabCloseButtonVisibility::ActiveOnly:
+            {
+                if (focusedTab && focusedTab == tab)
+                {
+                    tab.TabViewItem().IsClosable(true);
+                }
+                else
+                {
+                    tab.TabViewItem().IsClosable(false);
+                }
+                break;
+            }
+            default:
+                tab.TabViewItem().IsClosable(true);
+                break;
+            }
         }
 
         switch (visibility)
@@ -4774,21 +4719,6 @@ namespace winrt::TerminalApp::implementation
         // the settings, change active panes, etc.
         _activated = activated;
         _updateThemeColors();
-
-        if (const auto& tab{ _GetFocusedTabImpl() })
-        {
-            if (tab->TabStatus().IsInputBroadcastActive())
-            {
-                tab->GetRootPane()->WalkTree([activated](const auto& p) {
-                    if (const auto& control{ p->GetTerminalControl() })
-                    {
-                        control.CursorVisibility(activated ?
-                                                     Microsoft::Terminal::Control::CursorDisplayState::Shown :
-                                                     Microsoft::Terminal::Control::CursorDisplayState::Default);
-                    }
-                });
-            }
-        }
     }
 
     winrt::fire_and_forget TerminalPage::_ControlCompletionsChangedHandler(const IInspectable sender,
@@ -4871,14 +4801,26 @@ namespace winrt::TerminalApp::implementation
                    characterSize.Height);
     }
 
-    void TerminalPage::_PopulateContextMenu(const TermControl& control,
-                                            const MUX::Controls::CommandBarFlyout& menu,
+    void TerminalPage::_ContextMenuOpened(const IInspectable& sender,
+                                          const IInspectable& /*args*/)
+    {
+        _PopulateContextMenu(sender, false /*withSelection*/);
+    }
+    void TerminalPage::_SelectionMenuOpened(const IInspectable& sender,
+                                            const IInspectable& /*args*/)
+    {
+        _PopulateContextMenu(sender, true /*withSelection*/);
+    }
+
+    void TerminalPage::_PopulateContextMenu(const IInspectable& sender,
                                             const bool withSelection)
     {
         // withSelection can be used to add actions that only appear if there's
-        // selected text, like "search the web"
+        // selected text, like "search the web". In this initial draft, it's not
+        // actually augmented by the TerminalPage, so it's left commented out.
 
-        if (!control || !menu)
+        const auto& menu{ sender.try_as<MUX::Controls::CommandBarFlyout>() };
+        if (!menu)
         {
             return;
         }
@@ -4928,11 +4870,6 @@ namespace winrt::TerminalApp::implementation
             makeItem(RS_(L"PaneClose"), L"\xE89F", ActionAndArgs{ ShortcutAction::ClosePane, nullptr });
         }
 
-        if (control.ConnectionState() >= ConnectionState::Closed)
-        {
-            makeItem(RS_(L"RestartConnectionText"), L"\xE72C", ActionAndArgs{ ShortcutAction::RestartConnection, nullptr });
-        }
-
         if (withSelection)
         {
             makeItem(RS_(L"SearchWebText"), L"\xF6FA", ActionAndArgs{ ShortcutAction::SearchForText, nullptr });

src/cascadia/TerminalApp/TerminalPage.h

@@ -154,8 +154,7 @@ namespace winrt::TerminalApp::implementation
 
         winrt::fire_and_forget ProcessStartupActions(Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::ActionAndArgs> actions,
                                                      const bool initial,
-                                                     const winrt::hstring cwd = L"",
-                                                     const winrt::hstring env = L"");
+                                                     const winrt::hstring cwd = L"");
 
         TerminalApp::WindowProperties WindowProperties() const noexcept { return _WindowProperties; };
 
@@ -345,7 +344,6 @@ namespace winrt::TerminalApp::implementation
         void _InitializeTab(winrt::com_ptr<TerminalTab> newTabImpl, uint32_t insertPosition = -1);
         void _RegisterTerminalEvents(Microsoft::Terminal::Control::TermControl term);
         void _RegisterTabEvents(TerminalTab& hostingTab);
-        void _RegisterPaneEvents(std::shared_ptr<Pane>& pane);
 
         void _DismissTabContextMenus();
         void _FocusCurrentTab(const bool focusAlways);
@@ -513,7 +511,7 @@ namespace winrt::TerminalApp::implementation
         static void _DismissMessage(const winrt::Microsoft::Terminal::Settings::Model::InfoBarMessage& message);
 
         void _updateThemeColors();
-        void _updateAllTabCloseButtons();
+        void _updateAllTabCloseButtons(const winrt::TerminalApp::TabBase& focusedTab);
         void _updatePaneResources(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme);
 
         winrt::fire_and_forget _ControlCompletionsChangedHandler(const winrt::Windows::Foundation::IInspectable sender, const winrt::Microsoft::Terminal::Control::CompletionsChangedEventArgs args);
@@ -537,7 +535,9 @@ namespace winrt::TerminalApp::implementation
                           const std::optional<til::point>& dragPoint = std::nullopt);
         void _sendDraggedTabToWindow(const winrt::hstring& windowId, const uint32_t tabIndex, std::optional<til::point> dragPoint);
 
-        void _PopulateContextMenu(const Microsoft::Terminal::Control::TermControl& control, const Microsoft::UI::Xaml::Controls::CommandBarFlyout& sender, const bool withSelection);
+        void _ContextMenuOpened(const IInspectable& sender, const IInspectable& args);
+        void _SelectionMenuOpened(const IInspectable& sender, const IInspectable& args);
+        void _PopulateContextMenu(const IInspectable& sender, const bool withSelection);
         winrt::Windows::UI::Xaml::Controls::MenuFlyout _CreateRunAsAdminFlyout(int profileIndex);
 
         winrt::Microsoft::Terminal::Control::TermControl _senderOrActiveControl(const winrt::Windows::Foundation::IInspectable& sender);

src/cascadia/TerminalApp/TerminalPage.idl

@@ -52,7 +52,6 @@ namespace TerminalApp
         String WindowIdForDisplay { get; };
 
         String VirtualWorkingDirectory { get; set; };
-        String VirtualEnvVars { get; set; };
 
         Boolean IsQuakeWindow();
     };

src/cascadia/TerminalApp/TerminalTab.cpp

@@ -15,7 +15,6 @@ using namespace winrt;
 using namespace winrt::Windows::UI::Xaml;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Microsoft::Terminal::Control;
-using namespace winrt::Microsoft::Terminal::TerminalConnection;
 using namespace winrt::Microsoft::Terminal::Settings::Model;
 using namespace winrt::Microsoft::UI::Xaml::Controls;
 using namespace winrt::Windows::System;
@@ -36,7 +35,6 @@ namespace winrt::TerminalApp::implementation
         _activePane = nullptr;
 
         _closePaneMenuItem.Visibility(WUX::Visibility::Collapsed);
-        _restartConnectionMenuItem.Visibility(WUX::Visibility::Collapsed);
 
         auto firstId = _nextPaneId;
 
@@ -225,7 +223,7 @@ namespace winrt::TerminalApp::implementation
 
         _focusState = focusState;
 
-        if (_focused())
+        if (_focusState != FocusState::Unfocused)
         {
             auto lastFocusedControl = GetActiveTerminalControl();
             if (lastFocusedControl)
@@ -280,17 +278,17 @@ namespace winrt::TerminalApp::implementation
     // - iconPath: The new path string to use as the IconPath for our TabViewItem
     // Return Value:
     // - <none>
-    void TerminalTab::UpdateIcon(const winrt::hstring iconPath, const winrt::Microsoft::Terminal::Settings::Model::IconStyle iconStyle)
+    void TerminalTab::UpdateIcon(const winrt::hstring iconPath)
     {
         ASSERT_UI_THREAD();
 
-        // Don't reload our icon and iconStyle hasn't changed.
-        if (iconPath == _lastIconPath && iconStyle == _lastIconStyle)
+        // Don't reload our icon if it hasn't changed.
+        if (iconPath == _lastIconPath)
         {
             return;
         }
+
         _lastIconPath = iconPath;
-        _lastIconStyle = iconStyle;
 
         // If the icon is currently hidden, just return here (but only after setting _lastIconPath to the new path
         // for when we show the icon again)
@@ -299,18 +297,9 @@ namespace winrt::TerminalApp::implementation
             return;
         }
 
-        if (iconStyle == IconStyle::Hidden)
-        {
-            // The TabViewItem Icon needs MUX while the IconSourceElement in the CommandPalette needs WUX...
-            Icon({});
-            TabViewItem().IconSource(IconSource{ nullptr });
-        }
-        else
-        {
-            Icon(_lastIconPath);
-            bool isMonochrome = iconStyle == IconStyle::Monochrome;
-            TabViewItem().IconSource(IconPathConverter::IconSourceMUX(_lastIconPath, isMonochrome));
-        }
+        // The TabViewItem Icon needs MUX while the IconSourceElement in the CommandPalette needs WUX...
+        Icon(_lastIconPath);
+        TabViewItem().IconSource(IconPathConverter::IconSourceMUX(_lastIconPath));
     }
 
     // Method Description:
@@ -332,7 +321,7 @@ namespace winrt::TerminalApp::implementation
             else
             {
                 Icon(_lastIconPath);
-                TabViewItem().IconSource(IconPathConverter::IconSourceMUX(_lastIconPath, _lastIconStyle == IconStyle::Monochrome));
+                TabViewItem().IconSource(IconPathConverter::IconSourceMUX(_lastIconPath));
             }
             _iconHidden = hide;
         }
@@ -506,9 +495,9 @@ namespace winrt::TerminalApp::implementation
     //         could itself be a parent pane/the root node of a tree of panes
     // Return Value:
     // - <none>
-    std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> TerminalTab::SplitPane(SplitDirection splitType,
-                                                                                   const float splitSize,
-                                                                                   std::shared_ptr<Pane> pane)
+    void TerminalTab::SplitPane(SplitDirection splitType,
+                                const float splitSize,
+                                std::shared_ptr<Pane> pane)
     {
         ASSERT_UI_THREAD();
 
@@ -553,8 +542,6 @@ namespace winrt::TerminalApp::implementation
         // possible that the focus events won't propagate immediately. Updating
         // the focus here will give the same effect though.
         _UpdateActivePane(newPane);
-
-        return { original, newPane };
     }
 
     // Method Description:
@@ -903,7 +890,6 @@ namespace winrt::TerminalApp::implementation
             control.TitleChanged(events.titleToken);
             control.TabColorChanged(events.colorToken);
             control.SetTaskbarProgress(events.taskbarToken);
-            control.ConnectionStateChanged(events.stateToken);
             control.ReadOnlyChanged(events.readOnlyToken);
             control.FocusFollowMouseRequested(events.focusToken);
 
@@ -963,14 +949,6 @@ namespace winrt::TerminalApp::implementation
             }
         });
 
-        events.stateToken = control.ConnectionStateChanged([dispatcher, weakThis](auto&&, auto&&) -> winrt::fire_and_forget {
-            co_await wil::resume_foreground(dispatcher);
-            if (auto tab{ weakThis.get() })
-            {
-                tab->_UpdateConnectionClosedState();
-            }
-        });
-
         events.readOnlyToken = control.ReadOnlyChanged([dispatcher, weakThis](auto&&, auto&&) -> winrt::fire_and_forget {
             co_await wil::resume_foreground(dispatcher);
             if (auto tab{ weakThis.get() })
@@ -983,7 +961,7 @@ namespace winrt::TerminalApp::implementation
             co_await wil::resume_foreground(dispatcher);
             if (const auto tab{ weakThis.get() })
             {
-                if (tab->_focused())
+                if (tab->_focusState != FocusState::Unfocused)
                 {
                     if (const auto termControl{ sender.try_as<winrt::Microsoft::Terminal::Control::TermControl>() })
                     {
@@ -1076,40 +1054,6 @@ namespace winrt::TerminalApp::implementation
         _TaskbarProgressChangedHandlers(nullptr, nullptr);
     }
 
-    // Method Description:
-    // - Set an indicator on the tab if any pane is in a closed connection state.
-    // - Show/hide the Restart Connection context menu entry depending on active pane's state.
-    // Arguments:
-    // - <none>
-    // Return Value:
-    // - <none>
-    void TerminalTab::_UpdateConnectionClosedState()
-    {
-        ASSERT_UI_THREAD();
-
-        if (_rootPane)
-        {
-            const bool isClosed = _rootPane->WalkTree([&](const auto& p) {
-                return p->IsConnectionClosed();
-            });
-
-            _tabStatus.IsConnectionClosed(isClosed);
-        }
-
-        if (_activePane)
-        {
-            _restartConnectionMenuItem.Visibility(_activePane->IsConnectionClosed() ?
-                                                      WUX::Visibility::Visible :
-                                                      WUX::Visibility::Collapsed);
-        }
-    }
-
-    void TerminalTab::_RestartActivePaneConnection()
-    {
-        ActionAndArgs restartConnection{ ShortcutAction::RestartConnection, nullptr };
-        _dispatch.DoAction(*this, restartConnection);
-    }
-
     // Method Description:
     // - Mark the given pane as the active pane in this tab. All other panes
     //   will be marked as inactive. We'll also update our own UI state to
@@ -1128,7 +1072,6 @@ namespace winrt::TerminalApp::implementation
         // Update our own title text to match the newly-active pane.
         UpdateTitle();
         _UpdateProgressState();
-        _UpdateConnectionClosedState();
 
         // We need to move the pane to the top of our mru list
         // If its already somewhere in the list, remove it first
@@ -1450,28 +1393,6 @@ namespace winrt::TerminalApp::implementation
             Automation::AutomationProperties::SetHelpText(findMenuItem, findToolTip);
         }
 
-        Controls::MenuFlyoutItem restartConnectionMenuItem = _restartConnectionMenuItem;
-        {
-            // "Restart Connection"
-            Controls::FontIcon restartConnectionSymbol;
-            restartConnectionSymbol.FontFamily(Media::FontFamily{ L"Segoe Fluent Icons, Segoe MDL2 Assets" });
-            restartConnectionSymbol.Glyph(L"\xE72C");
-
-            restartConnectionMenuItem.Click([weakThis](auto&&, auto&&) {
-                if (auto tab{ weakThis.get() })
-                {
-                    tab->_RestartActivePaneConnection();
-                }
-            });
-            restartConnectionMenuItem.Text(RS_(L"RestartConnectionText"));
-            restartConnectionMenuItem.Icon(restartConnectionSymbol);
-
-            const auto restartConnectionToolTip = RS_(L"RestartConnectionToolTip");
-
-            WUX::Controls::ToolTipService::SetToolTip(restartConnectionMenuItem, box_value(restartConnectionToolTip));
-            Automation::AutomationProperties::SetHelpText(restartConnectionMenuItem, restartConnectionToolTip);
-        }
-
         // Build the menu
         Controls::MenuFlyout contextMenuFlyout;
         Controls::MenuFlyoutSeparator menuSeparator;
@@ -1482,7 +1403,6 @@ namespace winrt::TerminalApp::implementation
         contextMenuFlyout.Items().Append(moveTabToNewWindowMenuItem);
         contextMenuFlyout.Items().Append(exportTabMenuItem);
         contextMenuFlyout.Items().Append(findMenuItem);
-        contextMenuFlyout.Items().Append(restartConnectionMenuItem);
         contextMenuFlyout.Items().Append(menuSeparator);
 
         // GH#5750 - When the context menu is dismissed with ESC, toss the focus
@@ -1773,7 +1693,7 @@ namespace winrt::TerminalApp::implementation
         }
 
         ReadOnly(_rootPane->ContainsReadOnly());
-        _updateIsClosable();
+        TabViewItem().IsClosable(!ReadOnly());
     }
 
     std::shared_ptr<Pane> TerminalTab::GetActivePane() const

src/cascadia/TerminalApp/TerminalTab.h

@@ -36,12 +36,12 @@ namespace winrt::TerminalApp::implementation
 
         void AttachColorPicker(winrt::TerminalApp::ColorPickupFlyout& colorPicker);
 
-        std::pair<std::shared_ptr<Pane>, std::shared_ptr<Pane>> SplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitDirection splitType,
-                                                                          const float splitSize,
-                                                                          std::shared_ptr<Pane> newPane);
+        void SplitPane(winrt::Microsoft::Terminal::Settings::Model::SplitDirection splitType,
+                       const float splitSize,
+                       std::shared_ptr<Pane> newPane);
 
         void ToggleSplitOrientation();
-        void UpdateIcon(const winrt::hstring iconPath, const winrt::Microsoft::Terminal::Settings::Model::IconStyle iconStyle);
+        void UpdateIcon(const winrt::hstring iconPath);
         void HideIcon(const bool hide);
 
         void ShowBellIndicator(const bool show);
@@ -109,9 +109,7 @@ namespace winrt::TerminalApp::implementation
         std::shared_ptr<Pane> _zoomedPane{ nullptr };
 
         Windows::UI::Xaml::Controls::MenuFlyoutItem _closePaneMenuItem;
-        Windows::UI::Xaml::Controls::MenuFlyoutItem _restartConnectionMenuItem;
 
-        winrt::Microsoft::Terminal::Settings::Model::IconStyle _lastIconStyle;
         winrt::hstring _lastIconPath{};
         std::optional<winrt::Windows::UI::Color> _runtimeTabColor{};
         winrt::TerminalApp::TabHeaderControl _headerControl{};
@@ -127,7 +125,6 @@ namespace winrt::TerminalApp::implementation
             winrt::event_token titleToken;
             winrt::event_token colorToken;
             winrt::event_token taskbarToken;
-            winrt::event_token stateToken;
             winrt::event_token readOnlyToken;
             winrt::event_token focusToken;
 
@@ -174,9 +171,6 @@ namespace winrt::TerminalApp::implementation
 
         void _UpdateProgressState();
 
-        void _UpdateConnectionClosedState();
-        void _RestartActivePaneConnection();
-
         void _DuplicateTab();
 
         virtual winrt::Windows::UI::Xaml::Media::Brush _BackgroundBrush() override;

src/cascadia/TerminalApp/TerminalTabStatus.h

@@ -12,7 +12,6 @@ namespace winrt::TerminalApp::implementation
         TerminalTabStatus() = default;
 
         WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
-        WINRT_OBSERVABLE_PROPERTY(bool, IsConnectionClosed, _PropertyChangedHandlers);
         WINRT_OBSERVABLE_PROPERTY(bool, IsPaneZoomed, _PropertyChangedHandlers);
         WINRT_OBSERVABLE_PROPERTY(bool, IsProgressRingActive, _PropertyChangedHandlers);
         WINRT_OBSERVABLE_PROPERTY(bool, IsProgressRingIndeterminate, _PropertyChangedHandlers);

src/cascadia/TerminalApp/TerminalTabStatus.idl

@@ -7,7 +7,6 @@ namespace TerminalApp
     {
         TerminalTabStatus();
 
-        Boolean IsConnectionClosed { get; set; };
         Boolean IsPaneZoomed { get; set; };
         Boolean IsProgressRingActive { get; set; };
         Boolean IsProgressRingIndeterminate { get; set; };

src/cascadia/TerminalApp/TerminalWindow.cpp

@@ -204,19 +204,39 @@ namespace winrt::TerminalApp::implementation
         // Pay attention, that even if some command line arguments were parsed (like launch mode),
         // we will not use the startup actions from settings.
         // While this simplifies the logic, we might want to reconsider this behavior in the future.
-        //
-        // Obviously, don't use the `startupActions` from the settings in the
-        // case of a tear-out / reattach. GH#16050
-        if (!_hasCommandLineArguments &&
-            _initialContentArgs.empty() &&
-            _gotSettingsStartupActions)
+        if (!_hasCommandLineArguments && _gotSettingsStartupActions)
         {
             _root->SetStartupActions(_settingsStartupArgs);
         }
 
         _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->Initialized([this](auto&&, auto&&) {
+            // GH#288 - When we finish initialization, if the user wanted us
+            // launched _fullscreen_, toggle fullscreen mode. This will make sure
+            // that the window size is _first_ set up as something sensible, so
+            // leaving fullscreen returns to a reasonable size.
+            const auto launchMode = this->GetLaunchMode();
+            if (_WindowProperties->IsQuakeWindow() || WI_IsFlagSet(launchMode, LaunchMode::FocusMode))
+            {
+                _root->SetFocusMode(true);
+            }
+
+            // The IslandWindow handles (creating) the maximized state
+            // we just want to record it here on the page as well.
+            if (WI_IsFlagSet(launchMode, LaunchMode::MaximizedMode))
+            {
+                _root->Maximized(true);
+            }
+
+            if (WI_IsFlagSet(launchMode, LaunchMode::FullscreenMode) && !_WindowProperties->IsQuakeWindow())
+            {
+                _root->SetFullscreen(true);
+            }
+
+            AppLogic::Current()->NotifyRootInitialized();
+        });
         _root->Create();
 
         AppLogic::Current()->SettingsChanged({ get_weak(), &TerminalWindow::UpdateSettingsHandler });
@@ -235,34 +255,6 @@ namespace winrt::TerminalApp::implementation
             TraceLoggingKeyword(MICROSOFT_KEYWORD_MEASURES),
             TelemetryPrivacyDataTag(PDT_ProductAndServiceUsage));
     }
-
-    void TerminalWindow::_pageInitialized(const IInspectable&, const IInspectable&)
-    {
-        // GH#288 - When we finish initialization, if the user wanted us
-        // launched _fullscreen_, toggle fullscreen mode. This will make sure
-        // that the window size is _first_ set up as something sensible, so
-        // leaving fullscreen returns to a reasonable size.
-        const auto launchMode = this->GetLaunchMode();
-        if (_WindowProperties->IsQuakeWindow() || WI_IsFlagSet(launchMode, LaunchMode::FocusMode))
-        {
-            _root->SetFocusMode(true);
-        }
-
-        // The IslandWindow handles (creating) the maximized state
-        // we just want to record it here on the page as well.
-        if (WI_IsFlagSet(launchMode, LaunchMode::MaximizedMode))
-        {
-            _root->Maximized(true);
-        }
-
-        if (WI_IsFlagSet(launchMode, LaunchMode::FullscreenMode) && !_WindowProperties->IsQuakeWindow())
-        {
-            _root->SetFullscreen(true);
-        }
-
-        AppLogic::Current()->NotifyRootInitialized();
-    }
-
     void TerminalWindow::Quit()
     {
         if (_root)
@@ -783,10 +775,6 @@ namespace winrt::TerminalApp::implementation
             {
                 _ShowLoadWarningsDialog(args.Warnings());
             }
-            else if (args.Result() == S_OK)
-            {
-                DismissDialog();
-            }
             _RefreshThemeRoutine();
         }
     }
@@ -1036,12 +1024,9 @@ namespace winrt::TerminalApp::implementation
     // Return Value:
     // - the result of the first command who's parsing returned a non-zero code,
     //   or 0. (see TerminalWindow::_ParseArgs)
-    int32_t TerminalWindow::SetStartupCommandline(array_view<const winrt::hstring> args,
-                                                  winrt::hstring cwd,
-                                                  winrt::hstring env)
+    int32_t TerminalWindow::SetStartupCommandline(array_view<const winrt::hstring> args, winrt::hstring cwd)
     {
         _WindowProperties->SetInitialCwd(std::move(cwd));
-        _WindowProperties->VirtualEnvVars(std::move(env));
 
         // This is called in AppHost::ctor(), before we've created the window
         // (or called TerminalWindow::Initialize)
@@ -1096,8 +1081,7 @@ namespace winrt::TerminalApp::implementation
     // - the result of the first command who's parsing returned a non-zero code,
     //   or 0. (see TerminalWindow::_ParseArgs)
     int32_t TerminalWindow::ExecuteCommandline(array_view<const winrt::hstring> args,
-                                               const winrt::hstring& cwd,
-                                               const winrt::hstring& env)
+                                               const winrt::hstring& cwd)
     {
         ::TerminalApp::AppCommandlineArgs appArgs;
         auto result = appArgs.ParseArgs(args);
@@ -1105,7 +1089,7 @@ namespace winrt::TerminalApp::implementation
         {
             auto actions = winrt::single_threaded_vector<ActionAndArgs>(std::move(appArgs.GetStartupActions()));
 
-            _root->ProcessStartupActions(actions, false, cwd, env);
+            _root->ProcessStartupActions(actions, false, cwd);
 
             if (appArgs.IsHandoffListener())
             {

src/cascadia/TerminalApp/TerminalWindow.h

@@ -56,8 +56,6 @@ namespace winrt::TerminalApp::implementation
         // Used for setting the initial CWD, before we have XAML set up for property change notifications.
         void SetInitialCwd(winrt::hstring cwd) { _VirtualWorkingDirectory = std::move(cwd); };
 
-        til::property<winrt::hstring> VirtualEnvVars;
-
     private:
         winrt::hstring _WindowName{};
         uint64_t _WindowId{ 0 };
@@ -79,9 +77,9 @@ namespace winrt::TerminalApp::implementation
 
         bool HasCommandlineArguments() const noexcept;
 
-        int32_t SetStartupCommandline(array_view<const winrt::hstring> actions, winrt::hstring cwd, winrt::hstring env);
+        int32_t SetStartupCommandline(array_view<const winrt::hstring> actions, winrt::hstring cwd);
         void SetStartupContent(const winrt::hstring& content, const Windows::Foundation::IReference<Windows::Foundation::Rect>& contentBounds);
-        int32_t ExecuteCommandline(array_view<const winrt::hstring> actions, const winrt::hstring& cwd, const winrt::hstring& env);
+        int32_t ExecuteCommandline(array_view<const winrt::hstring> actions, const winrt::hstring& cwd);
         void SetSettingsStartupArgs(const std::vector<winrt::Microsoft::Terminal::Settings::Model::ActionAndArgs>& actions);
         winrt::hstring ParseCommandlineMessage();
         bool ShouldExitEarly();
@@ -202,7 +200,6 @@ namespace winrt::TerminalApp::implementation
 
         void _RefreshThemeRoutine();
         void _OnLoaded(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
-        void _pageInitialized(const IInspectable& sender, const IInspectable& eventArgs);
         void _OpenSettingsUI();
 
         winrt::Windows::Foundation::Collections::IVector<Microsoft::Terminal::Settings::Model::ActionAndArgs> _contentStringToActions(const winrt::hstring& content,

src/cascadia/TerminalApp/TerminalWindow.idl

@@ -53,9 +53,9 @@ namespace TerminalApp
 
         Boolean HasCommandlineArguments();
 
-        Int32 SetStartupCommandline(String[] commands, String cwd, String env);
+        Int32 SetStartupCommandline(String[] commands, String cwd);
         void SetStartupContent(String json, Windows.Foundation.IReference<Windows.Foundation.Rect> bounds);
-        Int32 ExecuteCommandline(String[] commands, String cwd, String env);
+        Int32 ExecuteCommandline(String[] commands, String cwd);
         String ParseCommandlineMessage { get; };
         Boolean ShouldExitEarly { get; };
 

src/cascadia/TerminalApp/pch.h

@@ -49,7 +49,6 @@
 #include <winrt/Windows.Media.h>
 #include <winrt/Windows.Media.Core.h>
 #include <winrt/Windows.Media.Playback.h>
-#include <winrt/Windows.Management.Deployment.h>
 
 #include <winrt/Microsoft.UI.Xaml.Controls.h>
 #include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>

src/cascadia/TerminalConnection/AzureConnection.cpp

@@ -398,7 +398,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
                         switch (bufferType)
                         {
-                        case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE:
                         case WINHTTP_WEB_SOCKET_UTF8_FRAGMENT_BUFFER_TYPE:
                         case WINHTTP_WEB_SOCKET_UTF8_MESSAGE_BUFFER_TYPE:
                         {
@@ -798,7 +797,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
     // - an optional HTTP method (defaults to POST if content is present, GET otherwise)
     // Return value:
     // - the response from the server as a json value
-    WDJ::JsonObject AzureConnection::_SendRequestReturningJson(std::wstring_view uri, const WWH::IHttpContent& content, WWH::HttpMethod method, const Windows::Foundation::Uri referer)
+    WDJ::JsonObject AzureConnection::_SendRequestReturningJson(std::wstring_view uri, const WWH::IHttpContent& content, WWH::HttpMethod method)
     {
         if (!method)
         {
@@ -811,11 +810,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         auto headers{ request.Headers() };
         headers.Accept().TryParseAdd(L"application/json");
 
-        if (referer)
-        {
-            headers.Referer(referer);
-        }
-
         const auto response{ _httpClient.SendRequestAsync(request).get() };
         const auto string{ response.Content().ReadAsStringAsync().get() };
         const auto jsonResult{ WDJ::JsonObject::Parse(string) };
@@ -980,56 +974,17 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
         auto uri{ fmt::format(L"{}terminals?cols={}&rows={}&version=2019-01-01&shell={}", _cloudShellUri, _initialCols, _initialRows, shellType) };
 
         WWH::HttpStringContent content{
-            L"{}",
+            L"",
             WSS::UnicodeEncoding::Utf8,
             // LOAD-BEARING. the API returns "'content-type' should be 'application/json' or 'multipart/form-data'"
             L"application/json"
         };
 
-        const auto terminalResponse = _SendRequestReturningJson(uri, content, WWH::HttpMethod::Post(), Windows::Foundation::Uri(_cloudShellUri));
+        const auto terminalResponse = _SendRequestReturningJson(uri, content);
         _terminalID = terminalResponse.GetNamedString(L"id");
 
-        // we have to do some post-handling to get the proper socket endpoint
-        // the logic here is based on the way the cloud shell team itself does it
-        winrt::hstring finalSocketUri;
-        const std::wstring_view wCloudShellUri{ _cloudShellUri };
-
-        if (wCloudShellUri.find(L"servicebus") == std::wstring::npos)
-        {
-            // wCloudShellUri does not contain the word "servicebus", we can just use it to make the final URI
-
-            // remove the "https" from the cloud shell URI
-            const auto uriWithoutProtocol = wCloudShellUri.substr(5);
-
-            finalSocketUri = fmt::format(FMT_COMPILE(L"wss{}terminals/{}"), uriWithoutProtocol, _terminalID);
-        }
-        else
-        {
-            // if wCloudShellUri contains the word "servicebus", that means the returned socketUri is of the form
-            // wss://ccon-prod-westus-aci-03.servicebus.windows.net/cc-AAAA-AAAAAAAA//aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-            // we need to change it to:
-            // wss://ccon-prod-westus-aci-03.servicebus.windows.net/$hc/cc-AAAA-AAAAAAAA/terminals/aaaaaaaaaaaaaaaaaaaaaa
-
-            const auto socketUri = terminalResponse.GetNamedString(L"socketUri");
-            const std::wstring_view wSocketUri{ socketUri };
-
-            // get the substring up until the ".net"
-            const auto dotNetStart = wSocketUri.find(L".net");
-            THROW_HR_IF(E_UNEXPECTED, dotNetStart == std::wstring::npos);
-            const auto dotNetEnd = dotNetStart + 4;
-            const auto wSocketUriBody = wSocketUri.substr(0, dotNetEnd);
-
-            // get the portion between the ".net" and the "//" (this is the cc-AAAA-AAAAAAAA part)
-            const auto lastDoubleSlashPos = wSocketUri.find_last_of(L"//");
-            THROW_HR_IF(E_UNEXPECTED, lastDoubleSlashPos == std::wstring::npos);
-            const auto wSocketUriMiddle = wSocketUri.substr(dotNetEnd, lastDoubleSlashPos - (dotNetEnd));
-
-            // piece together the final uri, adding in the "$hc" and "terminals" where needed
-            finalSocketUri = fmt::format(FMT_COMPILE(L"{}/$hc{}terminals/{}"), wSocketUriBody, wSocketUriMiddle, _terminalID);
-        }
-
         // Return the uri
-        return winrt::hstring{ finalSocketUri };
+        return terminalResponse.GetNamedString(L"socketUri");
     }
 
     // Method description:

src/cascadia/TerminalConnection/AzureConnection.h

@@ -68,7 +68,7 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
 
         void _WriteStringWithNewline(const std::wstring_view str);
         void _WriteCaughtExceptionRecord();
-        winrt::Windows::Data::Json::JsonObject _SendRequestReturningJson(std::wstring_view uri, const winrt::Windows::Web::Http::IHttpContent& content = nullptr, winrt::Windows::Web::Http::HttpMethod method = nullptr, const winrt::Windows::Foundation::Uri referer = nullptr);
+        winrt::Windows::Data::Json::JsonObject _SendRequestReturningJson(std::wstring_view uri, const winrt::Windows::Web::Http::IHttpContent& content = nullptr, winrt::Windows::Web::Http::HttpMethod method = nullptr);
         void _setAccessToken(std::wstring_view accessToken);
         winrt::Windows::Data::Json::JsonObject _GetDeviceCode();
         winrt::Windows::Data::Json::JsonObject _WaitForUser(const winrt::hstring& deviceCode, int pollInterval, int expiresIn);