feat(teammanager): merge mcp agent configs from config file and frontend settings#320
Merged
husseinmozannar merged 9 commits intomicrosoft:mainfrom Sep 2, 2025
Merged
Conversation
Handle merging of MCP agent configurations from both config.yaml and frontend settings. Configurations with duplicate names in frontend settings are filtered out when they exist in config.yaml to prevent conflicts.
Contributor
Author
|
@microsoft-github-policy-service agree |
weicanie
commented
Aug 6, 2025
Contributor
Author
weicanie
left a comment
weicanie
left a comment
There was a problem hiding this comment.
Line 217 should replace "None" with "[]" to avoid a type error.
cheng-tan
reviewed
Aug 6, 2025
Collaborator
cheng-tan
left a comment
cheng-tan
left a comment
There was a problem hiding this comment.
Thank you for the contribution.
When the config.yaml file is passed in, verify the mcp agent configuration within it. If the configuration is valid, overwrite the mcp agent configuration in the UI settings; otherwise, use the mcp agent configuration in the UI settings.
Contributor
|
@cheng-tan I believe @weicanie has resolved your concern, are there other issues with this PR? |
cheng-tan
approved these changes
Aug 19, 2025
Collaborator
cheng-tan
left a comment
cheng-tan
left a comment
There was a problem hiding this comment.
Thanks for the contribution. Looks good and verified it works.
Collaborator
|
@weicanie can you run |
husseinmozannar
approved these changes
Sep 2, 2025
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
3 participants
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.
Solve the problem that the mcp agent settings in config.yaml do not take effect.
Handle merging of MCP agent configurations from both config.yaml and frontend settings.
Configurations with duplicate mcp-agent names in frontend settings are filtered out when they exist in config.yaml to prevent conflicts.
Closes #316 #222