chore: Conflicts resolve - #1102
Merged
Merged
Conversation
fix: remove sensitive cookie data from sample user configuration
…e data after image build and push
… JSON templates. - Updated deployment capacity defaults for GPT models. - Added private endpoint configurations for Azure Container Registry based on networking settings. - Adjusted scripts for building and pushing images to temporarily relax ACR restrictions during WAF deployments. - Enhanced WebSocket handling in the frontend to coalesce streaming messages for improved UI performance. - Updated backend configuration to reflect changes in reasoning model naming and supported models. - Improved agent handling logic in the orchestration layer to prevent infinite loops during approval processes.
…emove premature satisfaction guard logging in human_approval_manager.py
feat: upgrade to GPT-5.4 models, add default teams with per-user isolation, and ACR image build scripts
chore: Update Owners ID for Vinay and Prajwal
fix: updated the branch to resolve the conflict
Roopan-Microsoft
marked this pull request as ready for review
July 19, 2026 03:19
Roopan-Microsoft
requested review from
Avijit-Microsoft,
Fr4nc3,
Prajwal-Microsoft and
Roopan-Microsoft
as code owners
July 19, 2026 03:19
Roopan-Microsoft
requested review from
Vinay-Microsoft,
aniaroramsft,
dgp10801,
nchandhi and
toherman-msft
as code owners
July 19, 2026 03:19
Roopan-Microsoft
approved these changes
Jul 19, 2026
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
7 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.
Purpose
Resolve merge conflicts of dev branch
Does this introduce a breaking change?
How to Test
What to Check
Verify that the following are valid
Other Information