Separate pruning of elevated/unelevated session buffers #19546
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
This comment has been minimized.
This comment has been minimized.
carlos-zamora
requested changes
Nov 10, 2025
Member
carlos-zamora
left a comment
carlos-zamora
left a comment
There was a problem hiding this comment.
There's a few changes I'm confused about:
- Package-Dev.appxmanifest
- common.build.pre.props
I also think we want to keep the distinction between PersistLayout and PersistAll for #19341. May be worth testing persistence with both values, to be safe.
| <!-- For ALL build types--> | ||
| <PropertyGroup Label="Configuration"> | ||
| <PlatformToolset>v143</PlatformToolset> | ||
| <PlatformToolset>v145</PlatformToolset> |
Comment on lines
-1104
to
+1149
| sessionIds.emplace(terminalArgs.SessionId()); | ||
| control.PersistTo(reinterpret_cast<int64_t>(file.get())); | ||
| bufferFilenames.emplace(std::move(filename)); |
Member
There was a problem hiding this comment.
Shouldn't we only do this if _app.Logic().Settings().GlobalSettings().FirstWindowPreference() == FirstWindowPreference::PersistedLayoutAndContent?
| MovePane, | ||
| PersistLayout, | ||
| PersistAll | ||
| Persist, |
Member
There was a problem hiding this comment.
Don't we want to keep the distinction between PersistLayout and PersistAll? See #19341
Comment on lines
-110
to
-130
| <com:Extension Category="windows.comInterface"> | ||
| <com:ComInterface> | ||
| <com:ProxyStub Id="DEC4804D-56D1-4F73-9FBE-6828E7C85C56" DisplayName="OpenConsoleHandoffProxy" Path="OpenConsoleProxy.dll"/> | ||
| <com:Interface Id="E686C757-9A35-4A1C-B3CE-0BCC8B5C69F4" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/> | ||
| <com:Interface Id="6F23DA90-15C5-4203-9DB0-64E73F1B1B00" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/> <!-- ITerminalHandoff3 --> | ||
| <com:Interface Id="746E6BC0-AB05-4E38-AB14-71E86763141F" ProxyStubClsid="DEC4804D-56D1-4F73-9FBE-6828E7C85C56"/> | ||
| </com:ComInterface> | ||
| </com:Extension> | ||
| <com:Extension Category="windows.comServer"> | ||
| <com:ComServer> | ||
| <com:ExeServer DisplayName="OpenConsole" Executable="OpenConsole.exe"> | ||
| <com:Class Id="1F9F2BF5-5BC3-4F17-B0E6-912413F1F451"/> | ||
| </com:ExeServer> | ||
| <com:ExeServer DisplayName="WindowsTerminal" Executable="WindowsTerminal.exe"> | ||
| <com:Class Id="051F34EE-C1FD-4B19-AF75-9BA54648434C"/> | ||
| </com:ExeServer> | ||
| <com:SurrogateServer DisplayName="WindowsTerminalShellExt"> | ||
| <com:Class Id="52065414-e077-47ec-a3ac-1cc5455e1b54" Path="WindowsTerminalShellExt.dll" ThreadingModel="STA"/> | ||
| </com:SurrogateServer> | ||
| </com:ComServer> | ||
| </com:Extension> |
Member
Author
There was a problem hiding this comment.
Woops. I keep this staged locally, because this makes it build & deploy with VS 2026 for me. I didn't intend to push this.
| } | ||
| break; | ||
| } | ||
| case BuildStartupKind::PersistLayout: |
Member
There was a problem hiding this comment.
Seems like we'd want to keep the branches separate
microsoft-github-policy-service
bot
added
Needs-Author-Feedback
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, launching an unelevated session after an elevated one would delete the latter's persisted buffers, and vice versa of course. Also, elevated buffers didn't have an ACL forbidding access to unelevated users. That's also fixed now.
Closes #19526
Validation Steps Performed
buffer_are renamed toelevated_if needed ✅