fix: Address PR Comments

* Implicit filter in collection loops
* Remove debug / usused code
* Fix ProtocolBuilder implicit output registrations
* Fix logic error in ExecuteRouteGeneratorTests.ClassWithManualConfigureProtocol_DoesNotGenerate

Author: lokitoth

dotnet/src/Microsoft.Agents.AI.Workflows.Generators/Generation/SourceBuilder.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 using Microsoft.Agents.AI.Workflows.Generators.Models;
 
@@ -55,6 +56,7 @@ public static string Generate(ExecutorInfo info)
             {
                 sb.AppendLine($"{indent}partial class {containingType}");
                 sb.AppendLine($"{indent}{{");
+
                 indent += IndentUnit;
             }
         }
@@ -198,24 +200,18 @@ private static void GenerateConfigureSentTypes(StringBuilder sb, ExecutorInfo in
         // but cleaner generated code is easier to read).
         var addedTypes = new HashSet<string>();
 
-        foreach (var type in info.ClassSendTypes)
+        foreach (var type in info.ClassSendTypes.Where(type => addedTypes.Add(type)))
         {
-            if (addedTypes.Add(type))
-            {
-                sb.AppendLine($".SendsMessage<{type}>()");
-                sb.Append(indent);
-            }
+            sb.AppendLine($".SendsMessage<{type}>()");
+            sb.Append(indent);
         }
 
         foreach (var handler in info.Handlers)
         {
-            foreach (var type in handler.SendTypes)
+            foreach (var type in handler.SendTypes.Where(type => addedTypes.Add(type)))
             {
-                if (addedTypes.Add(type))
-                {
-                    sb.AppendLine($".SendsMessage<{type}>()");
-                    sb.Append(indent);
-                }
+                sb.AppendLine($".SendsMessage<{type}>()");
+                sb.Append(indent);
             }
         }
     }
@@ -233,24 +229,18 @@ private static void GenerateConfigureYieldTypes(StringBuilder sb, ExecutorInfo i
         // but cleaner generated code is easier to read).
         var addedTypes = new HashSet<string>();
 
-        foreach (var type in info.ClassYieldTypes)
+        foreach (var type in info.ClassYieldTypes.Where(type => addedTypes.Add(type)))
         {
-            if (addedTypes.Add(type))
-            {
-                sb.AppendLine($".YieldsOutput<{type}>()");
-                sb.Append(indent);
-            }
+            sb.AppendLine($".YieldsOutput<{type}>()");
+            sb.Append(indent);
         }
 
         foreach (var handler in info.Handlers)
         {
-            foreach (var type in handler.YieldTypes)
+            foreach (var type in handler.YieldTypes.Where(type => addedTypes.Add(type)))
             {
-                if (addedTypes.Add(type))
-                {
-                    sb.AppendLine($".YieldsOutput<{type}>()");
-                    sb.Append(indent);
-                }
+                sb.AppendLine($".YieldsOutput<{type}>()");
+                sb.Append(indent);
             }
         }
     }

dotnet/src/Microsoft.Agents.AI.Workflows/Execution/MessageRouter.cs

@@ -83,17 +83,14 @@ internal MessageRouter(Dictionary<Type, MessageHandlerF> handlers, HashSet<Type>
             }
             else if (this._interfaceHandlers.Count > 0)
             {
-                foreach (Type interfaceType in this._interfaceHandlers)
+                foreach (Type interfaceType in this._interfaceHandlers.Where(it => it.IsAssignableFrom(candidateType)))
                 {
-                    if (interfaceType.IsAssignableFrom(candidateType))
-                    {
-                        handler = this._typedHandlers[interfaceType];
-                        this._typedHandlers[messageType] = handler;
-
-                        // TODO: This could cause some consternation with Checkpointing (need to ensure we surface errors well)
-                        this._runtimeTypeMap[new TypeId(messageType)] = interfaceType;
-                        return handler;
-                    }
+                    handler = this._typedHandlers[interfaceType];
+                    this._typedHandlers[messageType] = handler;
+
+                    // TODO: This could cause some consternation with Checkpointing (need to ensure we surface errors well)
+                    this._runtimeTypeMap[new TypeId(messageType)] = interfaceType;
+                    return handler;
                 }
             }
         }

dotnet/src/Microsoft.Agents.AI.Workflows/Executor.cs

@@ -96,7 +96,7 @@ public MessageTypeTranslator(ISet<Type> types)
         }
     }
 
-    public TypeId? GetDeclaredType(Type messageType, bool allowPolymorphism = true)
+    public TypeId? GetDeclaredType(Type messageType)
     {
         // If the user declares a base type, the user is expected to set up any serialization to be able to deal with
         // the polymorphism transparently to the framework, or be expecting to deal with the appropriate truncation.
@@ -112,10 +112,6 @@ public MessageTypeTranslator(ISet<Type> types)
 
                 return declaredTypeId;
             }
-            if (!allowPolymorphism)
-            {
-                break;
-            }
         }
 
         return null;

dotnet/src/Microsoft.Agents.AI.Workflows/InProc/InProcessRunner.cs

@@ -236,11 +236,6 @@ await executor.ExecuteAsync(
                 }
             }
 
-            if (envelope.MessageType != messageType)
-            {
-                Console.Error.WriteLine($"Translated type of delivery: {envelope.MessageType} to {messageType}");
-            }
-
             return (value, messageType);
         }
     }

dotnet/src/Microsoft.Agents.AI.Workflows/InProc/InProcessRunnerContext.cs

@@ -215,7 +215,7 @@ public async ValueTask SendMessageAsync(string sourceId, object message, string?
 
         Debug.Assert(this._executors.ContainsKey(sourceId));
         Executor source = await this.EnsureExecutorAsync(sourceId, tracer: null, cancellationToken).ConfigureAwait(false);
-        TypeId? declaredType = source.Protocol.SendTypeTranslator.GetDeclaredType(message.GetType(), allowPolymorphism: true);
+        TypeId? declaredType = source.Protocol.SendTypeTranslator.GetDeclaredType(message.GetType());
         if (declaredType is null)
         {
             throw new InvalidOperationException($"Executor '{sourceId}' cannot send messages of type '{message.GetType().FullName}'.");

dotnet/src/Microsoft.Agents.AI.Workflows/ProtocolBuilder.cs

@@ -136,7 +136,7 @@ internal ExecutorProtocol Build(ExecutorOptions options)
         }
 
         HashSet<Type> yieldTypes = new(this._yieldTypes);
-        if (options.AutoSendMessageHandlerResultObject)
+        if (options.AutoYieldOutputHandlerResultObject)
         {
             yieldTypes.UnionWith(router.DefaultOutputTypes);
         }

dotnet/src/Microsoft.Agents.AI.Workflows/Specialized/HandoffAgentExecutor.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -75,25 +76,23 @@ public override async ValueTask<HandoffState> HandleAsync(HandoffState message,
         {
             await AddUpdateAsync(update, cancellationToken).ConfigureAwait(false);
 
-            foreach (var c in update.Contents)
+            foreach (var fcc in update.Contents.OfType<FunctionCallContent>()
+                                               .Where(fcc => this._handoffFunctionNames.Contains(fcc.Name)))
             {
-                if (c is FunctionCallContent fcc && this._handoffFunctionNames.Contains(fcc.Name))
-                {
-                    requestedHandoff = fcc.Name;
-                    await AddUpdateAsync(
-                            new AgentResponseUpdate
-                            {
-                                AgentId = this._agent.Id,
-                                AuthorName = this._agent.Name ?? this._agent.Id,
-                                Contents = [new FunctionResultContent(fcc.CallId, "Transferred.")],
-                                CreatedAt = DateTimeOffset.UtcNow,
-                                MessageId = Guid.NewGuid().ToString("N"),
-                                Role = ChatRole.Tool,
-                            },
-                            cancellationToken
-                         )
-                        .ConfigureAwait(false);
-                }
+                requestedHandoff = fcc.Name;
+                await AddUpdateAsync(
+                        new AgentResponseUpdate
+                        {
+                            AgentId = this._agent.Id,
+                            AuthorName = this._agent.Name ?? this._agent.Id,
+                            Contents = [new FunctionResultContent(fcc.CallId, "Transferred.")],
+                            CreatedAt = DateTimeOffset.UtcNow,
+                            MessageId = Guid.NewGuid().ToString("N"),
+                            Role = ChatRole.Tool,
+                        },
+                        cancellationToken
+                     )
+                    .ConfigureAwait(false);
             }
         }
 

dotnet/tests/Microsoft.Agents.AI.Workflows.Generators.UnitTests/ExecutorRouteGeneratorTests.cs

@@ -848,9 +848,9 @@ public partial class TestExecutor : Executor
             {
                 public TestExecutor() : base("test") { }
 
-                protected override RouteBuilder ConfigureProtocol(ProtocolBuilder protocolBuilder)
+                protected override ProtocolBuilder ConfigureProtocol(ProtocolBuilder protocolBuilder)
                 {
-                    return routeBuilder;
+                    return protocolBuilder;
                 }
 
                 [MessageHandler]