From 864b1f7a91d21a08348039c406a238e890c50bcc Mon Sep 17 00:00:00 2001
From: Chris Rickman <crickman@microsoft.com>
Date: Thu, 6 Nov 2025 18:40:34 -0800
Subject: [PATCH] Fix bad merge

---
 .../Microsoft.Agents.AI.Workflows/WorkflowsJsonUtilities.cs  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows/WorkflowsJsonUtilities.cs b/dotnet/src/Microsoft.Agents.AI.Workflows/WorkflowsJsonUtilities.cs
index 752bb4bac7..d8241f4681 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows/WorkflowsJsonUtilities.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows/WorkflowsJsonUtilities.cs
@@ -50,8 +50,11 @@ internal static partial class WorkflowsJsonUtilities
         // Copy the configuration from the source generated context.
         JsonSerializerOptions options = new(JsonContext.Default.Options);
 
-        // Chain with all supported types from Microsoft.Extensions.AI.Abstractions and Microsoft.Agents.AI.Abstractions.
+        // Chain in the resolvers from both AgentAbstractionsJsonUtilities and our source generated context.
+        // We want AgentAbstractionsJsonUtilities first to ensure any M.E.AI types are handled via its resolver.
+        options.TypeInfoResolverChain.Clear();
         options.TypeInfoResolverChain.Add(AgentAbstractionsJsonUtilities.DefaultOptions.TypeInfoResolver!);
+        options.TypeInfoResolverChain.Add(JsonContext.Default.Options.TypeInfoResolver!);
 
         options.MakeReadOnly();
         return options;