Merge branch 'main' into disable-stj-reflection

Author: stephentoub

src/ModelContextProtocol/Client/McpClientExtensions.cs

@@ -926,7 +926,7 @@ internal static CreateMessageResult ToCreateMessageResult(this ChatResponse chat
         {
             Content = content,
             Model = chatResponse.ModelId ?? "unknown",
-            Role = lastMessage?.Role == ChatRole.User ? "user" : "assistant",
+            Role = lastMessage?.Role == ChatRole.User ? Role.User : Role.Assistant,
             StopReason = chatResponse.FinishReason == ChatFinishReason.Length ? "maxTokens" : "endTurn",
         };
     }

src/ModelContextProtocol/Protocol/Types/CreateMessageResult.cs

@@ -50,5 +50,5 @@ public class CreateMessageResult
     /// Gets or sets the role of the user who generated the message.
     /// </summary>
     [JsonPropertyName("role")]
-    public required string Role { get; init; }
+    public required Role Role { get; init; }
 }

src/ModelContextProtocol/Server/McpServerExtensions.cs

@@ -142,7 +142,7 @@ public static async Task<ChatResponse> RequestSamplingAsync(
                 ModelPreferences = modelPreferences,
             }, cancellationToken).ConfigureAwait(false);
 
-        return new(new ChatMessage(new(result.Role), [result.Content.ToAIContent()]))
+        return new(new ChatMessage(result.Role is Role.User ? ChatRole.User : ChatRole.Assistant, [result.Content.ToAIContent()]))
         {
             ModelId = result.Model,
             FinishReason = result.StopReason switch

tests/ModelContextProtocol.AspNetCore.Tests/SseServerIntegrationTests.cs

@@ -219,7 +219,7 @@ public async Task Sampling_Sse_TestServer()
             return new CreateMessageResult
             {
                 Model = "test-model",
-                Role = "assistant",
+                Role = Role.Assistant,
                 Content = new Content
                 {
                     Type = "text",

tests/ModelContextProtocol.AspNetCore.Tests/Utils/TestServerTransport.cs

@@ -72,7 +72,7 @@ private async Task Sampling(JsonRpcRequest request, CancellationToken cancellati
         await WriteMessageAsync(new JsonRpcResponse
         {
             Id = request.Id,
-            Result = JsonSerializer.SerializeToNode(new CreateMessageResult { Content = new(), Model = "model", Role = "role" }),
+            Result = JsonSerializer.SerializeToNode(new CreateMessageResult { Content = new(), Model = "model", Role = Role.Assistant }),
         }, cancellationToken);
     }
 

tests/ModelContextProtocol.Tests/Client/McpClientExtensionsTests.cs

@@ -85,7 +85,7 @@ public async Task CreateSamplingHandler_ShouldHandleTextMessages(float? temperat
         Assert.NotNull(result);
         Assert.Equal("Hello, World!", result.Content.Text);
         Assert.Equal("test-model", result.Model);
-        Assert.Equal("assistant", result.Role);
+        Assert.Equal(Role.Assistant, result.Role);
         Assert.Equal("endTurn", result.StopReason);
     }
 
@@ -140,7 +140,7 @@ public async Task CreateSamplingHandler_ShouldHandleImageMessages()
         Assert.NotNull(result);
         Assert.Equal(expectedData, result.Content.Data);
         Assert.Equal("test-model", result.Model);
-        Assert.Equal("assistant", result.Role);
+        Assert.Equal(Role.Assistant, result.Role);
         Assert.Equal("endTurn", result.StopReason);
     }
 
@@ -202,7 +202,7 @@ public async Task CreateSamplingHandler_ShouldHandleResourceMessages()
         // Assert
         Assert.NotNull(result);
         Assert.Equal("test-model", result.Model);
-        Assert.Equal(ChatRole.Assistant.ToString(), result.Role);
+        Assert.Equal(Role.Assistant, result.Role);
         Assert.Equal("endTurn", result.StopReason);
     }
 

tests/ModelContextProtocol.Tests/Client/McpClientFactoryTests.cs

@@ -45,7 +45,7 @@ public async Task CreateAsync_WithCapabilitiesOptions(Type transportType)
                         new CreateMessageResult { 
                             Content = new Content { Text = "result" }, 
                             Model = "test-model", 
-                            Role = "test-role", 
+                            Role = Role.User, 
                             StopReason = "endTurn" 
                     }),
                 },

tests/ModelContextProtocol.Tests/ClientIntegrationTests.cs

@@ -376,7 +376,7 @@ public async Task Sampling_Stdio(string clientId)
                         return Task.FromResult(new CreateMessageResult
                         {
                             Model = "test-model",
-                            Role = "assistant",
+                            Role = Role.Assistant,
                             Content = new Content
                             {
                                 Type = "text",

tests/ModelContextProtocol.Tests/DockerEverythingServerTests.cs

@@ -83,7 +83,7 @@ public async Task Sampling_Sse_EverythingServer()
                         return Task.FromResult(new CreateMessageResult
                         {
                             Model = "test-model",
-                            Role = "assistant",
+                            Role = Role.Assistant,
                             Content = new Content
                             {
                                 Type = "text",

tests/ModelContextProtocol.Tests/Server/McpServerTests.cs

@@ -602,7 +602,7 @@ public Task<JsonRpcResponse> SendRequestAsync(JsonRpcRequest request, Cancellati
             {
                 Content = new() { Text = "The Eiffel Tower.", Type = "text" },
                 Model = "amazingmodel",
-                Role = "assistant",
+                Role = Role.Assistant,
                 StopReason = "endTurn",
             };