Allow FunctionResultContent in User messages to produce ToolChatMessage #7190
+183
−20
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
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Enhance message recognition for FunctionResultContent
Allow FunctionResultContent in User messages to produce ToolChatMessage
Jan 2, 2026
stephentoub
reviewed
Jan 4, 2026
src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs
Outdated
Show resolved
Hide resolved
stephentoub
approved these changes
Jan 4, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
This PR extends the OpenAIChatClient.ToOpenAIChatMessages method to recognize FunctionResultContent not only in Tool messages, but also in User, System, and Developer messages. When processing these message types, the implementation now extracts any FunctionResultContent items and yields them as separate ToolChatMessage objects before yielding the original message type with remaining content.
Key Changes
- Added logic to extract
FunctionResultContentfrom User/System/Developer messages and yield them asToolChatMessageobjects - Refactored duplicate code by extracting a
CreateToolChatMessagehelper method to handle the conversion ofFunctionResultContenttoToolChatMessage - Added comprehensive test coverage for the new functionality with three test cases covering single, multiple, and content-only scenarios
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIChatClient.cs | Adds FunctionResultContent extraction logic for User/System/Developer messages (lines 157-165), creates helper method CreateToolChatMessage to eliminate code duplication (lines 756-773), and refactors Tool message handling to use the new helper |
| test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIConversionTests.cs | Adds three new test methods validating that FunctionResultContent in User messages correctly produces ToolChatMessage objects, covering scenarios with mixed content, multiple results, and result-only messages |
test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIConversionTests.cs
Outdated
Show resolved
Hide resolved
test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/OpenAIConversionTests.cs
Show resolved
Hide resolved
…nly content - When User/System/Developer message contains only FunctionResultContent, produce only ToolChatMessage without an empty User/System/Developer message - Add test coverage for System messages with FunctionResultContent Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com>
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.
Understand the issue:
OpenAIChatClient.ToOpenAIChatMessagesonly processesFunctionResultContentwhen the message role isChatRole.Tool. The feature request is to also supportFunctionResultContentinsideUsermessages.Implement the fix in
OpenAIChatClient.cs:User(orSystem/Developer) messages, check forFunctionResultContentitems and yieldToolChatMessageobjects for each oneCreateToolChatMessageto avoid duplicationAdd tests in
OpenAIConversionTests.cs:AsOpenAIChatMessages_FunctionResultContentInUserMessage_ProducesToolMessageAsOpenAIChatMessages_MultipleFunctionResultContentInUserMessage_ProducesMultipleToolMessagesAsOpenAIChatMessages_FunctionResultContentOnlyInUserMessage_ProducesOnlyToolMessage(fixed: no longer produces empty UserChatMessage)AsOpenAIChatMessages_FunctionResultContentInSystemMessage_ProducesToolMessage(new)AsOpenAIChatMessages_FunctionResultContentOnlyInSystemMessage_ProducesOnlyToolMessage(new)Build and test the changes
Run code review and address feedback
Original prompt
💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.
Microsoft Reviewers: Open in CodeFlow