Only ServerName should be optional

Author: jozkee

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

@@ -22,11 +22,13 @@ public sealed class McpServerToolCallContent : AIContent
     /// Initializes a new instance of the <see cref="McpServerToolCallContent"/> class.
     /// </summary>
     /// <param name="callId">The tool call ID.</param>
-    /// <exception cref="ArgumentNullException"><paramref name="callId"/> is <see langword="null"/>.</exception>
-    /// <exception cref="ArgumentException"><paramref name="callId"/> is empty or composed entirely of whitespace.</exception>
-    public McpServerToolCallContent(string callId)
+    /// <param name="toolName">The tool name.</param>
+    /// <exception cref="ArgumentNullException"><paramref name="callId"/> or <paramref name="toolName"/> is <see langword="null"/>.</exception>
+    /// <exception cref="ArgumentException"><paramref name="callId"/> or <paramref name="toolName"/> is empty or composed entirely of whitespace.</exception>
+    public McpServerToolCallContent(string callId, string toolName)
     {
         CallId = Throw.IfNullOrWhitespace(callId);
+        ToolName = Throw.IfNullOrWhitespace(toolName);
     }
 
     /// <summary>
@@ -35,9 +37,9 @@ public McpServerToolCallContent(string callId)
     public string CallId { get; }
 
     /// <summary>
-    /// Gets or sets the name of the tool called.
+    /// Gets the name of the tool called.
     /// </summary>
-    public string? ToolName { get; set; }
+    public string ToolName { get; }
 
     /// <summary>
     /// Gets or sets the name of the MCP server.

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

@@ -181,9 +181,8 @@ internal static IEnumerable<ChatMessage> ToChatMessages(IEnumerable<ResponseItem
                     break;
 
                 case McpToolCallApprovalRequestItem mtcari:
-                    message.Contents.Add(new McpServerToolApprovalRequestContent(mtcari.Id, new(mtcari.Id)
+                    message.Contents.Add(new McpServerToolApprovalRequestContent(mtcari.Id, new(mtcari.Id, mtcari.ToolName)
                     {
-                        ToolName = mtcari.ToolName,
                         ServerName = mtcari.ServerLabel,
                         Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject)!,
                         RawRepresentation = mtcari,
@@ -309,9 +308,8 @@ ChatResponseUpdate CreateUpdate(AIContent? content = null) =>
                     break;
 
                 case StreamingResponseOutputItemDoneUpdate outputItemDoneUpdate when outputItemDoneUpdate.Item is McpToolCallApprovalRequestItem mtcari:
-                    yield return CreateUpdate(new McpServerToolApprovalRequestContent(mtcari.Id, new(mtcari.Id)
+                    yield return CreateUpdate(new McpServerToolApprovalRequestContent(mtcari.Id, new(mtcari.Id, mtcari.ToolName)
                     {
-                        ToolName = mtcari.ToolName,
                         ServerName = mtcari.ServerLabel,
                         Arguments = JsonSerializer.Deserialize(mtcari.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject)!,
                         RawRepresentation = mtcari,
@@ -879,9 +877,8 @@ private static void PopulateAnnotations(ResponseContentPart source, AIContent de
     /// <summary>Adds new <see cref="AIContent"/> for the specified <paramref name="mtci"/> into <paramref name="contents"/>.</summary>
     private static void AddMcpToolCallContent(McpToolCallItem mtci, IList<AIContent> contents)
     {
-        contents.Add(new McpServerToolCallContent(mtci.Id)
+        contents.Add(new McpServerToolCallContent(mtci.Id, mtci.ToolName)
         {
-            ToolName = mtci.ToolName,
             ServerName = mtci.ServerLabel,
             Arguments = JsonSerializer.Deserialize(mtci.ToolArguments.ToMemory().Span, OpenAIJsonContext.Default.IReadOnlyDictionaryStringObject)!,
 

test/Libraries/Microsoft.Extensions.AI.Abstractions.Tests/Contents/McpServerToolCallContentTests.cs

@@ -12,22 +12,22 @@ public class McpServerToolCallContentTests
     [Fact]
     public void Constructor_PropsDefault()
     {
-        McpServerToolCallContent c = new("callId1");
+        McpServerToolCallContent c = new("callId1", "toolName");
 
         Assert.Null(c.RawRepresentation);
         Assert.Null(c.AdditionalProperties);
 
         Assert.Equal("callId1", c.CallId);
-        Assert.Null(c.ToolName);
-        Assert.Null(c.ServerName);
+        Assert.Equal("toolName", c.ToolName);
 
+        Assert.Null(c.ServerName);
         Assert.Null(c.Arguments);
     }
 
     [Fact]
     public void Constructor_PropsRoundtrip()
     {
-        McpServerToolCallContent c = new("callId1");
+        McpServerToolCallContent c = new("callId1", "toolName");
 
         Assert.Null(c.RawRepresentation);
         object raw = new();
@@ -44,21 +44,21 @@ public void Constructor_PropsRoundtrip()
         c.Arguments = args;
         Assert.Same(args, c.Arguments);
 
-        Assert.Equal("callId1", c.CallId);
+        Assert.Null(c.ServerName);
+        c.ServerName = "testServer";
+        Assert.Equal("testServer", c.ServerName);
 
-        Assert.Null(c.ToolName);
-        c.ToolName = "toolName";
+        Assert.Equal("callId1", c.CallId);
         Assert.Equal("toolName", c.ToolName);
-
-        Assert.Null(c.ServerName);
-        c.ServerName = "serverName";
-        Assert.Equal("serverName", c.ServerName);
     }
 
     [Fact]
     public void Constructor_Throws()
     {
-        Assert.Throws<ArgumentException>("callId", () => new McpServerToolCallContent(string.Empty));
-        Assert.Throws<ArgumentNullException>("callId", () => new McpServerToolCallContent(null!));
+        Assert.Throws<ArgumentException>("callId", () => new McpServerToolCallContent(string.Empty, "name"));
+        Assert.Throws<ArgumentException>("toolName", () => new McpServerToolCallContent("callId1", string.Empty));
+
+        Assert.Throws<ArgumentNullException>("callId", () => new McpServerToolCallContent(null!, "name"));
+        Assert.Throws<ArgumentNullException>("toolName", () => new McpServerToolCallContent("callId1", null!));
     }
 }