render: Make PaintSelection take a rect span

The renderer will consume *buffer-relative selection spans* and prepare
them into *viewport-relative rects*.

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -1,7 +1,6 @@
 name: "Bug report 🐛"
 description: Report errors or unexpected behavior
 labels: [Issue-Bug, Needs-Triage]
-type: Bug
 body:
 - type: markdown
   attributes:
@@ -13,7 +12,7 @@ body:
 - type: input
   attributes:
     label: Windows Terminal version
-    placeholder: "1.21.2701.0"
+    placeholder: "1.7.3651.0"
     description: |
       You can copy the version number from the About dialog. Open the About dialog by opening the menu with the "V" button (to the right of the "+" button that opens a new tab) and choosing About from the end of the list.
   validations:
@@ -22,7 +21,7 @@ body:
 - type: input
   attributes:
     label: Windows build number
-    placeholder: "10.0.22621.0"
+    placeholder: "10.0.19042.0"
     description: |
       Please run `ver` or `[Environment]::OSVersion`.
   validations:
@@ -33,9 +32,9 @@ body:
     label: Other Software
     description: If you're reporting a bug about our interaction with other software, what software? What versions?
     placeholder: |
-      vim 9.1 (inside WSL)
-      OpenSSH_for_Windows_9.5p1
-      My Cool Application v0.4 (include a code snippet if it would help!)
+      vim 8.2 (inside WSL)
+      OpenSSH_for_Windows_8.1p1
+      My Cool Application v0.3 (include a code snippet if it would help!)
   validations:
     required: false
 

.github/ISSUE_TEMPLATE/Documentation_Issue.md

@@ -0,0 +1,10 @@
+---
+name: "Documentation Issue 📚"
+about: Report issues in our documentation
+title: ''
+labels: Issue-Docs
+assignees: ''
+
+---
+
+<!-- Briefly describe which document needs to be corrected and why. -->

.github/ISSUE_TEMPLATE/Feature_Request.md

@@ -0,0 +1,35 @@
+---
+name: "Feature Request/Idea 🚀"
+about: Suggest a new feature or improvement (this does not mean you have to implement
+  it)
+title: ''
+labels: Issue-Feature
+assignees: ''
+
+---
+
+<!-- 
+🚨🚨🚨🚨🚨🚨🚨🚨🚨🚨
+
+I ACKNOWLEDGE THE FOLLOWING BEFORE PROCEEDING:
+1. If I delete this entire template and go my own path, the core team may close my issue without further explanation or engagement.
+2. If I list multiple bugs/concerns in this one issue, the core team may close my issue without further explanation or engagement.
+3. If I write an issue that has many duplicates, the core team may close my issue without further explanation or engagement (and without necessarily spending time to find the exact duplicate ID number).
+4. If I leave the title incomplete when filing the issue, the core team may close my issue without further explanation or engagement.
+5. If I file something completely blank in the body, the core team may close my issue without further explanation or engagement.
+
+All good? Then proceed!
+-->
+
+# Description of the new feature/enhancement
+
+<!-- 
+A clear and concise description of what the problem is that the new feature would solve.
+Describe why and how a user would use this new functionality (if applicable).
+-->
+
+# Proposed technical implementation details (optional)
+
+<!-- 
+A clear and concise description of what you want to happen.
+-->

.github/ISSUE_TEMPLATE/Feature_Request.yml

@@ -1,20 +0,0 @@
-name: "Feature Request/Idea 🚀"
-description: Suggest a new feature or improvement (this does not mean you have to implement it)
-labels: [Issue-Feature]
-type: Feature
-body:
-- type: textarea
-  attributes:
-    label: Description of the new feature
-    description: A clear and concise description of what the problem is that the new feature would solve.
-    placeholder: |
-      ... and guess what? I have four Terminals. And I have a hover car, and a hover house. And my computer's a runner, and it shows.
-  validations:
-    required: true
-
-- type: textarea
-  attributes:
-    label: Proposed technical implementation details
-    description: This field is optional. If you have any ideas, let us know!
-  validations:
-    required: false

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

@@ -1,13 +1,10 @@
 aci
-AIIs
-AILLM
 allcolors
 breadcrumb
 breadcrumbs
 ccmp
 ccon
 clickable
-cmark
 CMMI
 colorbrewer
 consvc
@@ -25,22 +22,16 @@ Emacspeak
 Fitt
 FTCS
 gantt
-gfm
 ghe
 gje
 godbolt
-gpt
 hyperlinking
 hyperlinks
-ILM
-Kbds
 kje
 libfuzzer
 liga
 lje
 Llast
-lm
-llm
 Lmid
 locl
 lol
@@ -52,10 +43,8 @@ mkmk
 mnt
 mru
 nje
-NTMTo
 notwrapped
 ogonek
-openai
 overlined
 perlw
 postmodern
@@ -65,7 +54,6 @@ pwn
 pwshw
 qof
 qps
-Quarternary
 quickfix
 rclt
 reimplementation

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

@@ -43,7 +43,6 @@ DONTADDTORECENT
 DWMSBT
 DWMWA
 DWORDLONG
-EMPH
 endfor
 ENDSESSION
 enumset
@@ -63,7 +62,6 @@ GETDESKWALLPAPER
 GETHIGHCONTRAST
 GETMOUSEHOVERTIME
 GETTEXTLENGTH
-HARDBREAKS
 Hashtable
 HIGHCONTRASTON
 HIGHCONTRASTW
@@ -98,10 +96,11 @@ IGraphics
 IImage
 IInheritable
 IMap
-imm
+IMonarch
 IObject
 iosfwd
 IPackage
+IPeasant
 isa
 ISetup
 isspace
@@ -115,7 +114,6 @@ IUri
 IVirtual
 KEYSELECT
 LCID
-LINEBREAK
 llabs
 llu
 localtime
@@ -149,9 +147,7 @@ NIF
 NIN
 NOAGGREGATION
 NOASYNC
-NOBREAKS
 NOCHANGEDIR
-NOCRLF
 NOPROGRESS
 NOREDIRECTIONBITMAP
 NOREPEAT
@@ -178,7 +174,6 @@ PALLOC
 PATINVERT
 PEXPLICIT
 PICKFOLDERS
-PINPUT
 pmr
 ptstr
 QUERYENDSESSION
@@ -207,7 +202,6 @@ SINGLEUSE
 SIZENS
 smoothstep
 snprintf
-SOFTBREAK
 spsc
 sregex
 SRWLOC
@@ -255,7 +249,6 @@ wcsnlen
 wcsstr
 wcstoui
 WDJ
-wincrypt
 winhttp
 wininet
 winmain

.github/actions/spelling/excludes.txt

@@ -104,9 +104,7 @@
 ^doc/reference/UTF8-torture-test\.txt$
 ^doc/reference/windows-terminal-logo\.ans$
 ^oss/
-^NOTICE.md
 ^samples/PixelShaders/Screenshots/
-^src/cascadia/TerminalSettingsEditor/SegoeFluentIconList.h$
 ^src/interactivity/onecore/BgfxEngine\.
 ^src/renderer/atlas/
 ^src/renderer/wddmcon/WddmConRenderer\.

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

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

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

@@ -9,6 +9,7 @@ ABORTIFHUNG
 ACCESSTOKEN
 acidev
 ACIOSS
+ACover
 acp
 actctx
 ACTCTXW
@@ -16,8 +17,6 @@ ADDALIAS
 ADDREF
 ADDSTRING
 ADDTOOL
-adml
-admx
 AFill
 AFX
 AHelper
@@ -88,7 +87,6 @@ Autowrap
 AVerify
 awch
 azurecr
-AZZ
 backgrounded
 Backgrounder
 backgrounding
@@ -165,7 +163,6 @@ CBN
 cbt
 Ccc
 CCCBB
-CCCDDD
 cch
 CCHAR
 CCmd
@@ -174,7 +171,6 @@ CCom
 CConsole
 CCRT
 cdd
-cds
 CELLSIZE
 cfae
 cfie
@@ -184,6 +180,7 @@ CFuzz
 cgscrn
 chafa
 changelists
+charinfo
 CHARSETINFO
 chh
 chshdng
@@ -267,6 +264,7 @@ consolegit
 consolehost
 CONSOLEIME
 consoleinternal
+Consoleroot
 CONSOLESETFOREGROUND
 consoletaeftemplates
 consoleuwp
@@ -282,8 +280,6 @@ contypes
 conwinuserrefs
 coordnew
 COPYCOLOR
-COPYDATA
-COPYDATASTRUCT
 CORESYSTEM
 cotaskmem
 countof
@@ -345,7 +341,6 @@ CXVIRTUALSCREEN
 CXVSCROLL
 CYFRAME
 CYFULLSCREEN
-cygdrive
 CYHSCROLL
 CYMIN
 CYPADDEDBORDER
@@ -372,7 +367,6 @@ dcommon
 dcompiler
 DComposition
 dde
-DDDCCC
 DDESHARE
 DDevice
 DEADCHAR
@@ -392,7 +386,7 @@ DECCIR
 DECCKM
 DECCKSR
 DECCOLM
-deccra
+DECCRA
 DECCTR
 DECDC
 DECDHL
@@ -404,7 +398,7 @@ DECEKBD
 DECERA
 DECFI
 DECFNK
-decfra
+DECFRA
 DECGCI
 DECGCR
 DECGNL
@@ -572,12 +566,10 @@ entrypoints
 ENU
 ENUMLOGFONT
 ENUMLOGFONTEX
-EOB
 EOK
 EPres
 EQU
 ERASEBKGND
-ERRORONEXIT
 ESFCIB
 esrp
 ESV
@@ -735,6 +727,7 @@ GHIJKL
 gitcheckin
 gitfilters
 gitlab
+gitmodules
 gle
 GLOBALFOCUS
 GLYPHENTRY
@@ -792,7 +785,6 @@ HIWORD
 HKCU
 hkey
 hkl
-HKLM
 hlocal
 hlsl
 HMB
@@ -875,7 +867,6 @@ INLINEPREFIX
 inproc
 Inputkeyinfo
 Inputreadhandledata
-INPUTSCOPE
 INSERTMODE
 INTERACTIVITYBASE
 INTERCEPTCOPYPASTE
@@ -925,7 +916,6 @@ Keymapping
 keyscan
 keystate
 keyups
-Kickstart
 KILLACTIVE
 KILLFOCUS
 kinda
@@ -1031,6 +1021,7 @@ lstatus
 lstrcmp
 lstrcmpi
 LTEXT
+LTLTLTLTL
 ltsc
 LUID
 luma
@@ -1125,6 +1116,7 @@ msrc
 MSVCRTD
 MTSM
 Munged
+munges
 murmurhash
 muxes
 myapplet
@@ -1226,6 +1218,7 @@ ntlpcapi
 ntm
 ntrtl
 ntstatus
+NTSYSCALLAPI
 nttree
 nturtl
 ntuser
@@ -1302,7 +1295,6 @@ parms
 PATCOPY
 pathcch
 PATTERNID
-pbstr
 pcb
 pcch
 PCCHAR
@@ -1388,11 +1380,9 @@ POSTCHARBREAKS
 POSX
 POSXSCROLL
 POSYSCROLL
-ppbstr
 PPEB
 ppf
 ppidl
-pprg
 PPROC
 ppropvar
 ppsi
@@ -1471,7 +1461,6 @@ QWER
 Qxxxxxxxxxxxxxxx
 qzmp
 RAII
-Ralph
 RALT
 rasterbar
 rasterfont
@@ -1537,6 +1526,7 @@ rftp
 rgbi
 RGBQUAD
 rgbs
+rgci
 rgfae
 rgfte
 rgn
@@ -1614,7 +1604,6 @@ SELECTALL
 SELECTEDFONT
 SELECTSTRING
 Selfhosters
-Serbo
 SERVERDLL
 SETACTIVE
 SETBUDDYINT
@@ -1709,7 +1698,6 @@ srcsrv
 SRCSRVTRG
 srctool
 srect
-SRGS
 srvinit
 srvpipe
 ssa
@@ -1747,7 +1735,6 @@ swapchain
 swapchainpanel
 SWMR
 SWP
-swrapped
 SYMED
 SYNCPAINT
 syscalls
@@ -1845,6 +1832,8 @@ TOPDOWNDIB
 TOpt
 tosign
 touchpad
+Tpp
+Tpqrst
 tracelogging
 traceviewpp
 trackbar
@@ -1857,6 +1846,7 @@ triaging
 TRIMZEROHEADINGS
 trx
 tsa
+tsattrs
 tsgr
 tsm
 TStr
@@ -1968,6 +1958,7 @@ VPACKMANIFESTDIRECTORY
 VPR
 VREDRAW
 vsc
+vsconfig
 vscprintf
 VSCROLL
 vsdevshell
@@ -1984,8 +1975,10 @@ vswhere
 vtapp
 VTE
 VTID
+vtio
 vtmode
 vtpipeterm
+vtpt
 VTRGB
 VTRGBTo
 vtseq
@@ -2007,6 +2000,7 @@ wcswidth
 wddm
 wddmcon
 WDDMCONSOLECONTEXT
+WDK
 wdm
 webpage
 websites
@@ -2021,7 +2015,6 @@ WHelper
 wic
 WIDTHSCROLL
 Widthx
-Wiggum
 wil
 WImpl
 WINAPI
@@ -2081,6 +2074,7 @@ winuserp
 WINVER
 wistd
 wmain
+wmemory
 WMSZ
 wnd
 WNDALLOC
@@ -2091,8 +2085,6 @@ WNDCLASSW
 Wndproc
 WNegative
 WNull
-wordi
-wordiswrapped
 workarea
 WOutside
 WOWARM
@@ -2106,7 +2098,6 @@ WPrep
 WPresent
 wprp
 wprpi
-wrappe
 wregex
 writeback
 WRITECONSOLE
@@ -2182,7 +2173,6 @@ yact
 YCast
 YCENTER
 YCount
-yizz
 YLimit
 YPan
 YSubstantial
@@ -2196,4 +2186,3 @@ ZCtrl
 ZWJs
 ZYXWVU
 ZYXWVUTd
-zzf

.github/actions/spelling/patterns/patterns.txt

@@ -22,7 +22,6 @@ vcvars\w*
 ROY\sG\.\sBIV
 !(?:(?i)ESC)!\[
 !(?:(?i)CSI)!(?:\d+(?:;\d+|)m|[ABCDF])
-(?i)rgb:[a-z0-9]{2,4}/[a-z0-9]{2,4}/[a-z0-9]{2,4}
 
 # SSE intrinsics like "_mm_subs_epu16"
 \b_mm(?:|256|512)_\w+\b

.github/workflows/addToProject.yml

@@ -13,7 +13,7 @@ jobs:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v1.0.2
+      - uses: actions/add-to-project@v1.0.1
         with:
           project-url: https://github.com/orgs/microsoft/projects/159
           github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

.wt.json

@@ -23,12 +23,6 @@
             "name": "Upload package to nuget feed",
             "icon": "\uE898",
             "description": "Go download a .nupkg, put it in ~/Downloads, and use this to push to our private feed."
-        },
-        {
-            "input": "runut /name:**\u001b[D",
-            "name": "Run a test",
-            "icon": "",
-            "description": "Enter the name of a test to run"
         }
     ]
 }

NOTICE.md

@@ -281,181 +281,6 @@ CONDITIONS OF ANY KIND, either express or implied. See the License for the
 specific language governing permissions and limitations under the License.
 ```
 
-## cmark
-**Source**: [https://github.com/commonmark/cmark](https://github.com/commonmark/cmark)
-
-### License
-Copyright (c) 2014, John MacFarlane
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
------
-
-houdini.h, houdini_href_e.c, houdini_html_e.c, houdini_html_u.c
-
-derive from https://github.com/vmg/houdini (with some modifications)
-
-Copyright (C) 2012 Vicent Martí
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------
-
-buffer.h, buffer.c, chunk.h
-
-are derived from code (C) 2012 Github, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
------
-
-utf8.c and utf8.c
-
-are derived from utf8proc
-(<http://www.public-software-group.org/utf8proc>),
-(C) 2009 Public Software Group e. V., Berlin, Germany.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
------
-
-The normalization code in normalize.py was derived from the
-markdowntest project, Copyright 2013 Karl Dubost:
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Karl Dubost
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
------
-
-The CommonMark spec (test/spec.txt) is
-
-Copyright (C) 2014-15 John MacFarlane
-
-Released under the Creative Commons CC-BY-SA 4.0 license:
-<http://creativecommons.org/licenses/by-sa/4.0/>.
-
------
-
-The test software in test/ is
-
-Copyright (c) 2014, John MacFarlane
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 # Microsoft Open Source
 
 This product also incorporates source code from other Microsoft open source projects, all licensed under the MIT license.

OpenConsole.sln

@@ -178,6 +178,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Control"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\cascadia\WindowsTerminal\WindowsTerminal.vcxproj", "{CA5CAD1A-1754-4A9D-93D7-857A9D17CB1B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
 		{9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B} = {9CBD7DFA-1754-4A9D-93D7-857A9D17CB1B}
 		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12} = {CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}
@@ -187,7 +188,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsTerminal", "src\casc
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalApp", "src\cascadia\TerminalApp\dll\TerminalApp.vcxproj", "{CA5CAD1A-44BD-4AC7-AC72-F16E576FDD12}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E} = {6085A85F-59A9-41CA-AE74-8F4922AAE55E}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-9A12-429C-B551-8562EC954746} = {CA5CAD1A-9A12-429C-B551-8562EC954746}
@@ -239,7 +239,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_TerminalApp", "sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAppLib", "src\cascadia\TerminalApp\TerminalAppLib.vcxproj", "{CA5CAD1A-9A12-429C-B551-8562EC954746}"
 	ProjectSection(ProjectDependencies) = postProject
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E} = {6085A85F-59A9-41CA-AE74-8F4922AAE55E}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
 		{CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32} = {CA5CAD1A-0B5E-45C3-96A8-BB496BFE4E32}
 		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
@@ -318,8 +317,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TerminalAzBridge", "src\cas
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WpfTerminalTestNetCore", "src\cascadia\WpfTerminalTestNetCore\WpfTerminalTestNetCore.csproj", "{1588FD7C-241E-4E7D-9113-43735F3E6BAD}"
 	ProjectSection(ProjectDependencies) = postProject
-		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {A22EC5F6-7851-4B88-AC52-47249D437A52}
 		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
+		{A22EC5F6-7851-4B88-AC52-47249D437A52} = {A22EC5F6-7851-4B88-AC52-47249D437A52}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wt", "src\cascadia\wt\wt.vcxproj", "{506FD703-BAA7-4F6E-9361-64F550EC8FCA}"
@@ -349,6 +348,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_SettingsModel", "
 		{CA5CAD1A-F542-4635-A069-7CAEFB930070} = {CA5CAD1A-F542-4635-A069-7CAEFB930070}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MonarchPeasantSample", "src\tools\MonarchPeasantSample\MonarchPeasantSample.vcxproj", "{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}"
+	ProjectSection(ProjectDependencies) = postProject
+		{18D09A24-8240-42D6-8CB6-236EEE820263} = {18D09A24-8240-42D6-8CB6-236EEE820263}
+	EndProjectSection
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "MonarchPeasantPackage", "src\tools\MonarchPeasantPackage\MonarchPeasantPackage.wapproj", "{F75E29D0-D288-478B-8D83-2C190F321A3F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Remoting.Lib", "src\cascadia\Remoting\Microsoft.Terminal.RemotingLib.vcxproj", "{43CE4CE5-0010-4B99-9569-672670D26E26}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Remoting", "src\cascadia\Remoting\dll\Microsoft.Terminal.Remoting.vcxproj", "{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{43CE4CE5-0010-4B99-9569-672670D26E26} = {43CE4CE5-0010-4B99-9569-672670D26E26}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests_Remoting", "src\cascadia\UnitTests_Remoting\Remoting.UnitTests.vcxproj", "{68A10CD3-AA64-465B-AF5F-ED4E9700543C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}
+		{43CE4CE5-0010-4B99-9569-672670D26E26} = {43CE4CE5-0010-4B99-9569-672670D26E26}
+	EndProjectSection
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "wpf", "wpf", "{4DAF0299-495E-4CD1-A982-9BAC16A45932}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenConsoleProxy", "src\host\proxy\Host.Proxy.vcxproj", "{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}"
@@ -384,15 +403,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TerminalStress", "src\tools
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderingTests", "src\tools\RenderingTests\RenderingTests.vcxproj", "{37C995E0-2349-4154-8E77-4A52C0C7F46D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.Query.Extension", "src\cascadia\QueryExtension\Microsoft.Terminal.Query.Extension.vcxproj", "{6085A85F-59A9-41CA-AE74-8F4922AAE55E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{CA5CAD1A-082C-4476-9F33-94B339494076} = {CA5CAD1A-082C-4476-9F33-94B339494076}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI", "src\cascadia\UIHelpers\UIHelpers.vcxproj", "{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Terminal.UI.Markdown", "src\cascadia\UIMarkdown\UIMarkdown.vcxproj", "{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchcat", "src\tools\benchcat\benchcat.vcxproj", "{2C836962-9543-4CE5-B834-D28E1F124B66}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ConsoleMonitor", "src\tools\ConsoleMonitor\ConsoleMonitor.vcxproj", "{328729E9-6723-416E-9C98-951F1473BBE1}"
@@ -1911,6 +1923,135 @@ Global
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x64.Build.0 = Release|x64
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.ActiveCfg = Release|Win32
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42}.Release|x86.Build.0 = Release|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.AuditMode|Any CPU.ActiveCfg = Debug|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.AuditMode|ARM64.ActiveCfg = Release|ARM64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.AuditMode|x64.ActiveCfg = Release|x64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.AuditMode|x86.ActiveCfg = Release|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|ARM64.Build.0 = Debug|ARM64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|x64.ActiveCfg = Debug|x64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|x64.Build.0 = Debug|x64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|x86.ActiveCfg = Debug|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Debug|x86.Build.0 = Debug|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|Any CPU.ActiveCfg = Release|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|ARM64.ActiveCfg = Release|ARM64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|ARM64.Build.0 = Release|ARM64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x64.ActiveCfg = Release|x64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x64.Build.0 = Release|x64
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x86.ActiveCfg = Release|Win32
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D}.Release|x86.Build.0 = Release|Win32
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|Any CPU.ActiveCfg = Release|Any CPU
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM64.ActiveCfg = Debug|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM64.Build.0 = Debug|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|ARM64.Deploy.0 = Debug|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.ActiveCfg = Debug|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.Build.0 = Debug|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x64.Deploy.0 = Debug|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x86.ActiveCfg = Debug|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x86.Build.0 = Debug|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.AuditMode|x86.Deploy.0 = Debug|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM64.Build.0 = Debug|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|ARM64.Deploy.0 = Debug|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.ActiveCfg = Debug|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.Build.0 = Debug|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x64.Deploy.0 = Debug|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x86.ActiveCfg = Debug|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x86.Build.0 = Debug|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Debug|x86.Deploy.0 = Debug|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Fuzzing|Any CPU.ActiveCfg = Release|Any CPU
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Fuzzing|x64.ActiveCfg = Release|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Fuzzing|x86.ActiveCfg = Release|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM64.ActiveCfg = Release|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM64.Build.0 = Release|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|ARM64.Deploy.0 = Release|ARM64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.ActiveCfg = Release|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.Build.0 = Release|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x64.Deploy.0 = Release|x64
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x86.ActiveCfg = Release|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x86.Build.0 = Release|x86
+		{F75E29D0-D288-478B-8D83-2C190F321A3F}.Release|x86.Deploy.0 = Release|x86
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|x64.ActiveCfg = Release|x64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|x64.Build.0 = Release|x64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|ARM64.Build.0 = Debug|ARM64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|x64.ActiveCfg = Debug|x64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|x64.Build.0 = Debug|x64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|x86.ActiveCfg = Debug|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Debug|x86.Build.0 = Debug|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|Any CPU.ActiveCfg = Release|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|ARM64.ActiveCfg = Release|ARM64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|ARM64.Build.0 = Release|ARM64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|x64.ActiveCfg = Release|x64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|x64.Build.0 = Release|x64
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|x86.ActiveCfg = Release|Win32
+		{43CE4CE5-0010-4B99-9569-672670D26E26}.Release|x86.Build.0 = Release|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|x64.ActiveCfg = Release|x64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|ARM64.Build.0 = Debug|ARM64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|x64.ActiveCfg = Debug|x64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|x64.Build.0 = Debug|x64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|x86.ActiveCfg = Debug|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Debug|x86.Build.0 = Debug|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|Any CPU.ActiveCfg = Release|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|ARM64.ActiveCfg = Release|ARM64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|ARM64.Build.0 = Release|ARM64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|x64.ActiveCfg = Release|x64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|x64.Build.0 = Release|x64
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|x86.ActiveCfg = Release|Win32
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE}.Release|x86.Build.0 = Release|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|x64.ActiveCfg = AuditMode|x64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|x86.ActiveCfg = AuditMode|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.AuditMode|x86.Build.0 = AuditMode|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|x64.ActiveCfg = Debug|x64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|x64.Build.0 = Debug|x64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|x86.ActiveCfg = Debug|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Debug|x86.Build.0 = Debug|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|Any CPU.ActiveCfg = Release|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|ARM64.Build.0 = Release|ARM64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|x64.ActiveCfg = Release|x64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|x64.Build.0 = Release|x64
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|x86.ActiveCfg = Release|Win32
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C}.Release|x86.Build.0 = Release|Win32
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF}.AuditMode|ARM64.Build.0 = AuditMode|ARM64
@@ -2138,29 +2279,6 @@ Global
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|ARM64.ActiveCfg = Release|ARM64
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x64.ActiveCfg = Release|x64
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x86.ActiveCfg = Release|Win32
-		{37C995E0-2349-4154-8E77-4A52C0C7F46D}.Release|x86.Build.0 = Release|Win32
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|x64.ActiveCfg = Debug|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|x64.Build.0 = Debug|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|x86.ActiveCfg = Debug|Win32
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Debug|x86.Build.0 = Debug|Win32
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|Any CPU.ActiveCfg = Release|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|ARM64.Build.0 = Release|ARM64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|x64.ActiveCfg = Release|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|x64.Build.0 = Release|x64
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|x86.ActiveCfg = Release|Win32
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E}.Release|x86.Build.0 = Release|Win32
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.AuditMode|x64.ActiveCfg = AuditMode|x64
@@ -2184,28 +2302,6 @@ Global
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x64.Build.0 = Release|x64
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x86.ActiveCfg = Release|Win32
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F}.Release|x86.Build.0 = Release|Win32
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.AuditMode|Any CPU.ActiveCfg = AuditMode|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.AuditMode|ARM64.ActiveCfg = AuditMode|ARM64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.AuditMode|x64.ActiveCfg = AuditMode|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.AuditMode|x86.ActiveCfg = AuditMode|Win32
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|ARM64.Build.0 = Debug|ARM64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|x64.ActiveCfg = Debug|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|x64.Build.0 = Debug|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|x86.ActiveCfg = Debug|Win32
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Debug|x86.Build.0 = Debug|Win32
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Fuzzing|Any CPU.ActiveCfg = Fuzzing|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Fuzzing|ARM64.ActiveCfg = Fuzzing|ARM64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Fuzzing|x64.ActiveCfg = Fuzzing|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Fuzzing|x86.ActiveCfg = Fuzzing|Win32
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|Any CPU.ActiveCfg = Release|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|ARM64.ActiveCfg = Release|ARM64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|ARM64.Build.0 = Release|ARM64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|x64.ActiveCfg = Release|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|x64.Build.0 = Release|x64
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|x86.ActiveCfg = Release|Win32
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F}.Release|x86.Build.0 = Release|Win32
 		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|Any CPU.ActiveCfg = AuditMode|Win32
 		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|ARM64.ActiveCfg = Release|ARM64
 		{2C836962-9543-4CE5-B834-D28E1F124B66}.AuditMode|x64.ActiveCfg = Release|x64
@@ -2337,6 +2433,11 @@ Global
 		{CA5CAD1A-D7EC-4107-B7C6-79CB77AE2907} = {77875138-BB08-49F9-8BB1-409C2150E0E1}
 		{CA5CAD1A-082C-4476-9F33-94B339494076} = {77875138-BB08-49F9-8BB1-409C2150E0E1}
 		{CA5CAD1A-9B68-456A-B13E-C8218070DC42} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
+		{21B7EA5E-1EF8-49B6-AC07-11714AF0E37D} = {A10C4720-DCA4-4640-9749-67F4314F527C}
+		{F75E29D0-D288-478B-8D83-2C190F321A3F} = {A10C4720-DCA4-4640-9749-67F4314F527C}
+		{43CE4CE5-0010-4B99-9569-672670D26E26} = {2D17E75D-2DDC-42C4-AD70-704D95A937AE}
+		{27B5AAEB-A548-44CF-9777-F8BAA32AF7AE} = {2D17E75D-2DDC-42C4-AD70-704D95A937AE}
+		{68A10CD3-AA64-465B-AF5F-ED4E9700543C} = {BDB237B6-1D1D-400F-84CC-40A58FA59C8E}
 		{4DAF0299-495E-4CD1-A982-9BAC16A45932} = {59840756-302F-44DF-AA47-441A9D673202}
 		{71CC9D78-BA29-4D93-946F-BEF5D9A3A6EF} = {E8F24881-5E37-4362-B191-A3BA0ED7F4EB}
 		{2D17E75D-2DDC-42C4-AD70-704D95A937AE} = {59840756-302F-44DF-AA47-441A9D673202}
@@ -2353,9 +2454,7 @@ Global
 		{3C67784E-1453-49C2-9660-483E2CC7F7AD} = {40BD8415-DD93-4200-8D82-498DDDC08CC8}
 		{613CCB57-5FA9-48EF-80D0-6B1E319E20C4} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{37C995E0-2349-4154-8E77-4A52C0C7F46D} = {A10C4720-DCA4-4640-9749-67F4314F527C}
-		{6085A85F-59A9-41CA-AE74-8F4922AAE55E} = {59840756-302F-44DF-AA47-441A9D673202}
 		{6515F03F-E56D-4DB4-B23D-AC4FB80DB36F} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
-		{7615F03F-E56D-4DB4-B23D-BD4FB80DB36F} = {61901E80-E97D-4D61-A9BB-E8F2FDA8B40C}
 		{2C836962-9543-4CE5-B834-D28E1F124B66} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{328729E9-6723-416E-9C98-951F1473BBE1} = {A10C4720-DCA4-4640-9749-67F4314F527C}
 		{BE92101C-04F8-48DA-99F0-E1F4F1D2DC48} = {A10C4720-DCA4-4640-9749-67F4314F527C}

build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml

@@ -56,15 +56,7 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Wir haben umgeschrieben, wie Konsolenanwendungen im Terminal gehostet werden! Melden Sie alle auftretenden Fehler.
-- Terminal unterstützt jetzt Sixels!
-- Sie können jetzt ein angedocktes Fenster öffnen, das Ausschnitte von Befehlen enthält, die Sie gespeichert haben, um sie später zu verwenden.
-- Für Benutzer der Eingabeaufforderung der neuesten Version von Windows 11 wird möglicherweise ein „Kurzer Tipp“-Symbol angezeigt, das installierbare Software von WinGet
- vorschlägt
-- Ausgewählter Text wird jetzt viel sichtbarer (und anpassbarer!)
-- Eine Reihe von Zuverlässigkeitsfehlern, Komfortproblemen und Ärgernissen wurden behoben.
-
-Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
+Weitere Einzelheiten finden Sie auf der Seite der GitHub-Veröffentlichungen.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/en-US/PDP.xml

@@ -56,13 +56,6 @@ This is an open source project and we welcome community participation. To partic
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Version __VERSION_NUMBER__
 
-- We've rewritten how console applications are hosted inside Terminal! Please report any bugs you encounter.
-- Terminal now supports Sixels!
-- You can now open a docked panel containing snippets of commands you have saved to use later
-- Command Prompt users on the latest Windows 11 release may see a "quick tip" icon that suggests installable software from WinGet
-- Selected text will now be much more visible (and customizable!)
-- A number of reliabilty bugs, convenience issues and annoyances have been fixed.
-
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>
   <ScreenshotCaptions>

build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml

@@ -56,14 +56,7 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-- Hemos reescrito cómo se hospedan las aplicaciones de consola en Terminal. Informe de los errores que encuentre.
-- Terminal ahora admite sixeles.
-- Ahora puede abrir un panel acoplado que contenga fragmentos de comandos que haya guardado para usarlos más adelante
-- Los usuarios del símbolo del sistema de la versión más reciente de Windows 11 pueden ver un icono de "sugerencia rápida" que sugiere software instalable de WinGet
-- El texto seleccionado ahora será mucho más visible (y personalizable)
-- Se han corregido varios errores de fiabilidad, problemas de comodidad y molestias.
-
-Consulte la página de versiones de GitHub para más información.
+Para más información, consulte nuestra página de versiones de GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml

@@ -56,14 +56,7 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Nous avons réécrit la manière dont les applications de console sont hébergées dans Terminal ! Veuillez signaler tout bug que vous rencontrez.
-- Le terminal prend désormais en charge Sixels !
-- Vous pouvez désormais ouvrir un panneau ancré contenant des extraits de commandes que vous avez enregistrées pour les utiliser ultérieurement
-- Les utilisateurs de l'invite de commande sur la dernière version de Windows 11 peuvent voir une icône « astuce rapide » qui suggère un logiciel installable à partir de WinGet
-- Le texte sélectionné sera désormais beaucoup plus visible (et personnalisable !)
-- Un certain nombre de bugs de fiabilité, de problèmes de commodité et de désagréments ont été corrigés.
-
-Veuillez consulter notre page de versions GitHub pour plus de détails.
+Consultez la page des versions de GitHub pour plus d’informations.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml

@@ -54,16 +54,9 @@ Si tratta di un progetto open source e la partecipazione della community è molt
     
   </DevStudio>
   <ReleaseNotes>
-    Versione __VERSION_NUMBER__ 
+    Versione __VERSION_NUMBER__
 
-- È stato riscritto il modo in cui le applicazioni della console vengono ospitate all'interno di Terminale. Segnala eventuali bug riscontrati.
-- Terminal supporta ora Sixel.
-- È ora possibile aprire un pannello ancorato contenente frammenti di comandi salvati per usarli in seguito
-- Gli utenti del prompt dei comandi nella versione più recente di Windows 11 potrebbero visualizzare un'icona di "suggerimento rapido" che consiglia il software installabile da WinGet
-- Il testo selezionato sarà ora molto più visibile, oltre che personalizzabile.
-- Sono stati risolti diversi bug di affidabilità, problemi di praticità e fastidi.
-
-Per altri dettagli, vedi la pagina delle versioni di GitHub.
+Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- ターミナル内でのコンソール アプリケーションのホスト方法を書き換えました。発生したバグを報告してください。
-- ターミナルで Sixels がサポートされるようになりました。
-- 後で使用するために保存したコマンドのスニペットを含むドッキング パネルを開けるようになりました
-- 最新の Windows 11 リリースのコマンド プロンプト ユーザーには、WinGet からインストール可能なソフトウェアを提案する "クイック ヒント" アイコンが表示される場合があります
-- 選択したテキストが大幅に見やすくなりました (カスタマイズも可能です)
-- 信頼性に関するバグ、利便性の問題、不快な問題の多くが修正されました。
-
-詳細については、GitHub リリース ページをご覧ください。
+詳細については、GitHub リリースのページをご覧ください。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml

@@ -56,13 +56,6 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 콘솔 애플리케이션이 터미널 내에서 호스팅되는 방법을 다시 작성했습니다! 발생한 버그를 보고하세요.
-- 터미널에서 이제 Sixels를 지원합니다!
-- 이제 나중에 사용하기 위해 저장한 명령 조각이 포함된 도킹된 패널을 열 수 있습니다.
-- 최신 Windows 11 릴리스의 명령 프롬프트 사용자는 WinGet에서 설치 가능한 소프트웨어를 제안하는 "빠른 팁" 아이콘을 볼 수 있습니다.
-- 이제 선택한 텍스트가 훨씬 더 잘 표시됩니다(사용자 지정도 가능!).
-- 여러 신뢰성 버그, 편의 문제 및 성가신 사항이 수정되었습니다.
-
 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>

build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml

@@ -56,14 +56,7 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Versão __VERSION_NUMBER__
 
-- Reescrevemos a forma como os aplicativos de console são hospedados no Terminal! Certifique-se de reportar os bugs que você encontrar.
-- O terminal agora é compatível com o Sixels!
-- Agora você pode abrir um painel acoplado contendo snippets de comandos que você salvou para usar mais tarde
-- Os usuários do Prompt de Comando na versão mais recente do Windows 11 podem ver um ícone de "dica rápida", que sugere softwares instaláveis a partir do WinGet
-- O texto selecionado agora ficará muito mais visível (e personalizável!)
-- Vários bugs de confiabilidade, problemas de conveniência e incômodos foram resolvidos.
-
-Confira nossa página de lançamentos no GitHub para obter mais detalhes.
+Consulte nossa página de lançamentos do GitHub para obter detalhes adicionais.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
-- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
-- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
-- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
-- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
-- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
-
-Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
+Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
-- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
-- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
-- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
-- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
-- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
-
-Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
+Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ẁē'νё ŕéẁѓĭτťёñ ћοώ ĉòπşõℓε άррℓіċªťįõпѕ αяе ĥθѕťэđ įŋšιďé Ţєямїńąℓ! Рļéаšė яёροřτ αņу ьϋģš ýõμ éпćŏџήţęя. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!
-- Ţëямΐʼnαļ ńóẃ ŝüррöятš Śїхέłś! !!! !!! !!!
-- ¥оų ĉåи ńòŵ θρėñ д đбčĸэď ράńέļ ċőлŧăīņϊňģ śⁿіφφëťś оƒ ςōмmàⁿďş ŷŏũ ĥªν℮ şåνěđ τσ üśε łαťэŗ !!! !!! !!! !!! !!! !!! !!! !!! !!! 
-- Ćοмmäлđ Рřōmφť üş℮ŗѕ öη τће ļāťëšτ Щīйđôώѕ 11 řёℓеаѕĕ måў ŝэε ά "qůïςκ ŧĭр" ιсôñ τĥдт šűğģєѕŧѕ ίńśŧăłłавļз šôƒţẁαгέ ƒґόm ЩĩйĞéţ !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
-- Śєļèċťєď ţĕжт ωϊŀļ йǿẃ ьέ mџ¢н мǿѓε νĭŝϊъļė (άŋđ сŭŝтŏмΐżдьļē!) !!! !!! !!! !!! !!! !!! !
-- Ä ņϋmъ℮ŗ ŏƒ ѓēŀїаъïļŧÿ ьüĝś, ςôⁿνėηĭ℮иć℮ îѕšůëş ăπð âлňбγдňçėŝ ћªνε ъēёп ƒΐ×еð. !!! !!! !!! !!! !!! !!! !!! !!!
-
-Ρĺёàŝ℮ ŝез ǿúг ĢīťНŭъ řěłεαśèŝ φāğ℮ ƒóѓ дďδітĭøиąℓ ð℮тªїľŝ. !!! !!! !!! !!! !!! !!!
+Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Мы переписали, как консольные приложения размещаются внутри Терминала! Сообщайте о любых ошибках, с которыми вы столкнулись.
-– Терминал теперь поддерживает форматы Sixel!
-– Теперь вы можете открыть закрепленную панель, содержащую фрагменты команд, которые вы сохранили для использования в дальнейшем
-– Пользователи командной строки в новейшем выпуске Windows 11 могут увидеть значок "краткой подсказки", который предлагает устанавливаемые программы из WinGet
-– Выделенный текст теперь станет более видимым (и настраиваемым!)
-– Исправлено несколько ошибок надежности, проблем с удобством, а также устранены раздражающие моменты.
-
-Дополнительные сведения см. на странице выпусков GitHub.
+Дополнительные сведения см. на странице «Выпуски GitHub».
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml

@@ -54,14 +54,7 @@
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
-
-- 我们已改变主机应用程序在终端内的托管方式!请报告遇到的任何 bug。
-- 终端现在支持 Sixels!
-- 现在可以打开一个停靠面板，其中包含已保存供以后使用的命令片段
-- 最新 Windows 11 版本上的命令提示用户可能会看到“快速提示”图标，该图标建议从 WinGet 安装软件
-- 所选文本现在将具有更高的可见性(和可自定义性!)
-- 修复了许多可靠性 bug、便利性问题和令人烦恼的问题。
+    版本 __VERSION_NUMBER__
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     版本 __VERSION_NUMBER__
 
-- 我們已重寫主機應用程式在終端機內託管的方式!請報告您遇到的錯誤。
-- 終端機現在支援 Sixels!
-- 現在，您可以開啟包含已儲存命令程式碼片段的固定面板，以供稍後使用
-- 最新 Windows 11 版本中的 [命令提示] 使用者可能會看到「快速提示」圖示，建議可自 WinGet 安裝的軟體
-- 選取的文字現在會更明顯 (且可自訂!)
-- 已修正一些可靠性錯誤、便利性問題和令人困擾的問題。
-
-如需更多詳細資訊，請參閱我們的 GitHub 發行頁面。
+如需詳細資訊，請參閱我們的 GitHub 版本頁面。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml

@@ -56,14 +56,7 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme an der
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Terminal speichert jetzt den Inhalt des Fensters, wenn Sie die Sitzungswiederherstellung verwenden.
-– Sie können jetzt mehrere Schriftarten gleichzeitig verwenden.
-– Kästchenzeichnende Zeichen werden jetzt pixelgenau gerendert.
-– Die Verwendung eines IME innerhalb des Terminals wurde erheblich verbessert.
-– Die Farbschemas in Ihrer JSON-Datei sind jetzt viel einfacher.
-– Eine Reihe von Fehlern im Zusammenhang mit der URL-Verarbeitung, Zeilen mit doppelter Breite, Zeilenumbruch und mehr wurden behoben.
-
-Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
+Weitere Einzelheiten finden Sie auf der Seite der GitHub-Veröffentlichungen.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/en-US/PDP.xml

@@ -56,13 +56,6 @@ This is an open source project and we welcome community participation. To partic
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__} App Release Note" -->Version __VERSION_NUMBER__
 
-- Terminal will now remember the contents of the window when you use session restoration.
-- You can now use multiple fonts at the same time.
-- Box-drawing characters are now rendered with pixel perfection.
-- The experience of using an IME inside Terminal has been significantly improved.
-- The color schemes inside your JSON file will now be much simpler.
-- A number of bugs around URL handling, double-width rows, line wrapping, and more have been fixed.
-
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>
   <ScreenshotCaptions>

build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml

@@ -56,14 +56,7 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-- Terminal recordará ahora el contenido de la ventana cuando use la restauración de la sesión.
-- Ahora puede usar varias fuentes al mismo tiempo.
-- Los caracteres que dibujan recuadros ahora se representan con precisión de píxel.
-- Se ha mejorado significativamente la experiencia de utilizar un IME dentro de Terminal.
-- Las combinaciones de colores dentro del archivo JSON ahora serán mucho más sencillas.
-- Se han corregido varios errores relacionados con el control de direcciones URL, las filas de ancho doble, el ajuste de líneas y mucho más.
-
-Consulte la página de versiones de GitHub para más información.
+Para más información, consulte nuestra página de versiones de GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml

@@ -56,14 +56,7 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Le terminal mémorisera désormais le contenu de la fenêtre lorsque vous utiliserez la restauration de session.
-- Vous pouvez désormais utiliser plusieurs polices en même temps.
-- Les personnages dessinés en boîte sont désormais rendus avec une perfection de pixel.
-- L'expérience d'utilisation d'un IME dans le Terminal a été considérablement améliorée.
-- Les schémas de couleurs à l'intérieur de votre fichier JSON seront désormais beaucoup plus simples.
-- Un certain nombre de bugs concernant la gestion des URL, les lignes à double largeur, le retour à la ligne, etc. ont été corrigés.
-
-Veuillez consulter notre page de versions GitHub pour plus de détails.
+Consultez la page des versions de GitHub pour plus d’informations.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml

@@ -54,16 +54,9 @@ Si tratta di un progetto open source e la partecipazione della community è molt
     
   </DevStudio>
   <ReleaseNotes>
-    Versione __VERSION_NUMBER__ 
+    Versione __VERSION_NUMBER__
 
-- Il terminale ricorda ora il contenuto della finestra quando si usa il ripristino della sessione.
-- È ora possibile usare più tipi di carattere contemporaneamente.
-- I caratteri tracciati vengono ora sottoposti a rendering con pixel di perfezionamento.
-- L'esperienza di utilizzo di un IME all'interno di Terminale è stata notevolmente migliorata.
-- Le combinazioni di colori all'interno del file JSON saranno ora molto più semplici.
-- Sono stati corretti alcuni bug relativi alla gestione degli URL, alle righe a doppia larghezza, al ritorno a capo delle righe e altro ancora.
-
-Per altri dettagli, vedi la pagina delle versioni di GitHub.
+Per ulteriori dettagli, consulta la nostra pagina delle versioni di GitHub.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- セッションの復元を使用すると、ターミナルがウィンドウの内容を記憶するようになりました。
-- 複数のフォントを同時に使用できるようになりました。
-- ボックス描画文字がピクセル単位の精度でレンダリングされるようになりました。
-- ターミナル内での IME の使用エクスペリエンスが大幅に改善されました。
-- JSON ファイル内の配色がはるかにシンプルになりました。
-- URL 処理、二重幅の行、行の折り返しなどに関するいくつかのバグが修正されました。
-
-詳細については、GitHub リリース ページをご覧ください。
+詳細については、GitHub リリースのページをご覧ください。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml

@@ -56,13 +56,6 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 터미널은 이제 세션 복원을 사용할 때 창의 내용을 기억합니다.
-- 이제 여러 글꼴을 동시에 사용할 수 있습니다.
-- 상자 그리기 캐릭터가 이제 픽셀 완성도로 렌더링됩니다.
-- 터미널 내에서 IME를 사용하는 환경이 크게 개선되었습니다. 
-- 이제 JSON 파일 내의 색 구성표가 훨씬 더 간단해집니다.
-- URL 처리, 이중 너비 행, 줄 바꿈 등과 관련된 여러 버그가 수정되었습니다.
-
 자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>

build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml

@@ -56,14 +56,7 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Versão __VERSION_NUMBER__
 
-- O terminal agora se lembra do conteúdo da janela quando você usa a restauração de sessão.
-- Agora você pode usar várias fontes ao mesmo tempo.
-- Os caracteres da caixa de desenho agora são renderizados com a perfeição de pixels.
-- A experiência de usar uma IME dentro do Terminal foi significativamente aprimorada.
-- Os esquemas de cores dentro do seu arquivo JSON agora estão muito mais simples.
-- Foram corrigidos vários bugs envolvendo o tratamento de URLs, linhas de largura dupla, quebra de linha automática e muito mais.
-
-Confira nossa página de lançamentos no GitHub para obter mais detalhes.
+Consulte nossa página de lançamentos do GitHub para obter detalhes adicionais.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ŧēгмíйǻŀ шιļł ñσщ řėmėmвзґ τђз ςоńţëηťŝ σƒ ŧћé ẅιⁿδőщ ẅђеή ýóύ ŭš℮ şεššîóŋ řėşτŏѓдτіόŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!!
-- Ύоџ ςàⁿ ŋóώ ũşэ múľŧìφľё ƒоʼnťş àт ťħе ѕâmз тìме. !!! !!! !!! !!! !!!
-- Вό×-ðгăшĭиġ ¢ĥаяäςтеřѕ äřę ηоẁ ѓëńđêяεď ẁϊτђ φïжêĺ φėŗƒēςŧΐøй. !!! !!! !!! !!! !!! !!! !
-- Ťħέ ĕхφêŕï℮ηĉε ŏƒ ύѕïйġ ǻʼn ÎМË îńšïďê Τєřmíлäļ нαŝ ьēέň ѕιĝήîƒіčäπţŀý ĩмφґθνзđ. !!! !!! !!! !!! !!! !!! !!! !!!
-- Ťĥę čöℓοг şçђėmęš ιʼnśΐδê убџѓ ĴŠОИ ƒϊŀε ωĭŀł ʼnθω вз мúçĥ ѕїмρℓёґ. !!! !!! !!! !!! !!! !!! !!
-- Á ήũmьéŕ òƒ вµġŝ άřòūñδ ÛҐĿ ħàŋδľįйģ, ðőџъŀε-ŵĭďτђ ŗōẁš, ŀϊπė ẃяąрρΐηğ, âⁿđ мŏř℮ ĥāνě везŋ ƒï×έð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
-
-Ρļēªšê ŝέė őůг ĜīтĤųъ яëŀεäśēś рдġэ ƒõя ãδðìτϊöňãł δèτâĩĺѕ. !!! !!! !!! !!! !!! !!!
+Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ŧēгмíйǻŀ шιļł ñσщ řėmėmвзґ τђз ςоńţëηťŝ σƒ ŧћé ẅιⁿδőщ ẅђеή ýóύ ŭš℮ şεššîóŋ řėşτŏѓдτіόŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!!
-- Ύоџ ςàⁿ ŋóώ ũşэ múľŧìφľё ƒоʼnťş àт ťħе ѕâmз тìме. !!! !!! !!! !!! !!!
-- Вό×-ðгăшĭиġ ¢ĥаяäςтеřѕ äřę ηоẁ ѓëńđêяεď ẁϊτђ φïжêĺ φėŗƒēςŧΐøй. !!! !!! !!! !!! !!! !!! !
-- Ťħέ ĕхφêŕï℮ηĉε ŏƒ ύѕïйġ ǻʼn ÎМË îńšïďê Τєřmíлäļ нαŝ ьēέň ѕιĝήîƒіčäπţŀý ĩмφґθνзđ. !!! !!! !!! !!! !!! !!! !!! !!!
-- Ťĥę čöℓοг şçђėmęš ιʼnśΐδê убџѓ ĴŠОИ ƒϊŀε ωĭŀł ʼnθω вз мúçĥ ѕїмρℓёґ. !!! !!! !!! !!! !!! !!! !!
-- Á ήũmьéŕ òƒ вµġŝ άřòūñδ ÛҐĿ ħàŋδľįйģ, ðőџъŀε-ŵĭďτђ ŗōẁš, ŀϊπė ẃяąрρΐηğ, âⁿđ мŏř℮ ĥāνě везŋ ƒï×έð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
-
-Ρļēªšê ŝέė őůг ĜīтĤųъ яëŀεäśēś рдġэ ƒõя ãδðìτϊöňãł δèτâĩĺѕ. !!! !!! !!! !!! !!! !!!
+Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ŧēгмíйǻŀ шιļł ñσщ řėmėmвзґ τђз ςоńţëηťŝ σƒ ŧћé ẅιⁿδőщ ẅђеή ýóύ ŭš℮ şεššîóŋ řėşτŏѓдτіόŋ. !!! !!! !!! !!! !!! !!! !!! !!! !!!
-- Ύоџ ςàⁿ ŋóώ ũşэ múľŧìφľё ƒоʼnťş àт ťħе ѕâmз тìме. !!! !!! !!! !!! !!!
-- Вό×-ðгăшĭиġ ¢ĥаяäςтеřѕ äřę ηоẁ ѓëńđêяεď ẁϊτђ φïжêĺ φėŗƒēςŧΐøй. !!! !!! !!! !!! !!! !!! !
-- Ťħέ ĕхφêŕï℮ηĉε ŏƒ ύѕïйġ ǻʼn ÎМË îńšïďê Τєřmíлäļ нαŝ ьēέň ѕιĝήîƒіčäπţŀý ĩмφґθνзđ. !!! !!! !!! !!! !!! !!! !!! !!!
-- Ťĥę čöℓοг şçђėmęš ιʼnśΐδê убџѓ ĴŠОИ ƒϊŀε ωĭŀł ʼnθω вз мúçĥ ѕїмρℓёґ. !!! !!! !!! !!! !!! !!! !!
-- Á ήũmьéŕ òƒ вµġŝ άřòūñδ ÛҐĿ ħàŋδľįйģ, ðőџъŀε-ŵĭďτђ ŗōẁš, ŀϊπė ẃяąрρΐηğ, âⁿđ мŏř℮ ĥāνě везŋ ƒï×έð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
-
-Ρļēªšê ŝέė őůг ĜīтĤųъ яëŀεäśēś рдġэ ƒõя ãδðìτϊöňãł δèτâĩĺѕ. !!! !!! !!! !!! !!! !!!
+Рļєάśé ѕέę όüґ ĢίŧĦŭв řęļзąѕєš рαġè ƒőŗ äđδĭτíθņâℓ đέтαιľś. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Терминал теперь будет запоминать содержимое окна при восстановлении сеанса.
-– Теперь вы можете использовать несколько шрифтов одновременно.
-– Символы псевдографики теперь отрисовываются с пиксельной точностью.
-– Значительно улучшена возможность использования IME внутри Терминала.
-– Цветовые схемы в JSON-файле теперь будут намного проще.
-– Исправлено несколько ошибок в обработке URL-адресов, строках двойной ширины, переносе строк и т. д.
-
-Дополнительные сведения см. на странице выпусков GitHub.
+Дополнительные сведения см. на странице «Выпуски GitHub».
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml

@@ -54,14 +54,7 @@
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
-
-- 现在，使用会话还原时，终端将记住窗口的内容。
-- 现在可以同时使用多种字体。
-- 现在以像素为单位呈现框绘图字符。
-- 在终端内使用输入法的体验已得到显著提升。
-- JSON 文件中的配色方案现在要简单得多。
-- 已修复有关 URL 处理、双倍行宽、换行等大量 bug。
+    版本 __VERSION_NUMBER__
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml

@@ -56,14 +56,7 @@
   <ReleaseNotes>
     版本 __VERSION_NUMBER__
 
-- 當您使用工作階段還原時，終端機現在會記住視窗的內容。
-- 現在您可以同時使用多個字型。
-- 製表格圖字元現在會以完美像素模式呈現。
-- 在終端機內使用 IME 的體驗已大幅改善。
-- JSON 檔案內的色彩配置現在將變得更簡單了。
-- 已修正一些 URL 處理、雙寬度列、換行等相關錯誤。
-
-如需更多詳細資訊，請參閱我們的 GitHub 發行頁面。
+如需詳細資訊，請參閱我們的 GitHub 版本頁面。
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/config/tsa.json

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

build/packages.config

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

build/pipelines/ob-nightly.yml

@@ -28,7 +28,7 @@ extends:
     official: true
     branding: Canary
     buildTerminal: true
-    pgoBuildMode: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
+    pgoBuildMode: Optimize
     codeSign: true
     signingIdentity:
       serviceName: $(SigningServiceName)

build/pipelines/ob-release.yml

@@ -27,7 +27,7 @@ parameters:
   - name: pgoBuildMode
     displayName: "PGO Build Mode"
     type: string
-    default: None # BODGY - OneBranch is on VS 17.10, which is known to be the worst
+    default: Optimize
     values:
       - Optimize
       - Instrument
@@ -47,7 +47,7 @@ parameters:
   - name: terminalInternalPackageVersion
     displayName: "Terminal Internal Package Version"
     type: string
-    default: '0.0.9'
+    default: '0.0.8'
 
   - name: publishSymbolsToPublic
     displayName: "Publish Symbols to MSDL"

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

@@ -59,7 +59,10 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true
 
   - template: steps-download-bin-dir-artifact.yml
     parameters:

build/pipelines/templates-v2/job-check-code-format.yml

@@ -10,6 +10,6 @@ jobs:
     submodules: false
     clean: true
 
-  - pwsh: |-
+  - powershell: |-
       .\build\scripts\Invoke-FormattingCheck.ps1
     displayName: 'Run formatters'

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

@@ -69,9 +69,10 @@ jobs:
     fetchTags: false # Tags still result in depth > 1 fetch; we don't need them here
     submodules: true
     persistCredentials: True
-
-  - template: steps-setup-versioning.yml
-
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true
   - template: steps-download-bin-dir-artifact.yml
     parameters:
       buildPlatforms: ${{ parameters.buildPlatforms }}

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

@@ -57,7 +57,10 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true
 
   - template: steps-download-bin-dir-artifact.yml
     parameters:

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

@@ -44,7 +44,10 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true
 
   - task: DownloadPipelineArtifact@2
     displayName: Download all PDBs from all prior build phases

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

@@ -43,7 +43,10 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true
 
   - task: DownloadPipelineArtifact@2
     displayName: Download all PDBs from all prior build phases

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

@@ -38,7 +38,10 @@ jobs:
     submodules: true
     persistCredentials: True
 
-  - template: steps-setup-versioning.yml
+  - task: PkgESSetupBuild@12
+    displayName: Package ES - Setup Build
+    inputs:
+      disableOutputRedirect: true
 
   - task: DownloadPipelineArtifact@2
     displayName: Download MSIX Bundle Artifact

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

@@ -39,7 +39,7 @@ parameters:
     default: true
   - name: terminalInternalPackageVersion
     type: string
-    default: '0.0.9'
+    default: '0.0.8'
 
   - name: publishSymbolsToPublic
     type: boolean
@@ -92,7 +92,10 @@ stages:
           generateSbom: ${{ parameters.generateSbom }}
           codeSign: ${{ parameters.codeSign }}
           beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-            - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
+            - task: PkgESSetupBuild@12
+              displayName: Package ES - Setup Build
+              inputs:
+                disableOutputRedirect: true
 
             - task: UniversalPackages@0
               displayName: Download terminal-internal Universal Package
@@ -116,7 +119,10 @@ stages:
             generateSbom: ${{ parameters.generateSbom }}
             codeSign: ${{ parameters.codeSign }}
             beforeBuildSteps:
-              - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
+              - 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

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

@@ -41,7 +41,7 @@ parameters:
     default: true
   - name: terminalInternalPackageVersion
     type: string
-    default: '0.0.9'
+    default: '0.0.8'
 
   - name: publishSymbolsToPublic
     type: boolean
@@ -130,11 +130,10 @@ extends:
               codeSign: ${{ parameters.codeSign }}
               signingIdentity: ${{ parameters.signingIdentity }}
               beforeBuildSteps: # Right before we build, lay down the universal package and localizations
-                - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
-
-                - template: ./build/pipelines/templates-v2/steps-inject-secrets.yml@self
-                  parameters:
-                    githubClientSecret: $(GithubClientSecret)
+                - task: PkgESSetupBuild@12
+                  displayName: Package ES - Setup Build
+                  inputs:
+                    disableOutputRedirect: true
 
                 - task: UniversalPackages@0
                   displayName: Download terminal-internal Universal Package
@@ -168,7 +167,10 @@ extends:
                 codeSign: ${{ parameters.codeSign }}
                 signingIdentity: ${{ parameters.signingIdentity }}
                 beforeBuildSteps:
-                  - template: ./build/pipelines/templates-v2/steps-setup-versioning.yml@self
+                  - 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

build/pipelines/templates-v2/steps-inject-secrets.yml

@@ -1,14 +0,0 @@
-parameters:
-  - name: githubClientSecret
-    type: string
-    default: 'FineKeepYourSecrets'
-
-steps:
-  - pwsh: |-
-      $header = Get-Item src/cascadia/QueryExtension/WindowsTerminalIDAndSecret.h -ErrorAction:Ignore
-      If ($Null -ne $header) {
-        $content = Get-Content $header -ReadCount 0
-        $content = $content -Replace "FineKeepYourSecrets","${{parameters.githubClientSecret}}"
-        Set-Content $header $content
-      }
-    displayName: Inject GitHub Secret

build/pipelines/templates-v2/steps-setup-versioning.yml

@@ -1,6 +0,0 @@
-steps:
-  - pwsh: |-
-      nuget install Microsoft.Windows.Terminal.Versioning -OutputDirectory _versioning
-      $VersionRoot = (Get-Item _versioning\Microsoft.Windows.*).FullName
-      & "$VersionRoot\build\Setup.ps1" -ProjectDirectory "$(Build.SourcesDirectory)" -Verbose
-    displayName: Set up versioning via M.W.T.V

build/rules/Microsoft.WindowsPackageManager.ComInterop.Additional.targets

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
-    <Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="$(WinGetPackageRoot)\lib\Microsoft.Management.Deployment.winmd">
-      <IsWinMDFile>true</IsWinMDFile>
-    </Reference>
-  </ItemGroup>
-  <Target Name="_FixWinGetWinmdPackaging" BeforeTargets="_ComputeAppxPackagePayload">
-    <ItemGroup>
-      <PackagingOutputs Include="$(WinGetPackageRoot)\lib\Microsoft.Management.Deployment.winmd">
-        <OutputGroup>CustomOutputGroupForPackaging</OutputGroup>
-        <ProjectName>$(ProjectName)</ProjectName>
-        <TargetPath>Microsoft.Management.Deployment.winmd</TargetPath>
-      </PackagingOutputs>
-    </ItemGroup>
-  </Target>
-</Project>

build/scripts/New-UnpackagedTerminalDistribution.ps1

@@ -34,7 +34,7 @@ Param(
 )
 
 $filesToRemove = @("*.xml", "*.winmd", "Appx*", "Images/*Tile*", "Images/*Logo*") # Remove from Terminal
-$filesToKeep = @() # ... except for these
+$filesToKeep = @("Microsoft.Terminal.Remoting.winmd") # ... except for these
 $filesToCopyFromXaml = @("Microsoft.UI.Xaml.dll", "Microsoft.UI.Xaml") # We don't need the .winmd
 
 $ErrorActionPreference = 'Stop'

build/scripts/Test-WindowsTerminalPackage.ps1

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

consolegit2gitfilters.json

@@ -24,6 +24,8 @@
     "/doc/specs/",
     "/doc/cascadia/",
     "/doc/user-docs/",
+    "/src/tools/MonarchPeasantSample/",
+    "/src/tools/MonarchPeasantPackage/",
     "/src/tools/ansi-color/",
     "/src/tools/ColorTool/",
     "/scratch/",

custom.props

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

dep/nuget/packages.config

@@ -3,14 +3,13 @@
 <packages>
   <!-- Native packages -->
   <package id="Microsoft.Internal.PGO-Helpers.Cpp" version="0.2.34" targetFramework="native" />
-  <package id="Microsoft.Taef" version="10.93.240607003" targetFramework="native" />
+  <package id="Microsoft.Taef" version="10.60.210621002" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.230207.1" targetFramework="native" />
   <package id="Microsoft.Internal.Windows.Terminal.ThemeHelpers" version="0.7.230706001" targetFramework="native" />
   <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.240122.1" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.WindowsPackageManager.ComInterop" version="1.8.1911" targetFramework="native" developmentDependency="true" />
 
   <!-- Managed packages -->
   <package id="Appium.WebDriver" version="3.0.0.2" targetFramework="net45" />

dep/telemetry/ProjectTelemetry.h

@@ -14,5 +14,4 @@ Abstract:
 #define PDT_ProductAndServicePerformance       0x0u
 #define PDT_ProductAndServiceUsage             0x0u
 #define MICROSOFT_KEYWORD_TELEMETRY     0x0
-#define MICROSOFT_KEYWORD_MEASURES      0x0
-#define MICROSOFT_KEYWORD_CRITICAL_DATA 0x0
+#define MICROSOFT_KEYWORD_MEASURES      0x0

doc/cascadia/profiles.schema.json

@@ -459,7 +459,6 @@
         "switchSelectionEndpoint",
         "switchToTab",
         "tabSearch",
-        "terminalChat",
         "toggleAlwaysOnTop",
         "toggleBlockSelection",
         "toggleFocusMode",
@@ -619,11 +618,6 @@
           "type": "boolean",
           "default": false,
           "description": "This will override the profile's `elevate` setting."
-        },
-        "reloadEnvironmentVariables": {
-          "type": "boolean",
-          "default": true,
-          "description": "When set to true, a new environment block will be generated when creating a new session. Otherwise, the session will inherit the variables the Terminal was started with."
         }
       },
       "type": "object"
@@ -734,9 +728,6 @@
               "type": "string",
               "default": "",
               "description": "The name or GUID of the profile to show in this entry"
-            },
-            "icon": {
-              "$ref": "#/$defs/Icon"
             }
           }
         }
@@ -808,9 +799,6 @@
               "type": "string",
               "default": "",
               "description": "The ID of the action to show in this entry"
-            },
-            "icon": {
-              "$ref": "#/$defs/Icon"
             }
           }
         }
@@ -2347,7 +2335,7 @@
           "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.",
           "type": "boolean"
         },
-        "warning.inputService": {
+        "inputServiceWarning": {
           "default": true,
           "description": "Warning if 'Touch Keyboard and Handwriting Panel Service' is disabled.",
           "type": "boolean"
@@ -2362,14 +2350,9 @@
           "description": "When set to true, the terminal will focus the pane on mouse hover.",
           "type": "boolean"
         },
-        "compatibility.allowHeadless": {
+        "compatibility.isolatedMode": {
           "default": false,
-          "description": "When set to true, Windows Terminal will run in the background. This allows globalSummon and quakeMode actions to work even when no windows are open.",
-          "type": "boolean"
-        },
-        "compatibility.allowDECRQCRA": {
-          "default": false,
-          "description": "When set to true, the terminal will support the DECRQCRA (Request Checksum of Rectangular Area) escape sequence.",
+          "description": "When set to true, Terminal windows will not be able to interact with each other (including global hotkeys, tab drag/drop, running commandlines in existing windows, etc.). This is a compatibility escape hatch for users who are running into certain windowing issues.",
           "type": "boolean"
         },
         "copyFormatting": {
@@ -2402,12 +2385,12 @@
           "description": "When set to `true`, visual animations will be disabled across the application.",
           "type": "boolean"
         },
-        "warning.largePaste": {
+        "largePasteWarning": {
           "default": true,
           "description": "When set to true, trying to paste text with more than 5 KiB of characters will display a warning asking you whether to continue or not with the paste.",
           "type": "boolean"
         },
-        "warning.multiLinePaste": {
+        "multiLinePasteWarning": {
           "default": true,
           "description": "When set to true, trying to paste text with a \"new line\" character will display a warning asking you whether to continue or not with the paste.",
           "type": "boolean"
@@ -2605,7 +2588,7 @@
           "description": "Determines the delimiters used in a double click selection.",
           "type": "string"
         },
-        "warning.confirmCloseAllTabs": {
+        "confirmCloseAllTabs": {
           "default": true,
           "description": "When set to \"true\" closing a window with multiple tabs open will require confirmation.  When set to \"false\", the confirmation dialog will not appear.",
           "type": "boolean"
@@ -2867,7 +2850,7 @@
           }
         },
         "autoMarkPrompts": {
-          "default": true,
+          "default": false,
           "description": "When set to true, prompts will automatically be marked.",
           "type": "boolean"
         },
@@ -3091,17 +3074,6 @@
           "default": false,
           "description": "When set to true, the window will have an acrylic material background. When set to false, the window will have a plain, untextured background.",
           "type": "boolean"
-        },
-        "pathTranslationStyle": {
-          "default": "none",
-          "description": "Controls how file paths are transformed when they are dragged and dropped on the terminal. Possible values are \"none\", \"wsl\", \"cygwin\" and \"msys2\".",
-          "enum": [
-            "none",
-            "wsl",
-            "cygwin",
-            "msys2"
-          ],
-          "type": "string"
         }
       }
     },

policies/WindowsTerminal.admx

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  (c) 2024 Microsoft Corporation  -->
-<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
-  <policyNamespaces>
-    <target prefix="terminal" namespace="Microsoft.Policies.WindowsTerminal" />
-    <using prefix="windows" namespace="Microsoft.Policies.Windows" />
-  </policyNamespaces>
-  <resources minRequiredRevision="1.0" />
-  <supportedOn>
-    <definitions>
-      <definition name="SUPPORTED_WindowsTerminal_1_21" displayName="$(string.SUPPORTED_WindowsTerminal_1_21)" />
-      <definition name="SUPPORTED_WindowsTerminalCanary_1_23" displayName="$(string.SUPPORTED_WindowsTerminalCanary_1_23)" />
-    </definitions>
-  </supportedOn>
-  <categories>
-    <category name="WindowsTerminal" displayName="$(string.WindowsTerminal)">
-      <parentCategory ref="windows:WindowsComponents" />
-    </category>
-  </categories>
-  <policies>
-    <policy name="DisabledProfileSources" class="Both" displayName="$(string.DisabledProfileSources)" explainText="$(string.DisabledProfileSourcesText)" presentation="$(presentation.DisabledProfileSources)" key="Software\Policies\Microsoft\Windows Terminal">
-      <parentCategory ref="WindowsTerminal" />
-      <supportedOn ref="SUPPORTED_WindowsTerminal_1_21" />
-      <elements>
-        <multiText id="DisabledProfileSources" valueName="DisabledProfileSources" required="true" />
-      </elements>
-    </policy>
-    <policy name="EnabledLMProviders" class="Both" displayName="$(string.EnabledLMProviders)" explainText="$(string.EnabledLMProvidersText)" presentation="$(presentation.EnabledLMProviders)" key="Software\Policies\Microsoft\Windows Terminal">
-      <parentCategory ref="WindowsTerminal" />
-      <supportedOn ref="SUPPORTED_WindowsTerminalCanary_1_23" />
-      <elements>
-        <multiText id="EnabledLMProviders" valueName="EnabledLMProviders" required="false" />
-      </elements>
-    </policy>
-  </policies>
-</policyDefinitions>

policies/en-US/WindowsTerminal.adml

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--  (c) 2024 Microsoft Corporation  -->
-<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
-  <displayName>Windows Terminal</displayName>
-  <description>Windows Terminal</description>
-  <resources>
-    <stringTable>
-      <string id="WindowsTerminal">Windows Terminal</string>
-      <string id="SUPPORTED_WindowsTerminal_1_21">At least Windows Terminal 1.21</string>
-      <string id="SUPPORTED_WindowsTerminalCanary_1_23">At least Windows Terminal Canary 1.23</string>
-      <string id="DisabledProfileSources">Disabled Profile Sources</string>
-      <string id="DisabledProfileSourcesText">Profiles will not be generated from any sources listed here. Source names can be arbitrary strings. Potential candidates can be found as the "source" property on profile definitions in Windows Terminal's settings.json file.
-
-Common sources are:
-- Windows.Terminal.Azure
-- Windows.Terminal.PowershellCore
-- Windows.Terminal.Wsl
-
-For instance, setting this policy to Windows.Terminal.Wsl will disable the builtin WSL integration of Windows Terminal.
-
-Note: Existing profiles will disappear from Windows Terminal after adding their source to this policy.</string>
-      <string id="EnabledLMProviders">Enabled Language Model/AI Providers</string>
-      <string id="EnabledLMProvidersText">The listed Language Models/AI Providers will be available for use in Terminal Chat.
-
-Enabling the policy but leaving the list empty disallows all providers and therefore disables the Terminal Chat feature completely.
-
-Common providers are:
-- AzureOpenAI
-- OpenAI
-- GitHubCopilot
-
-For instance, setting this policy to GitHubCopilot will allow the use of GitHubCopilot in Terminal Chat.</string>
-    </stringTable>
-    <presentationTable>
-      <presentation id="DisabledProfileSources">
-        <multiTextBox refId="DisabledProfileSources">List of disabled sources (one per line)</multiTextBox>
-      </presentation>
-      <presentation id="EnabledLMProviders">
-        <multiTextBox refId="EnabledLMProviders">List of enabled Language Model/AI Providers (one per line)</multiTextBox>
-      </presentation>
-    </presentationTable>
-  </resources>
-</policyDefinitionResources>

src/Terminal.wprp

@@ -10,6 +10,7 @@
     <EventProvider Id="EventProvider_TerminalSettingsModel" Name="be579944-4d33-5202-e5d6-a7a57f1935cb" />
     <EventProvider Id="EventProvider_TerminalApp" Name="24a1622f-7da7-5c77-3303-d850bd1ab2ed" />
     <EventProvider Id="EventProvider_TerminalWin32Host" Name="56c06166-2e2e-5f4d-7ff3-74f4b78c87d6" />
+    <EventProvider Id="EventProvider_TerminalRemoting" Name="d6f04aad-629f-539a-77c1-73f5c3e4aa7b" />
     <EventProvider Id="EventProvider_TerminalDirectX" Name="c93e739e-ae50-5a14-78e7-f171e947535d" />
     <EventProvider Id="EventProvider_TerminalUIA" Name="e7ebce59-2161-572d-b263-2f16a6afb9e5"/>
     <!-- Console providers here -->
@@ -29,6 +30,7 @@
             <EventProviderId Value="EventProvider_TerminalSettingsModel" />
             <EventProviderId Value="EventProvider_TerminalApp" />
             <EventProviderId Value="EventProvider_TerminalWin32Host" />
+            <EventProviderId Value="EventProvider_TerminalRemoting" />
             <EventProviderId Value="EventProvider_TerminalDirectX" />
             <EventProviderId Value="EventProvider_TerminalUIA" />
           </EventProviders>
@@ -49,6 +51,7 @@
             <EventProviderId Value="EventProvider_TerminalSettingsModel" />
             <EventProviderId Value="EventProvider_TerminalApp" />
             <EventProviderId Value="EventProvider_TerminalWin32Host" />
+            <EventProviderId Value="EventProvider_TerminalRemoting" />
             <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Launcher" />
             <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Host" />
             <EventProviderId Value="EventProvider-Microsoft.Windows.Console.Server" />

src/buffer/out/ImageSlice.cpp

@@ -65,6 +65,7 @@ RGBQUAD* ImageSlice::MutablePixels(const til::CoordType columnBegin, const til::
         _columnBegin = existingData ? std::min(_columnBegin, columnBegin) : columnBegin;
         _columnEnd = existingData ? std::max(_columnEnd, columnEnd) : columnEnd;
         _pixelWidth = (_columnEnd - _columnBegin) * _cellSize.width;
+        _pixelWidth = (_pixelWidth + 3) & ~3; // Renderer needs this as a multiple of 4
         const auto bufferSize = _pixelWidth * _cellSize.height;
         if (existingData)
         {

src/buffer/out/OutputCell.cpp

@@ -9,10 +9,6 @@
 #include "../../types/inc/convert.hpp"
 #include "../../inc/conattrs.hpp"
 
-// BODGY: Misdiagnosis in MSVC 17.11: Referencing global constants in the member
-// initializer list leads to this warning. Can probably be removed in the future.
-#pragma warning(disable : 26493) // Don't use C-style casts (type.4).)
-
 static constexpr TextAttribute InvalidTextAttribute{ INVALID_COLOR, INVALID_COLOR };
 
 OutputCell::OutputCell() noexcept :

src/buffer/out/OutputCellIterator.cpp

@@ -11,10 +11,6 @@
 #include "../../types/inc/GlyphWidth.hpp"
 #include "../../inc/conattrs.hpp"
 
-// BODGY: Misdiagnosis in MSVC 17.11: Referencing global constants in the member
-// initializer list leads to this warning. Can probably be removed in the future.
-#pragma warning(disable : 26493) // Don't use C-style casts (type.4).)
-
 static constexpr TextAttribute InvalidTextAttribute{ INVALID_COLOR, INVALID_COLOR, INVALID_COLOR };
 
 // Routine Description:
@@ -278,7 +274,7 @@ OutputCellIterator& OutputCellIterator::operator++()
     }
     case Mode::CharInfo:
     {
-        // Walk forward by one because char infos are just the legacy version of cells and prealigned to columns
+        // Walk forward by one because charinfos are just the legacy version of cells and prealigned to columns
         _pos++;
         if (operator bool())
         {

src/buffer/out/OutputCellView.cpp

@@ -5,10 +5,6 @@
 
 #include "OutputCellView.hpp"
 
-// BODGY: Misdiagnosis in MSVC 17.11: Referencing global constants in the member
-// initializer list leads to this warning. Can probably be removed in the future.
-#pragma warning(disable : 26493) // Don't use C-style casts (type.4).)
-
 // Routine Description:
 // - Constructs a read-only view of data formatted as a single output buffer cell
 // Arguments:

src/buffer/out/Row.cpp

@@ -80,12 +80,11 @@ constexpr OutIt copy_n_small(InIt first, Diff count, OutIt dest)
     return dest;
 }
 
-CharToColumnMapper::CharToColumnMapper(const wchar_t* chars, const uint16_t* charOffsets, ptrdiff_t charsLength, til::CoordType currentColumn, til::CoordType columnCount) noexcept :
+CharToColumnMapper::CharToColumnMapper(const wchar_t* chars, const uint16_t* charOffsets, ptrdiff_t lastCharOffset, til::CoordType currentColumn) noexcept :
     _chars{ chars },
     _charOffsets{ charOffsets },
-    _charsLength{ charsLength },
-    _currentColumn{ currentColumn },
-    _columnCount{ columnCount }
+    _lastCharOffset{ lastCharOffset },
+    _currentColumn{ currentColumn }
 {
 }
 
@@ -93,7 +92,7 @@ CharToColumnMapper::CharToColumnMapper(const wchar_t* chars, const uint16_t* cha
 // This function in particular returns the glyph's first column.
 til::CoordType CharToColumnMapper::GetLeadingColumnAt(ptrdiff_t targetOffset) noexcept
 {
-    targetOffset = clamp(targetOffset, 0, _charsLength);
+    targetOffset = clamp(targetOffset, 0, _lastCharOffset);
 
     // This code needs to fulfill two conditions on top of the obvious (a forward/backward search):
     // A: We never want to stop on a column that is marked with CharOffsetsTrailer (= "GetLeadingColumn").
@@ -131,14 +130,10 @@ til::CoordType CharToColumnMapper::GetLeadingColumnAt(ptrdiff_t targetOffset) no
 til::CoordType CharToColumnMapper::GetTrailingColumnAt(ptrdiff_t offset) noexcept
 {
     auto col = GetLeadingColumnAt(offset);
-
-    if (col < _columnCount)
+    // This loop is a little redundant with the forward search loop in GetLeadingColumnAt()
+    // but it's realistically not worth caring about this. This code is not a bottleneck.
+    for (; WI_IsFlagSet(_charOffsets[col + 1], CharOffsetsTrailer); ++col)
     {
-        // This loop is a little redundant with the forward search loop in GetLeadingColumnAt()
-        // but it's realistically not worth caring about this. This code is not a bottleneck.
-        for (; WI_IsFlagSet(_charOffsets[col + 1], CharOffsetsTrailer); ++col)
-        {
-        }
     }
     return col;
 }
@@ -1119,9 +1114,6 @@ std::wstring_view ROW::GetText() const noexcept
     return { _chars.data(), width };
 }
 
-// Arguments:
-// - columnBegin: inclusive
-// - columnEnd: exclusive
 std::wstring_view ROW::GetText(til::CoordType columnBegin, til::CoordType columnEnd) const noexcept
 {
     const auto columns = GetReadableColumnCount();
@@ -1227,15 +1219,15 @@ T ROW::_adjustForward(T column) const noexcept
 }
 
 // Creates a CharToColumnMapper given an offset into _chars.data().
-// In other words, for a 120 column ROW with just ASCII text, the offset should be [0,120].
+// In other words, for a 120 column ROW with just ASCII text, the offset should be [0,120).
 CharToColumnMapper ROW::_createCharToColumnMapper(ptrdiff_t offset) const noexcept
 {
     const auto charsSize = _charSize();
-    const auto lastChar = gsl::narrow_cast<ptrdiff_t>(charsSize);
+    const auto lastChar = gsl::narrow_cast<ptrdiff_t>(charsSize - 1);
     // We can sort of guess what column belongs to what offset because BMP glyphs are very common and
     // UTF-16 stores them in 1 char. In other words, usually a ROW will have N chars for N columns.
     const auto guessedColumn = gsl::narrow_cast<til::CoordType>(clamp(offset, 0, _columnCount));
-    return CharToColumnMapper{ _chars.data(), _charOffsets.data(), lastChar, guessedColumn, _columnCount };
+    return CharToColumnMapper{ _chars.data(), _charOffsets.data(), lastChar, guessedColumn };
 }
 
 const std::optional<ScrollbarData>& ROW::GetScrollbarData() const noexcept

src/buffer/out/Row.hpp

@@ -71,7 +71,7 @@ struct RowCopyTextFromState
 // into a ROW's text this class can tell you what cell that pointer belongs to.
 struct CharToColumnMapper
 {
-    CharToColumnMapper(const wchar_t* chars, const uint16_t* charOffsets, ptrdiff_t lastCharOffset, til::CoordType currentColumn, til::CoordType columnCount) noexcept;
+    CharToColumnMapper(const wchar_t* chars, const uint16_t* charOffsets, ptrdiff_t lastCharOffset, til::CoordType currentColumn) noexcept;
 
     til::CoordType GetLeadingColumnAt(ptrdiff_t targetOffset) noexcept;
     til::CoordType GetTrailingColumnAt(ptrdiff_t offset) noexcept;
@@ -85,9 +85,8 @@ private:
 
     const wchar_t* _chars;
     const uint16_t* _charOffsets;
-    ptrdiff_t _charsLength;
+    ptrdiff_t _lastCharOffset;
     til::CoordType _currentColumn;
-    til::CoordType _columnCount;
 };
 
 class ROW final

src/buffer/out/TextColor.h

@@ -82,8 +82,7 @@ public:
     static constexpr size_t FRAME_FOREGROUND = 263;
     static constexpr size_t FRAME_BACKGROUND = 264;
     static constexpr size_t CURSOR_COLOR = 265;
-    static constexpr size_t SELECTION_BACKGROUND = 266;
-    static constexpr size_t TABLE_SIZE = 267;
+    static constexpr size_t TABLE_SIZE = 266;
 
     constexpr TextColor() noexcept :
         _meta{ ColorType::IsDefault },

src/buffer/out/UTextAdapter.cpp

@@ -411,13 +411,16 @@ Microsoft::Console::ICU::unique_uregex Microsoft::Console::ICU::CreateRegex(cons
     return unique_uregex{ re };
 }
 
-// Returns a half-open [beg,end) range given a text start and end position.
+// Returns an inclusive point range given a text start and end position.
 // This function is designed to be used with uregex_start64/uregex_end64.
 til::point_span Microsoft::Console::ICU::BufferRangeFromMatch(UText* ut, URegularExpression* re)
 {
     UErrorCode status = U_ZERO_ERROR;
     const auto nativeIndexBeg = uregex_start64(re, 0, &status);
-    const auto nativeIndexEnd = uregex_end64(re, 0, &status);
+    auto nativeIndexEnd = uregex_end64(re, 0, &status);
+
+    // The parameters are given as a half-open [beg,end) range, but the point_span we return in closed [beg,end].
+    nativeIndexEnd--;
 
     const auto& textBuffer = *static_cast<const TextBuffer*>(ut->context);
     til::point_span ret;
@@ -436,7 +439,7 @@ til::point_span Microsoft::Console::ICU::BufferRangeFromMatch(UText* ut, URegula
     if (utextAccess(ut, nativeIndexEnd, true))
     {
         const auto y = accessCurrentRow(ut);
-        ret.end.x = textBuffer.GetRowByOffset(y).GetLeadingColumnAtCharOffset(ut->chunkOffset);
+        ret.end.x = textBuffer.GetRowByOffset(y).GetTrailingColumnAtCharOffset(ut->chunkOffset);
         ret.end.y = y;
     }
     else

src/buffer/out/search.cpp

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

src/buffer/out/search.h

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

src/buffer/out/textBuffer.cpp

@@ -12,10 +12,6 @@
 #include "../types/inc/utils.hpp"
 #include "search.h"
 
-// BODGY: Misdiagnosis in MSVC 17.11: Referencing global constants in the member
-// initializer list leads to this warning. Can probably be removed in the future.
-#pragma warning(disable : 26493) // Don't use C-style casts (type.4).)
-
 using namespace Microsoft::Console;
 using namespace Microsoft::Console::Types;
 
@@ -451,9 +447,14 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord
         cwd.GraphemeNext(state, chars);
         col += state.width;
 
+        // If we ran out of columns, we need to always return `columnLimit` and not `cols`,
+        // because if we tried inserting a wide glyph into just 1 remaining column it will
+        // fail to fit, but that remaining column still has been used up. When the caller sees
+        // `columns == columnLimit` they will line-wrap and continue inserting into the next row.
         if (col > columnLimit)
         {
-            break;
+            columns = columnLimit;
+            return dist;
         }
 
         dist += state.len;
@@ -461,7 +462,7 @@ size_t TextBuffer::FitTextIntoColumns(const std::wstring_view& chars, til::Coord
 
     // But if we simply ran out of text we just need to return the actual number of columns.
     columns = col;
-    return dist;
+    return chars.size();
 }
 
 // Pretend as if `position` is a regular cursor in the TextBuffer.
@@ -1118,14 +1119,6 @@ void TextBuffer::TriggerNewTextNotification(const std::wstring_view newText)
     }
 }
 
-void TextBuffer::TriggerSelection()
-{
-    if (_isActiveBuffer && _renderer)
-    {
-        _renderer->TriggerSelection();
-    }
-}
-
 // Method Description:
 // - get delimiter class for buffer cell position
 // - used for double click selection and uia word navigation
@@ -1140,206 +1133,6 @@ DelimiterClass TextBuffer::_GetDelimiterClassAt(const til::point pos, const std:
     return GetRowByOffset(realPos.y).DelimiterClassAt(realPos.x, wordDelimiters);
 }
 
-til::point TextBuffer::GetWordStart2(til::point pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional) const
-{
-    const auto bufferSize{ GetSize() };
-    const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
-
-    if (pos < bufferSize.Origin())
-    {
-        // can't move further back, so return early at origin
-        return bufferSize.Origin();
-    }
-    else if (pos >= limit)
-    {
-        // clamp to limit,
-        // but still do movement
-        pos = limit;
-    }
-
-    // Consider the delimiter classes represented as these chars:
-    // - ControlChar:   "_"
-    // - DelimiterChar: "D"
-    // - RegularChar:   "C"
-    // Expected results ("|" is the position):
-    //   CCC___| --> |CCC___
-    //   DDD___| --> |DDD___
-    //   ___CCC| --> ___|CCC
-    //   DDDCCC| --> DDD|CCC
-    //   ___DDD| --> ___|DDD
-    //   CCCDDD| --> CCC|DDD
-    // So the heuristic we use is:
-    // 1. move to the beginning of the delimiter class run
-    // 2. if we were on a ControlChar, go back one more delimiter class run
-    const auto initialDelimiter = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    pos = _GetDelimiterClassRunStart(pos, wordDelimiters);
-    if (pos.x == bufferSize.Left())
-    {
-        // Special case:
-        // we're at the left boundary (and end of a delimiter class run),
-        // we already know we can't wrap, so return early
-        return pos;
-    }
-    else if (initialDelimiter == DelimiterClass::ControlChar)
-    {
-        bufferSize.DecrementInExclusiveBounds(pos);
-        pos = _GetDelimiterClassRunStart(pos, wordDelimiters);
-    }
-    return pos;
-}
-
-til::point TextBuffer::GetWordEnd2(til::point pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional) const
-{
-    const auto bufferSize{ GetSize() };
-    const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
-
-    if (pos >= limit)
-    {
-        // can't move further forward,
-        // so return early at limit
-        return limit;
-    }
-    else if (const auto origin{ bufferSize.Origin() }; pos < origin)
-    {
-        // clamp to origin,
-        // but still do movement
-        pos = origin;
-    }
-
-    // Consider the delimiter classes represented as these chars:
-    // - ControlChar:   "_"
-    // - DelimiterChar: "D"
-    // - RegularChar:   "C"
-    // Expected results ("|" is the position):
-    //   |CCC___ --> CCC___|
-    //   |DDD___ --> DDD___|
-    //   |___CCC --> ___|CCC
-    //   |DDDCCC --> DDD|CCC
-    //   |___DDD --> ___|DDD
-    //   |CCCDDD --> CCC|DDD
-    // So the heuristic we use is:
-    // 1. move to the end of the delimiter class run
-    // 2. if the next delimiter class run is a ControlChar, go forward one more delimiter class run
-    pos = _GetDelimiterClassRunEnd(pos, wordDelimiters);
-    if (pos.x == bufferSize.RightExclusive())
-    {
-        // Special case:
-        // we're at the right boundary (and end of a delimiter class run),
-        // we already know we can't wrap, so return early
-        return pos;
-    }
-
-    if (const auto nextDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-        nextDelimClass == DelimiterClass::ControlChar)
-    {
-        return _GetDelimiterClassRunEnd(pos, wordDelimiters);
-    }
-    return pos;
-}
-
-bool TextBuffer::IsWordBoundary(const til::point pos, const std::wstring_view wordDelimiters) const
-{
-    const auto bufferSize = GetSize();
-    if (!bufferSize.IsInExclusiveBounds(pos))
-    {
-        // not in bounds
-        return false;
-    }
-
-    // buffer boundaries are always word boundaries
-    if (pos == bufferSize.Origin() || pos == bufferSize.BottomInclusiveRightExclusive())
-    {
-        return true;
-    }
-
-    // at beginning of the row, but we didn't wrap
-    if (pos.x == bufferSize.Left())
-    {
-        const auto& row = GetRowByOffset(pos.y - 1);
-        if (!row.WasWrapForced())
-        {
-            return true;
-        }
-    }
-
-    // at end of the row, but we didn't wrap
-    if (pos.x == bufferSize.RightExclusive())
-    {
-        const auto& row = GetRowByOffset(pos.y);
-        if (!row.WasWrapForced())
-        {
-            return true;
-        }
-    }
-
-    // we can treat text as contiguous,
-    // use DecrementInBounds (not exclusive) here
-    auto prevPos = pos;
-    bufferSize.DecrementInBounds(prevPos);
-    const auto prevDelimiterClass = _GetDelimiterClassAt(prevPos, wordDelimiters);
-
-    // if we changed delimiter class
-    // and the current delimiter class is not a control char,
-    // we're at a word boundary
-    const auto currentDelimiterClass = _GetDelimiterClassAt(pos, wordDelimiters);
-    return prevDelimiterClass != currentDelimiterClass && currentDelimiterClass != DelimiterClass::ControlChar;
-}
-
-til::point TextBuffer::_GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters) const
-{
-    const auto bufferSize = GetSize();
-    const auto initialDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    for (auto nextPos = pos; nextPos != bufferSize.Origin(); pos = nextPos)
-    {
-        bufferSize.DecrementInExclusiveBounds(nextPos);
-
-        if (nextPos.x == bufferSize.RightExclusive())
-        {
-            // wrapped onto previous line,
-            // check if it was forced to wrap
-            const auto& row = GetRowByOffset(nextPos.y);
-            if (!row.WasWrapForced())
-            {
-                return pos;
-            }
-        }
-        else if (_GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
-        {
-            // if we changed delim class, we're done (don't apply move)
-            return pos;
-        }
-    }
-    return pos;
-}
-
-til::point TextBuffer::_GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters) const
-{
-    const auto bufferSize = GetSize();
-    const auto initialDelimClass = bufferSize.IsInBounds(pos) ? _GetDelimiterClassAt(pos, wordDelimiters) : DelimiterClass::ControlChar;
-    for (auto nextPos = pos; nextPos != bufferSize.BottomInclusiveRightExclusive(); pos = nextPos)
-    {
-        bufferSize.IncrementInExclusiveBounds(nextPos);
-
-        if (nextPos.x == bufferSize.Left())
-        {
-            // wrapped onto next line,
-            // check if it was forced to wrap or switched delimiter class
-            const auto& row = GetRowByOffset(pos.y);
-            if (!row.WasWrapForced() || _GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
-            {
-                return pos;
-            }
-        }
-        else if (bufferSize.IsInBounds(nextPos) && _GetDelimiterClassAt(nextPos, wordDelimiters) != initialDelimClass)
-        {
-            // if we changed delim class,
-            // apply the move and return
-            return nextPos;
-        }
-    }
-    return pos;
-}
-
 // Method Description:
 // - Get the til::point for the beginning of the word you are on
 // Arguments:
@@ -1728,14 +1521,13 @@ til::point TextBuffer::GetGlyphStart(const til::point pos, std::optional<til::po
     const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
 
     // Clamp pos to limit
-    if (resultPos > limit)
+    if (bufferSize.CompareInBounds(resultPos, limit, true) > 0)
     {
-        return limit;
+        resultPos = limit;
     }
 
-    // if we're on a trailing byte, move to the leading byte
-    if (bufferSize.IsInBounds(resultPos) &&
-        GetCellDataAt(resultPos)->DbcsAttr() == DbcsAttribute::Trailing)
+    // limit is exclusive, so we need to move back to be within valid bounds
+    if (resultPos != limit && GetCellDataAt(resultPos)->DbcsAttr() == DbcsAttribute::Trailing)
     {
         bufferSize.DecrementInBounds(resultPos, true);
     }
@@ -1757,13 +1549,12 @@ til::point TextBuffer::GetGlyphEnd(const til::point pos, bool accessibilityMode,
     const auto limit{ limitOptional.value_or(bufferSize.EndExclusive()) };
 
     // Clamp pos to limit
-    if (resultPos > limit)
+    if (bufferSize.CompareInBounds(resultPos, limit, true) > 0)
     {
-        return limit;
+        resultPos = limit;
     }
 
-    if (bufferSize.IsInBounds(resultPos) &&
-        GetCellDataAt(resultPos)->DbcsAttr() == DbcsAttribute::Leading)
+    if (resultPos != limit && GetCellDataAt(resultPos)->DbcsAttr() == DbcsAttribute::Leading)
     {
         bufferSize.IncrementInBounds(resultPos, true);
     }
@@ -1820,31 +1611,6 @@ bool TextBuffer::MoveToNextGlyph(til::point& pos, bool allowExclusiveEnd, std::o
     return success;
 }
 
-bool TextBuffer::MoveToNextGlyph2(til::point& pos, std::optional<til::point> limitOptional) const
-{
-    const auto bufferSize = GetSize();
-    const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
-
-    if (pos >= limit)
-    {
-        // Corner Case: we're on/past the limit
-        // Clamp us to the limit
-        pos = limit;
-        return false;
-    }
-
-    // Try to move forward, but if we hit the buffer boundary, we fail to move.
-    const bool success = bufferSize.IncrementInExclusiveBounds(pos);
-    if (success &&
-        bufferSize.IsInBounds(pos) &&
-        GetCellDataAt(pos)->DbcsAttr() == DbcsAttribute::Trailing)
-    {
-        // Move again if we're on a wide glyph
-        bufferSize.IncrementInExclusiveBounds(pos);
-    }
-    return success;
-}
-
 // Method Description:
 // - Update pos to be the beginning of the previous glyph/character. This is used for accessibility
 // Arguments:
@@ -1877,31 +1643,6 @@ bool TextBuffer::MoveToPreviousGlyph(til::point& pos, std::optional<til::point>
     return success;
 }
 
-bool TextBuffer::MoveToPreviousGlyph2(til::point& pos, std::optional<til::point> limitOptional) const
-{
-    const auto bufferSize = GetSize();
-    const auto limit{ limitOptional.value_or(bufferSize.BottomInclusiveRightExclusive()) };
-
-    if (pos >= limit)
-    {
-        // Corner Case: we're on/past the limit
-        // Clamp us to the limit
-        pos = limit;
-        return false;
-    }
-
-    // Try to move backward, but if we hit the buffer boundary, we fail to move.
-    const bool success = bufferSize.DecrementInExclusiveBounds(pos);
-    if (success &&
-        bufferSize.IsInBounds(pos) &&
-        GetCellDataAt(pos)->DbcsAttr() == DbcsAttribute::Trailing)
-    {
-        // Move again if we're on a wide glyph
-        bufferSize.DecrementInExclusiveBounds(pos);
-    }
-    return success;
-}
-
 // Method Description:
 // - Determines the line-by-line rectangles based on two COORDs
 // - expands the rectangles to support wide glyphs
@@ -1970,7 +1711,7 @@ const std::vector<til::inclusive_rect> TextBuffer::GetTextRects(til::point start
 // - Else if a blockSelection, returns spans corresponding to each line in the block selection
 // Arguments:
 // - start: beginning of the text region of interest (inclusive)
-// - end: the other end of the text region of interest (exclusive)
+// - end: the other end of the text region of interest (inclusive)
 // - blockSelection: when enabled, get spans for each line covered by the block
 // - bufferCoordinates: when enabled, treat the coordinates as relative to
 //                      the buffer rather than the screen.
@@ -2040,17 +1781,31 @@ void TextBuffer::_ExpandTextRow(til::inclusive_rect& textRow) const
 
     // expand left side of rect
     til::point targetPoint{ textRow.left, textRow.top };
-    if (bufferSize.IsInBounds(targetPoint) && GetCellDataAt(targetPoint)->DbcsAttr() == DbcsAttribute::Trailing)
+    if (GetCellDataAt(targetPoint)->DbcsAttr() == DbcsAttribute::Trailing)
     {
-        bufferSize.DecrementInExclusiveBounds(targetPoint);
+        if (targetPoint.x == bufferSize.Left())
+        {
+            bufferSize.IncrementInBounds(targetPoint);
+        }
+        else
+        {
+            bufferSize.DecrementInBounds(targetPoint);
+        }
         textRow.left = targetPoint.x;
     }
 
     // expand right side of rect
     targetPoint = { textRow.right, textRow.bottom };
-    if (bufferSize.IsInBounds(targetPoint) && GetCellDataAt(targetPoint)->DbcsAttr() == DbcsAttribute::Trailing)
+    if (GetCellDataAt(targetPoint)->DbcsAttr() == DbcsAttribute::Leading)
     {
-        bufferSize.IncrementInExclusiveBounds(targetPoint);
+        if (targetPoint.x == bufferSize.RightInclusive())
+        {
+            bufferSize.DecrementInBounds(targetPoint);
+        }
+        else
+        {
+            bufferSize.IncrementInBounds(targetPoint);
+        }
         textRow.right = targetPoint.x;
     }
 }
@@ -2067,8 +1822,8 @@ size_t TextBuffer::SpanLength(const til::point coordStart, const til::point coor
 // - Retrieves the plain text data between the specified coordinates.
 // Arguments:
 // - trimTrailingWhitespace - remove the trailing whitespace at the end of the result.
-// - start - where to start getting text (should be at or prior to "end") (inclusive)
-// - end - where to end getting text (exclusive)
+// - start - where to start getting text (should be at or prior to "end")
+// - end - where to end getting text
 // Return Value:
 // - Just the text.
 std::wstring TextBuffer::GetPlainText(const til::point start, const til::point end) const
@@ -2097,7 +1852,7 @@ std::tuple<til::CoordType, til::CoordType, bool> TextBuffer::_RowCopyHelper(cons
         const auto maxX = req.bufferCoordinates ? req.maxX : ScreenToBufferLineInclusive(til::point{ req.maxX, iRow }, lineRendition).x;
 
         rowBeg = minX;
-        rowEnd = maxX;
+        rowEnd = maxX + 1; // +1 to get an exclusive end
     }
     else
     {
@@ -2106,7 +1861,7 @@ std::tuple<til::CoordType, til::CoordType, bool> TextBuffer::_RowCopyHelper(cons
         const auto end = req.bufferCoordinates ? req.end : ScreenToBufferLineInclusive(req.end, lineRendition);
 
         rowBeg = iRow != beg.y ? 0 : beg.x;
-        rowEnd = iRow != end.y ? row.GetReadableColumnCount() : end.x;
+        rowEnd = iRow != end.y ? row.GetReadableColumnCount() : end.x + 1; // +1 to get an exclusive end
     }
 
     // Our selection mechanism doesn't stick to glyph boundaries at the moment.
@@ -3507,30 +3262,23 @@ MarkExtents TextBuffer::_scrollMarkExtentForRow(const til::CoordType rowOffset,
     return mark;
 }
 
-std::wstring TextBuffer::_commandForRow(const til::CoordType rowOffset,
-                                        const til::CoordType bottomInclusive,
-                                        const bool clipAtCursor) const
+std::wstring TextBuffer::_commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive) const
 {
     std::wstring commandBuilder;
     MarkKind lastMarkKind = MarkKind::Prompt;
-    const auto cursorPosition = GetCursor().GetPosition();
     for (auto y = rowOffset; y <= bottomInclusive; y++)
     {
-        const bool onCursorRow = clipAtCursor && y == cursorPosition.y;
         // Now we need to iterate over text attributes. We need to find a
         // segment of Prompt attributes, we'll skip those. Then there should be
         // Command attributes. Collect up all of those, till we get to the next
         // Output attribute.
+
         const auto& row = GetRowByOffset(y);
         const auto runs = row.Attributes().runs();
         auto x = 0;
         for (const auto& [attr, length] : runs)
         {
-            auto nextX = gsl::narrow_cast<uint16_t>(x + length);
-            if (onCursorRow)
-            {
-                nextX = std::min(nextX, gsl::narrow_cast<uint16_t>(cursorPosition.x));
-            }
+            const auto nextX = gsl::narrow_cast<uint16_t>(x + length);
             const auto markKind{ attr.GetMarkAttributes() };
             if (markKind != lastMarkKind)
             {
@@ -3550,10 +3298,6 @@ std::wstring TextBuffer::_commandForRow(const til::CoordType rowOffset,
             }
             // advance to next run of text
             x = nextX;
-            if (onCursorRow && x == cursorPosition.x)
-            {
-                return commandBuilder;
-            }
         }
         // we went over all the runs in this row, but we're not done yet. Keep iterating on the next row.
     }
@@ -3577,7 +3321,7 @@ std::wstring TextBuffer::CurrentCommand() const
         // This row did start a prompt! Find the prompt that starts here.
         // Presumably, no rows below us will have prompts, so pass in the last
         // row with text as the bottom
-        return _commandForRow(promptY, _estimateOffsetOfLastCommittedRow(), true);
+        return _commandForRow(promptY, _estimateOffsetOfLastCommittedRow());
     }
     return L"";
 }

src/buffer/out/textBuffer.hpp

@@ -170,13 +170,9 @@ public:
     void TriggerScroll();
     void TriggerScroll(const til::point delta);
     void TriggerNewTextNotification(const std::wstring_view newText);
-    void TriggerSelection();
 
     til::point GetWordStart(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
     til::point GetWordEnd(const til::point target, const std::wstring_view wordDelimiters, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
-    til::point GetWordStart2(til::point pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
-    til::point GetWordEnd2(til::point pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
-    bool IsWordBoundary(const til::point pos, const std::wstring_view wordDelimiters) const;
     bool MoveToNextWord(til::point& pos, const std::wstring_view wordDelimiters, std::optional<til::point> limitOptional = std::nullopt) const;
     bool MoveToPreviousWord(til::point& pos, const std::wstring_view wordDelimiters) const;
 
@@ -184,8 +180,6 @@ public:
     til::point GetGlyphEnd(const til::point pos, bool accessibilityMode = false, std::optional<til::point> limitOptional = std::nullopt) const;
     bool MoveToNextGlyph(til::point& pos, bool allowBottomExclusive = false, std::optional<til::point> limitOptional = std::nullopt) const;
     bool MoveToPreviousGlyph(til::point& pos, std::optional<til::point> limitOptional = std::nullopt) const;
-    bool MoveToNextGlyph2(til::point& pos, std::optional<til::point> limitOptional = std::nullopt) const;
-    bool MoveToPreviousGlyph2(til::point& pos, std::optional<til::point> limitOptional = std::nullopt) const;
 
     const std::vector<til::inclusive_rect> GetTextRects(til::point start, til::point end, bool blockSelection, bool bufferCoordinates) const;
     std::vector<til::point_span> GetTextSpans(til::point start, til::point end, bool blockSelection, bool bufferCoordinates) const;
@@ -326,15 +320,13 @@ private:
     void _SetFirstRowIndex(const til::CoordType FirstRowIndex) noexcept;
     void _ExpandTextRow(til::inclusive_rect& selectionRow) const;
     DelimiterClass _GetDelimiterClassAt(const til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetDelimiterClassRunStart(til::point pos, const std::wstring_view wordDelimiters) const;
-    til::point _GetDelimiterClassRunEnd(til::point pos, const std::wstring_view wordDelimiters) const;
     til::point _GetWordStartForAccessibility(const til::point target, const std::wstring_view wordDelimiters) const;
     til::point _GetWordStartForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
     til::point _GetWordEndForAccessibility(const til::point target, const std::wstring_view wordDelimiters, const til::point limit) const;
     til::point _GetWordEndForSelection(const til::point target, const std::wstring_view wordDelimiters) const;
     void _PruneHyperlinks();
 
-    std::wstring _commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive, const bool clipAtCursor = false) const;
+    std::wstring _commandForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive) const;
     MarkExtents _scrollMarkExtentForRow(const til::CoordType rowOffset, const til::CoordType bottomInclusive) const;
     bool _createPromptMarkIfNeeded();
 

src/buffer/out/ut_textbuffer/UTextAdapterTests.cpp

@@ -49,15 +49,15 @@ class UTextAdapterTests
             return { { beg, 0 }, { end, 0 } };
         };
 
-        auto expected = std::vector{ s(0, 3), s(8, 11) };
+        auto expected = std::vector{ s(0, 2), s(8, 10) };
         auto actual = buffer.SearchText(L"abc", SearchFlag::None);
         VERIFY_ARE_EQUAL(expected, actual);
 
-        expected = std::vector{ s(5, 6) };
+        expected = std::vector{ s(5, 5) };
         actual = buffer.SearchText(L"𝒷", SearchFlag::None);
         VERIFY_ARE_EQUAL(expected, actual);
 
-        expected = std::vector{ s(12, 17) };
+        expected = std::vector{ s(12, 15) };
         actual = buffer.SearchText(L"ネコ", SearchFlag::None);
         VERIFY_ARE_EQUAL(expected, actual);
     }

src/cascadia/CascadiaPackage/Package-Can.appxmanifest

@@ -8,7 +8,6 @@
   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:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
   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"
@@ -139,11 +138,6 @@
                 </desktop5:ItemType>
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
-        <uap10:Extension Category="windows.protocol">
-          <uap10:Protocol Name="ms-terminal-can" Parameters="handle-uri %1">
-            <uap10:DisplayName>Terminal GitHub Auth</uap10:DisplayName>
-          </uap10:Protocol>
-        </uap10:Extension>
 
       </Extensions>
 

src/cascadia/CascadiaPackage/Package-Dev.appxmanifest

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 
 <Package
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
@@ -15,7 +15,6 @@
   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"
-  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
   IgnorableNamespaces="uap mp rescap uap3 uap17 desktop6 virtualization">
 
   <Identity
@@ -139,11 +138,6 @@
                 </desktop5:ItemType>
             </desktop4:FileExplorerContextMenus>
         </desktop4:Extension>
-        <uap10:Extension Category="windows.protocol">
-          <uap10:Protocol Name="ms-terminal-dev" Parameters="handle-uri %1">
-            <uap10:DisplayName>Terminal GitHub Auth</uap10:DisplayName>
-          </uap10:Protocol>
-        </uap10:Extension>
 
       </Extensions>
 

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

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

src/cascadia/LocalTests_TerminalApp/TabTests.cpp

@@ -1288,6 +1288,12 @@ namespace TerminalAppLocalTests
         END_TEST_METHOD_PROPERTIES()
 
         auto page = _commonSetup();
+        page->RenameWindowRequested([&page](auto&&, auto&&) {
+            // In the real terminal, this would bounce up to the monarch and
+            // come back down. Instead, immediately call back to tell the terminal it failed.
+            page->RenameFailed();
+        });
+
         auto windowNameChanged = false;
 
         page->PropertyChanged([&page, &windowNameChanged](auto&&, const winrt::WUX::Data::PropertyChangedEventArgs& args) mutable {

src/cascadia/QueryExtension/AzureLLMProvider.cpp

@@ -1,239 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#include "pch.h"
-#include "AzureLLMProvider.h"
-#include "../../types/inc/utils.hpp"
-#include "LibraryResources.h"
-
-#include "AzureLLMProvider.g.cpp"
-
-using namespace winrt::Windows::Foundation;
-using namespace winrt::Windows::Foundation::Collections;
-using namespace winrt::Windows::UI::Core;
-using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
-using namespace winrt::Windows::System;
-namespace WWH = ::winrt::Windows::Web::Http;
-namespace WSS = ::winrt::Windows::Storage::Streams;
-namespace WDJ = ::winrt::Windows::Data::Json;
-
-static constexpr std::wstring_view acceptedModels[] = {
-    L"gpt-35-turbo",
-    L"gpt4",
-    L"gpt4-32k",
-    L"gpt4o",
-    L"gpt-35-turbo-16k"
-};
-static constexpr std::wstring_view acceptedSeverityLevel{ L"safe" };
-static constexpr std::wstring_view applicationJson{ L"application/json" };
-static constexpr std::wstring_view endpointString{ L"endpoint" };
-static constexpr std::wstring_view keyString{ L"key" };
-static constexpr std::wstring_view roleString{ L"role" };
-static constexpr std::wstring_view contentString{ L"content" };
-static constexpr std::wstring_view messageString{ L"message" };
-static constexpr std::wstring_view errorString{ L"error" };
-static constexpr std::wstring_view severityString{ L"severity" };
-
-static constexpr std::wstring_view expectedScheme{ L"https" };
-static constexpr std::wstring_view expectedHostSuffix{ L".openai.azure.com" };
-
-namespace winrt::Microsoft::Terminal::Query::Extension::implementation
-{
-    void AzureLLMProvider::SetAuthentication(const winrt::hstring& authValues)
-    {
-        _httpClient = winrt::Windows::Web::Http::HttpClient{};
-        _httpClient.DefaultRequestHeaders().Accept().TryParseAdd(applicationJson);
-
-        if (!authValues.empty())
-        {
-            // Parse out the endpoint and key from the authValues string
-            WDJ::JsonObject authValuesObject{ WDJ::JsonObject::Parse(authValues) };
-            if (authValuesObject.HasKey(endpointString) && authValuesObject.HasKey(keyString))
-            {
-                _azureEndpoint = authValuesObject.GetNamedString(endpointString);
-                _azureKey = authValuesObject.GetNamedString(keyString);
-                _httpClient.DefaultRequestHeaders().Append(L"api-key", _azureKey);
-            }
-        }
-    }
-
-    void AzureLLMProvider::ClearMessageHistory()
-    {
-        _jsonMessages.Clear();
-    }
-
-    void AzureLLMProvider::SetSystemPrompt(const winrt::hstring& systemPrompt)
-    {
-        WDJ::JsonObject systemMessageObject;
-        winrt::hstring systemMessageContent{ systemPrompt };
-        systemMessageObject.Insert(roleString, WDJ::JsonValue::CreateStringValue(L"system"));
-        systemMessageObject.Insert(contentString, WDJ::JsonValue::CreateStringValue(systemMessageContent));
-        _jsonMessages.Append(systemMessageObject);
-    }
-
-    void AzureLLMProvider::SetContext(Extension::IContext context)
-    {
-        _context = std::move(context);
-    }
-
-    winrt::Windows::Foundation::IAsyncOperation<Extension::IResponse> AzureLLMProvider::GetResponseAsync(const winrt::hstring& userPrompt)
-    {
-        // Use the ErrorTypes enum to flag whether the response the user receives is an error message
-        // we pass this enum back to the caller so they can handle it appropriately (specifically, ExtensionPalette will send the correct telemetry event)
-        ErrorTypes errorType{ ErrorTypes::None };
-        hstring message{};
-
-        if (_azureEndpoint.empty())
-        {
-            message = RS_(L"CouldNotFindKeyErrorMessage");
-            errorType = ErrorTypes::InvalidAuth;
-        }
-        else
-        {
-            // If the AI endpoint is not an azure open AI endpoint, return an error message
-            Windows::Foundation::Uri parsedUri{ _azureEndpoint };
-            if (parsedUri.SchemeName() != expectedScheme ||
-                !til::ends_with(parsedUri.Host(), expectedHostSuffix))
-            {
-                message = RS_(L"InvalidEndpointMessage");
-                errorType = ErrorTypes::InvalidAuth;
-            }
-        }
-
-        // If we don't have a message string, that means the endpoint exists and matches the regex
-        // that we allow - now we can actually make the http request
-        if (message.empty())
-        {
-            // Make a copy of the prompt because we are switching threads
-            const auto promptCopy{ userPrompt };
-
-            // Make sure we are on the background thread for the http request
-            co_await winrt::resume_background();
-
-            WWH::HttpRequestMessage request{ WWH::HttpMethod::Post(), Uri{ _azureEndpoint } };
-            request.Headers().Accept().TryParseAdd(applicationJson);
-
-            WDJ::JsonObject jsonContent;
-            WDJ::JsonObject messageObject;
-
-            // _ActiveCommandline should be set already, we request for it the moment we become visible
-            winrt::hstring engineeredPrompt{ promptCopy };
-            if (_context && !_context.ActiveCommandline().empty())
-            {
-                engineeredPrompt = promptCopy + L". The shell I am running is " + _context.ActiveCommandline();
-            }
-            messageObject.Insert(roleString, WDJ::JsonValue::CreateStringValue(L"user"));
-            messageObject.Insert(contentString, WDJ::JsonValue::CreateStringValue(engineeredPrompt));
-            _jsonMessages.Append(messageObject);
-            jsonContent.SetNamedValue(L"messages", _jsonMessages);
-            jsonContent.SetNamedValue(L"max_tokens", WDJ::JsonValue::CreateNumberValue(800));
-            jsonContent.SetNamedValue(L"temperature", WDJ::JsonValue::CreateNumberValue(0.7));
-            jsonContent.SetNamedValue(L"frequency_penalty", WDJ::JsonValue::CreateNumberValue(0));
-            jsonContent.SetNamedValue(L"presence_penalty", WDJ::JsonValue::CreateNumberValue(0));
-            jsonContent.SetNamedValue(L"top_p", WDJ::JsonValue::CreateNumberValue(0.95));
-            jsonContent.SetNamedValue(L"stop", WDJ::JsonValue::CreateStringValue(L"None"));
-            const auto stringContent = jsonContent.ToString();
-            WWH::HttpStringContent requestContent{
-                stringContent,
-                WSS::UnicodeEncoding::Utf8,
-                L"application/json"
-            };
-
-            request.Content(requestContent);
-
-            // Send the request
-            try
-            {
-                const auto response = _httpClient.SendRequestAsync(request).get();
-                // Parse out the suggestion from the response
-                const auto string{ response.Content().ReadAsStringAsync().get() };
-                const auto jsonResult{ WDJ::JsonObject::Parse(string) };
-                if (jsonResult.HasKey(errorString))
-                {
-                    const auto errorObject = jsonResult.GetNamedObject(errorString);
-                    message = errorObject.GetNamedString(messageString);
-                    errorType = ErrorTypes::FromProvider;
-                }
-                else
-                {
-                    if (_verifyModelIsValidHelper(jsonResult))
-                    {
-                        const auto choices = jsonResult.GetNamedArray(L"choices");
-                        const auto firstChoice = choices.GetAt(0).GetObject();
-                        const auto messageObject = firstChoice.GetNamedObject(messageString);
-                        message = messageObject.GetNamedString(contentString);
-                    }
-                    else
-                    {
-                        message = RS_(L"InvalidModelMessage");
-                        errorType = ErrorTypes::InvalidModel;
-                    }
-                }
-            }
-            catch (...)
-            {
-                message = RS_(L"UnknownErrorMessage");
-                errorType = ErrorTypes::Unknown;
-            }
-        }
-
-        // Also make a new entry in our jsonMessages list, so the AI knows the full conversation so far
-        WDJ::JsonObject responseMessageObject;
-        responseMessageObject.Insert(roleString, WDJ::JsonValue::CreateStringValue(L"assistant"));
-        responseMessageObject.Insert(contentString, WDJ::JsonValue::CreateStringValue(message));
-        _jsonMessages.Append(responseMessageObject);
-
-        co_return winrt::make<AzureResponse>(message, errorType, winrt::hstring{});
-    }
-
-    bool AzureLLMProvider::_verifyModelIsValidHelper(const WDJ::JsonObject jsonResponse)
-    {
-        const auto model = jsonResponse.GetNamedString(L"model");
-        bool modelIsAccepted{ false };
-        for (const auto acceptedModel : acceptedModels)
-        {
-            if (model == acceptedModel)
-            {
-                modelIsAccepted = true;
-            }
-            break;
-        }
-        if (!modelIsAccepted)
-        {
-            return false;
-        }
-        WDJ::JsonObject contentFiltersObject;
-        // For some reason, sometimes the content filter results are in a key called "prompt_filter_results"
-        // and sometimes they are in a key called "prompt_annotations". Check for either.
-        if (jsonResponse.HasKey(L"prompt_filter_results"))
-        {
-            contentFiltersObject = jsonResponse.GetNamedArray(L"prompt_filter_results").GetObjectAt(0);
-        }
-        else if (jsonResponse.HasKey(L"prompt_annotations"))
-        {
-            contentFiltersObject = jsonResponse.GetNamedArray(L"prompt_annotations").GetObjectAt(0);
-        }
-        else
-        {
-            return false;
-        }
-        const auto contentFilters = contentFiltersObject.GetNamedObject(L"content_filter_results");
-        if (Feature_TerminalChatJailbreakFilter::IsEnabled() && !contentFilters.HasKey(L"jailbreak"))
-        {
-            return false;
-        }
-        for (const auto filterPair : contentFilters)
-        {
-            const auto filterLevel = filterPair.Value().GetObjectW();
-            if (filterLevel.HasKey(severityString))
-            {
-                if (filterLevel.GetNamedString(severityString) != acceptedSeverityLevel)
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-}

src/cascadia/QueryExtension/AzureLLMProvider.h

@@ -1,66 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-#pragma once
-
-#include "AzureLLMProvider.g.h"
-
-namespace winrt::Microsoft::Terminal::Query::Extension::implementation
-{
-    struct AzureBranding : public winrt::implements<AzureBranding, winrt::Microsoft::Terminal::Query::Extension::IBrandingData>
-    {
-        AzureBranding() = default;
-
-        winrt::hstring Name() const noexcept { return L"Azure OpenAI"; };
-        winrt::hstring HeaderIconPath() const noexcept { return winrt::hstring{}; };
-        winrt::hstring HeaderText() const noexcept { return winrt::hstring{}; };
-        winrt::hstring SubheaderText() const noexcept { return winrt::hstring{}; };
-        winrt::hstring BadgeIconPath() const noexcept { return winrt::hstring{}; };
-        winrt::hstring QueryAttribution() const noexcept { return winrt::hstring{}; };
-    };
-
-    struct AzureLLMProvider : AzureLLMProviderT<AzureLLMProvider>
-    {
-        AzureLLMProvider() = default;
-
-        void ClearMessageHistory();
-        void SetSystemPrompt(const winrt::hstring& systemPrompt);
-        void SetContext(Extension::IContext context);
-
-        IBrandingData BrandingData() { return _brandingData; };
-
-        winrt::Windows::Foundation::IAsyncOperation<Extension::IResponse> GetResponseAsync(const winrt::hstring& userPrompt);
-
-        void SetAuthentication(const winrt::hstring& authValues);
-        TYPED_EVENT(AuthChanged, winrt::Microsoft::Terminal::Query::Extension::ILMProvider, winrt::Microsoft::Terminal::Query::Extension::IAuthenticationResult);
-
-    private:
-        winrt::hstring _azureEndpoint;
-        winrt::hstring _azureKey;
-        winrt::Windows::Web::Http::HttpClient _httpClient{ nullptr };
-        IBrandingData _brandingData{ winrt::make<AzureBranding>() };
-
-        Extension::IContext _context;
-
-        winrt::Windows::Data::Json::JsonArray _jsonMessages;
-
-        bool _verifyModelIsValidHelper(const Windows::Data::Json::JsonObject jsonResponse);
-    };
-
-    struct AzureResponse : public winrt::implements<AzureResponse, winrt::Microsoft::Terminal::Query::Extension::IResponse>
-    {
-        AzureResponse(const winrt::hstring& message, const winrt::Microsoft::Terminal::Query::Extension::ErrorTypes errorType, const winrt::hstring& responseAttribution) :
-            Message{ message },
-            ErrorType{ errorType },
-            ResponseAttribution{ responseAttribution } {}
-
-        til::property<winrt::hstring> Message;
-        til::property<winrt::Microsoft::Terminal::Query::Extension::ErrorTypes> ErrorType;
-        til::property<winrt::hstring> ResponseAttribution;
-    };
-}
-
-namespace winrt::Microsoft::Terminal::Query::Extension::factory_implementation
-{
-    BASIC_FACTORY(AzureLLMProvider);
-}

src/cascadia/QueryExtension/AzureLLMProvider.idl

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-import "ILMProvider.idl";
-
-namespace Microsoft.Terminal.Query.Extension
-{
-    runtimeclass AzureLLMProvider : [default] ILMProvider
-    {
-        AzureLLMProvider();
-    }
-}