Unseal FunctionCallContent/FunctionResultContent; make MCP types extend them #7201

Copilot · 2026-01-12T19:07:05Z

Address Review Feedback - All Comments Resolved ✅

All new review comments have been addressed:

Documentation Changes

✅ FunctionApprovalRequestContent - Reverted parameter documentation from "requires user approval" back to "requires approval"
✅ FunctionApprovalResponseContent - Reverted parameter documentation from "requires user approval" back to "for which approval was requested"
✅ Reverted CreateResponse documentation from "function call" back to "call"

Constructor Changes

✅ McpServerToolCallContent - Removed arguments: null parameter from base constructor call

JSON Serialization Changes

✅ Changed all deserializations from IReadOnlyDictionaryStringObject to IDictionaryStringObject:
- Line 212: McpToolCallApprovalRequestItem deserialization
- Line 426: McpToolCallApprovalRequestItem streaming deserialization
- Line 1298: AddMcpToolCallContent deserialization
✅ Changed all serializations to use IDictionaryStringObject:
- Line 1083: McpServerToolCallContent Arguments serialization
- Line 1096: FunctionCallContent Arguments serialization (changed from AIJsonUtilities to OpenAIJsonContext)

FunctionInvokingChatClient Changes

✅ Reverted error message from "CallId(s)" back to "FunctionCall.CallId(s)"
✅ Simplified ApprovalResultWithRequestMessage struct - removed XML doc comment since we're using concrete FunctionCallContent type

All changes maintain the breaking changes we accepted (using IDictionary instead of IReadOnlyDictionary) while simplifying the code.

Original prompt

Can you take over #7104, augment it with implementing McpServerToolCallContent and McpServerToolResultContent by unsealing and extending FunctionCallContent and FunctionResultContent, add the necessary compatibility suppressions, update the branch and resolve conflicts.

✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.

Microsoft Reviewers: Open in CodeFlow

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

…ew approval types Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

…ypes Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

jozkee

@copilot please fix errors and address feedback.

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/FunctionApprovalRequestContent.cs

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/FunctionApprovalResponseContent.cs

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/McpServerToolCallContent.cs

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/McpServerToolResultContent.cs

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs

...ies/Microsoft.Extensions.AI.Tests/ChatCompletion/FunctionInvokingChatClientApprovalsTests.cs

…nts properties, fix idToContentMapping Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

…Dictionary, use Result instead of Output Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Copilot · 2026-01-12T22:16:57Z

@copilot please fix errors and address feedback.

All feedback addressed in commits 598f78b, 23d5d20, and 29454f9. Changes include:

Reverted to FunctionCallContent FunctionCall in approval types
Removed wrapper properties from MCP types (breaking changes accepted)
Fixed idToContentMapping type and simplified logic
Added missing tests from PR Replace Mcp approvals with Function approvals #7104
Fixed all build errors (unused usings, type conversions, property renames)

jozkee · 2026-01-12T22:18:54Z

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/FunctionApprovalRequestContent.cs


 /// <summary>
-/// Represents a request for user approval of a function call.
+/// Represents a request for user approval of a call content.


this must be reverted too

Done in dd30286. Reverted parameter documentation from "requires user approval" back to "requires approval".

jozkee · 2026-01-12T22:18:58Z

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/FunctionApprovalResponseContent.cs


 /// <summary>
-/// Represents a response to a function approval request.
+/// Represents a response to an approval request.


Done in dd30286. Reverted parameter documentation from "requires user approval" back to "for which approval was requested".

jozkee · 2026-01-14T17:03:18Z

src/Libraries/Microsoft.Extensions.AI.Abstractions/Contents/McpServerToolCallContent.cs

    /// <exception cref="ArgumentException"><paramref name="callId"/> or <paramref name="toolName"/> is empty or composed entirely of whitespace.</exception>
+    [JsonConstructor]
    public McpServerToolCallContent(string callId, string toolName, string? serverName)
+        : base(callId, toolName, arguments: null)


@copilot remove arguments.

Done in dd30286. Removed arguments: null parameter from base constructor call.

jozkee · 2026-01-14T17:35:43Z

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs

+                    message.Contents.Add(new FunctionApprovalRequestContent(mtcari.Id, new McpServerToolCallContent(mtcari.Id, mtcari.ToolName, mtcari.ServerLabel)
                    {
-                        Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject)!,
+                        Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject) as IDictionary<string, object?>,


@copilot

Suggested change

Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject) as IDictionary<string, object?>,

Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments, OpenAIJsonContext.Default.IDictionaryStringObject),

Done in dd30286. Changed to use OpenAIJsonContext.Default.IDictionaryStringObject and removed .ToMemory().Span and cast.

jozkee · 2026-01-14T17:37:27Z

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs

+                            yield return CreateUpdate(new FunctionApprovalRequestContent(mtcari.Id, new McpServerToolCallContent(mtcari.Id, mtcari.ToolName, mtcari.ServerLabel)
                            {
-                                Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject)!,
+                                Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject) as IDictionary<string, object?>,


@copilot

Suggested change

Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject) as IDictionary<string, object?>,

Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments, OpenAIJsonContext.Default.IDictionaryStringObject),

Done in dd30286. Changed to use OpenAIJsonContext.Default.IDictionaryStringObject and removed .ToMemory().Span and cast.

jozkee · 2026-01-14T17:42:06Z

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs

+                                mcpCall.CallId,
+                                mcpCall.ServerName,
+                                mcpCall.ToolName,
+                                BinaryData.FromBytes(JsonSerializer.SerializeToUtf8Bytes(mcpCall.Arguments!, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject)));


@copilot this should serialize as IDictionary<string,object?>, use the same pattern as case FunctionCallContent.

Done in dd30286. Changed to serialize using OpenAIJsonContext.Default.IDictionaryStringObject.

jozkee · 2026-01-14T17:53:14Z

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs

                                callContent.Name,
                                BinaryData.FromBytes(JsonSerializer.SerializeToUtf8Bytes(
                                    callContent.Arguments,
                                    AIJsonUtilities.DefaultOptions.GetTypeInfo(typeof(IDictionary<string, object?>)))));


@copilot can this use OpenAIJsonContext.Default.IDictionaryStringObject?

Done in dd30286. Changed from AIJsonUtilities.DefaultOptions.GetTypeInfo(typeof(IDictionary<string, object?>)) to OpenAIJsonContext.Default.IDictionaryStringObject.

jozkee · 2026-01-14T17:53:35Z

src/Libraries/Microsoft.Extensions.AI.OpenAI/OpenAIResponsesChatClient.cs

        contents.Add(new McpServerToolCallContent(mtci.Id, mtci.ToolName, mtci.ServerLabel)
        {
-            Arguments = JsonSerializer.Deserialize(mtci.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject)!,
+            Arguments = JsonSerializer.Deserialize(mtci.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject) as IDictionary<string, object?>,


@copilot deserialize as IDictionary<string,object?>, use JsonSerializer.Deserialize(utf8json, OpenAIJsonContext.Default.IDictionaryStringObject).

Done in dd30286. Changed to deserialize using OpenAIJsonContext.Default.IDictionaryStringObject and removed .ToMemory().Span and cast.

jozkee · 2026-01-14T17:54:46Z

src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs

        {
            Throw.InvalidOperationException(
-                $"FunctionApprovalRequestContent found with FunctionCall.CallId(s) '{string.Join(", ", approvalRequestCallIds)}' that have no matching FunctionApprovalResponseContent.");
+                $"FunctionApprovalRequestContent found with CallId(s) '{string.Join(", ", approvalRequestCallIds)}' that have no matching FunctionApprovalResponseContent.");


@copilot undo this since we no longer need to change the property name.

Done in dd30286. Reverted error message from "CallId(s)" back to "FunctionCall.CallId(s)".

jozkee · 2026-01-14T17:58:34Z

src/Libraries/Microsoft.Extensions.AI/ChatCompletion/FunctionInvokingChatClient.cs

+        /// <summary>
+        /// Gets the FunctionCallContent from the response.
+        /// </summary>
+        public FunctionCallContent FunctionCallContent => Response.FunctionCall;


@copilot we can also undo this since we reverted FunctionApprovalResponseContent.FunctionCall to keep using concrete FunctionCallContent.

Done in dd30286. Simplified the struct by removing the XML doc comment and directly accessing Response.FunctionCall.

…ctionaryStringObject Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Undo unneeded changes Updated OpenAIResponsesChatClient Updated tests

Initial plan

6a3b94e

Copilot AI assigned Copilot and jozkee Jan 12, 2026

Copilot started work on behalf of jozkee January 12, 2026 19:07 View session

Copilot AI and others added 6 commits January 12, 2026 19:11

Unseal Function types and refactor MCP types to extend them

f44487e

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Update FunctionInvokingChatClient and OpenAIResponsesChatClient for n…

ebc033a

…ew approval types Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Update test files for new approval content types

beb9517

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Update OpenAI tests and add compatibility suppressions for unsealed t…

aff14b3

…ypes Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Fix switch case ordering for McpServerToolCallContent inheritance

2d45997

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Address code review feedback - add clarifying comments

8db0e74

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Implement McpServerToolCallContent and McpServerToolResultContent~~ Unseal FunctionCallContent/FunctionResultContent; make MCP types extend them Jan 12, 2026

Copilot AI requested a review from jozkee January 12, 2026 19:39

Copilot finished work on behalf of jozkee January 12, 2026 19:39

jozkee requested changes Jan 12, 2026

View reviewed changes

Copilot started work on behalf of jozkee January 12, 2026 21:55 View session

dotnet-policy-service bot added the waiting-author-feedback 📭 The author of this issue needs to respond in order for us to continue investigating this issue. label Jan 12, 2026

Address review feedback: revert to FunctionCall, remove Output/Argume…

598f78b

…nts properties, fix idToContentMapping Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

dotnet-policy-service bot removed the waiting-author-feedback 📭 The author of this issue needs to respond in order for us to continue investigating this issue. label Jan 12, 2026

Copilot AI and others added 2 commits January 12, 2026 22:01

Add missing tests for mixed MCP/Function approval scenarios

23d5d20

Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Fix build errors: remove unused usings, cast IReadOnlyDictionary to I…

29454f9

…Dictionary, use Result instead of Output Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Copilot AI requested a review from jozkee January 12, 2026 22:19

Copilot finished work on behalf of jozkee January 12, 2026 22:19

jozkee reviewed Jan 14, 2026

View reviewed changes

Copilot started work on behalf of jozkee January 14, 2026 18:03 View session

Address review feedback: revert docs, remove arguments param, use IDi…

dd30286

…ctionaryStringObject Co-authored-by: jozkee <16040868+jozkee@users.noreply.github.com>

Copilot AI requested a review from jozkee January 14, 2026 18:08

Copilot finished work on behalf of jozkee January 14, 2026 18:08

Update baseline

d3a7a8f

Undo unneeded changes Updated OpenAIResponsesChatClient Updated tests

	Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject) as IDictionary<string, object?>,
	Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments, OpenAIJsonContext.Default.IDictionaryStringObject),

Unseal FunctionCallContent/FunctionResultContent; make MCP types extend them #7201

Are you sure you want to change the base?

Unseal FunctionCallContent/FunctionResultContent; make MCP types extend them #7201

Conversation

Copilot AI commented Jan 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Address Review Feedback - All Comments Resolved ✅

Documentation Changes

Constructor Changes

JSON Serialization Changes

FunctionInvokingChatClient Changes

Microsoft Reviewers: Open in CodeFlow

Uh oh!

jozkee left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI commented Jan 12, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Copilot AI commented Jan 12, 2026 •

edited

Loading