Address feedback

Author: javiercn

dotnet/src/Microsoft.Agents.AI.AGUI/Shared/AGUIChatMessageExtensions.cs

@@ -23,80 +23,88 @@ public static IEnumerable<ChatMessage> AsChatMessages(
         {
             var role = MapChatRole(message.Role);
 
-            if (message is AGUIToolMessage toolMessage)
+            switch (message)
             {
-                object? result;
-                if (string.IsNullOrEmpty(toolMessage.Content))
+                case AGUIToolMessage toolMessage:
                 {
-                    result = toolMessage.Content;
-                }
-                else
-                {
-                    // Try to deserialize as JSON, but fall back to string if it fails
-                    try
+                    object? result;
+                    if (string.IsNullOrEmpty(toolMessage.Content))
                     {
-                        result = JsonSerializer.Deserialize(toolMessage.Content, AGUIJsonSerializerContext.Default.JsonElement);
+                        result = toolMessage.Content;
                     }
-                    catch (JsonException)
+                    else
                     {
-                        result = toolMessage.Content;
+                        // Try to deserialize as JSON, but fall back to string if it fails
+                        try
+                        {
+                            result = JsonSerializer.Deserialize(toolMessage.Content, AGUIJsonSerializerContext.Default.JsonElement);
+                        }
+                        catch (JsonException)
+                        {
+                            result = toolMessage.Content;
+                        }
                     }
-                }
 
-                yield return new ChatMessage(
-                    role,
-                    [
-                        new FunctionResultContent(
-                            toolMessage.ToolCallId,
-                            result)
-                    ]);
-            }
-            else if (message is AGUIAssistantMessage assistantMessage && assistantMessage.ToolCalls is { Length: > 0 })
-            {
-                var contents = new List<AIContent>();
-
-                if (!string.IsNullOrEmpty(assistantMessage.Content))
-                {
-                    contents.Add(new TextContent(assistantMessage.Content));
+                    yield return new ChatMessage(
+                        role,
+                        [
+                            new FunctionResultContent(
+                                    toolMessage.ToolCallId,
+                                    result)
+                        ]);
+                    break;
                 }
 
-                // Add tool calls
-                foreach (var toolCall in assistantMessage.ToolCalls)
+                case AGUIAssistantMessage assistantMessage when assistantMessage.ToolCalls is { Length: > 0 }:
                 {
-                    Dictionary<string, object?>? arguments = null;
-                    if (!string.IsNullOrEmpty(toolCall.Function.Arguments))
+                    var contents = new List<AIContent>();
+
+                    if (!string.IsNullOrEmpty(assistantMessage.Content))
                     {
-                        arguments = (Dictionary<string, object?>?)JsonSerializer.Deserialize(
-                            toolCall.Function.Arguments,
-                            jsonSerializerOptions.GetTypeInfo(typeof(Dictionary<string, object?>)));
+                        contents.Add(new TextContent(assistantMessage.Content));
                     }
 
-                    contents.Add(new FunctionCallContent(
-                        toolCall.Id,
-                        toolCall.Function.Name,
-                        arguments));
-                }
+                    // Add tool calls
+                    foreach (var toolCall in assistantMessage.ToolCalls)
+                    {
+                        Dictionary<string, object?>? arguments = null;
+                        if (!string.IsNullOrEmpty(toolCall.Function.Arguments))
+                        {
+                            arguments = (Dictionary<string, object?>?)JsonSerializer.Deserialize(
+                                toolCall.Function.Arguments,
+                                jsonSerializerOptions.GetTypeInfo(typeof(Dictionary<string, object?>)));
+                        }
+
+                        contents.Add(new FunctionCallContent(
+                            toolCall.Id,
+                            toolCall.Function.Name,
+                            arguments));
+                    }
 
-                yield return new ChatMessage(role, contents)
-                {
-                    MessageId = message.Id
-                };
-            }
-            else
-            {
-                string content = message switch
-                {
-                    AGUIDeveloperMessage dev => dev.Content,
-                    AGUISystemMessage sys => sys.Content,
-                    AGUIUserMessage user => user.Content,
-                    AGUIAssistantMessage asst => asst.Content,
-                    _ => string.Empty
-                };
+                    yield return new ChatMessage(role, contents)
+                    {
+                        MessageId = message.Id
+                    };
+                    break;
+                }
 
-                yield return new ChatMessage(role, content)
+                default:
                 {
-                    MessageId = message.Id
-                };
+                    string content = message switch
+                    {
+                        AGUIDeveloperMessage dev => dev.Content,
+                        AGUISystemMessage sys => sys.Content,
+                        AGUIUserMessage user => user.Content,
+                        AGUIAssistantMessage asst => asst.Content,
+                        _ => string.Empty
+                    };
+
+                    yield return new ChatMessage(role, content)
+                    {
+                        MessageId = message.Id
+                    };
+                    break;
+                }
             }
         }
     }