.NET: fix: MessageMerger crashes when there are no dangling messages #660
+219
−8
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
markwallace-microsoft
added
.NET
workflows
github-actions
bot
changed the title
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a crash in MessageMerger when there are no dangling message updates by adding proper null/empty checks before attempting to process dangling updates.
- Added guard condition to prevent processing empty dangling updates in
ComputeFlattened() - Enhanced
ComputeMerged()method with better response merging logic and property handling - Added comprehensive test coverage for MessageMerger functionality
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| MessageMerger.cs | Added null safety checks for dangling updates and improved response merging logic |
| MessageMergerTests.cs | Added new test file with unit tests for MessageMerger functionality |
| ChatMessageBuilder.cs | Added helper utilities for creating test data and message streaming |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
dotnet/tests/Microsoft.Agents.Workflows.UnitTests/MessageMergerTests.cs
Outdated
Show resolved
Hide resolved
dotnet/tests/Microsoft.Agents.Workflows.UnitTests/MessageMergerTests.cs
Outdated
Show resolved
Hide resolved
TaoChenOSU
approved these changes
Sep 9, 2025
alliscode
approved these changes
Sep 9, 2025
If the parent "agent" instance received an Id or Name when being instantiated, we should avoid stomping over it with the subagents' ids. But if there is no parent identifier, and only a single subagent yielded identified messages, pull that in.
lokitoth
force-pushed
the
dev/dotnet_workflow/fix_message_merger
branch
from
b6ec9da to
e6b2ed3
Compare
lokitoth
temporarily deployed
to
integration
GitHub Actions
Inactive
lokitoth
temporarily deployed
to
integration
GitHub Actions
Inactive
ReubenBond
pushed a commit
to ReubenBond/agent-framework
that referenced
this pull request
Oct 28, 2025
…icrosoft#660) * fix: MessageMerger crashes when there are no dangling messages * refactor: Better logic for AgentId in Workflow-as-Agent If the parent "agent" instance received an Id or Name when being instantiated, we should avoid stomping over it with the subagents' ids. But if there is no parent identifier, and only a single subagent yielded identified messages, pull that in.
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
Fixes a crash in MessageMerger when there are no dangling updates.
Contribution Checklist