Preserve user picker state for orchestration when Agent Merge is enabled - #332609
Merged
Benjamin Christopher Simmonds (benibenj) merged 2 commits intoAug 25, 2026
Merged
Conversation
Copilot started work on behalf of
Benjamin Christopher Simmonds (benibenj)
August 25, 2026 20:28
View session
Co-authored-by: benibenj <44439583+benibenj@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Fix session configuration inheritance during agent merge
Preserve user picker state for orchestration when Agent Merge is enabled
Aug 25, 2026
Benjamin Christopher Simmonds (benibenj)
marked this pull request as ready for review
August 25, 2026 21:23
Benjamin Christopher Simmonds (benibenj)
enabled auto-merge (squash)
August 25, 2026 21:23
Anthony Kim (anthonykim1)
approved these changes
Aug 25, 2026
Justin Chen (justschen)
approved these changes
Aug 25, 2026
Benjamin Christopher Simmonds (benibenj)
merged commit Aug 25, 2026
499be98
into
main
27 checks passed
Benjamin Christopher Simmonds (benibenj)
deleted the
copilot/fix-multi-session-merge-behavior
branch
August 25, 2026 23:04
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
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.
Description
Agent Merge temporarily forces session config (for example
mode=autopilotand elevated approvals) via controller-side injection, but orchestration tools were inheriting those temporary values when creating child sessions. This updates inheritance to use the underlying user-configured picker state instead of merge-induced overrides.Shared non-merge config view
getNonMergeSessionConfigValues(...)inagentMerge.ts.injectedConfiguration.previous(only for keys still matching injectedappliedvalues).Orchestration default inheritance fix
AgentService._getServerToolCreationDefaults(...)to pass non-merge values into providergetInheritedChatConfig(...).create_session/orchestration inheritance copy pre-merge picker values, not temporary merge overrides.Coverage