From d9cfe4f78fa5b70f58cad1f8d76896bd962cb5a0 Mon Sep 17 00:00:00 2001
From: Jacob Alber <jaalber@microsoft.com>
Date: Mon, 23 Mar 2026 15:16:12 -0400
Subject: [PATCH] test: Add streaming tests for AsAgent to smoke tests

---
 .../WorkflowHostSmokeTests.cs                 | 88 ++++++++++++-------
 1 file changed, 54 insertions(+), 34 deletions(-)

diff --git a/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/WorkflowHostSmokeTests.cs b/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/WorkflowHostSmokeTests.cs
index 8cd063565b..7bf00c4fb9 100644
--- a/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/WorkflowHostSmokeTests.cs
+++ b/dotnet/tests/Microsoft.Agents.AI.Workflows.UnitTests/WorkflowHostSmokeTests.cs
@@ -732,49 +732,69 @@ public class WorkflowHostSmokeTests : AIAgentHostingExecutorTestsBase
             .BeEmpty();
     }
 
-    [Fact]
-    public async Task Test_SingleAgent_AsAgent_OutgoingMessagesInHistoryAsync()
+    private async Task Run_AsAgent_OutgoingMessagesInHistoryAsync(Workflow workflow, bool runAsync)
+    {
+        // Arrange
+        AIAgent workflowAgent = workflow.AsAIAgent();
+
+        // Act
+        AgentSession session = await workflowAgent.CreateSessionAsync();
+        AgentResponse response;
+        if (runAsync)
+        {
+            List<AgentResponseUpdate> updates = [];
+            await foreach (AgentResponseUpdate update in workflowAgent.RunStreamingAsync(session))
+            {
+                // Skip WorkflowEvent updates, which do not get persisted in ChatHistory; we cannot skip
+                // them after because of a deleterious interaction with .ToAgentResponse() due to the
+                // empty initial message (which is created without a MessageId). When running through the
+                // message merger, it does the right thing internally.
+                if (!string.IsNullOrEmpty(update.Text))
+                {
+                    updates.Add(update);
+                }
+            }
+
+            response = updates.ToAgentResponse();
+        }
+        else
+        {
+            response = await workflowAgent.RunAsync(session);
+        }
+
+        // Assert
+        WorkflowSession workflowSession = session.Should().BeOfType<WorkflowSession>().Subject;
+
+        ChatMessage[] responseMessages = response.Messages.Where(message => message.Contents.Any())
+                                                          .ToArray();
+
+        ChatMessage[] sessionMessages = workflowSession.ChatHistoryProvider.GetAllMessages(workflowSession)
+                                                                           .ToArray();
+
+        // Since we never sent an incoming message, the expectation is that there should be nothing in the session
+        // except the response
+        responseMessages.Should().BeEquivalentTo(sessionMessages, options => options.WithStrictOrdering());
+    }
+
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public Task Test_SingleAgent_AsAgent_OutgoingMessagesInHistoryAsync(bool runAsync)
     {
         // Arrange
         TestReplayAgent agent = new(TestMessages, TestAgentId, TestAgentName);
         Workflow singleAgentWorkflow = new WorkflowBuilder(agent).Build();
-        AIAgent workflowAgent = singleAgentWorkflow.AsAIAgent();
-
-        // Act
-        AgentSession session = await workflowAgent.CreateSessionAsync();
-        AgentResponse response = await workflowAgent.RunAsync(session);
-
-        // Assert
-        WorkflowSession workflowSession = session.Should().BeOfType<WorkflowSession>().Subject;
-
-        ChatMessage[] responseMessages = response.Messages.ToArray();
-        ChatMessage[] sessionMessages = workflowSession.ChatHistoryProvider.GetAllMessages(workflowSession).ToArray();
-
-        // Since we never sent an incoming message, the expectation is that there should be nothing in the session
-        // except the response
-        responseMessages.Should().BeEquivalentTo(sessionMessages, options => options.WithStrictOrdering());
+        return this.Run_AsAgent_OutgoingMessagesInHistoryAsync(singleAgentWorkflow, runAsync);
     }
 
-    [Fact]
-    public async Task Test_Handoffs_AsAgent_OutgoingMessagesInHistoryAsync()
+    [Theory]
+    [InlineData(false)]
+    [InlineData(true)]
+    public Task Test_Handoffs_AsAgent_OutgoingMessagesInHistoryAsync(bool runAsync)
     {
         // Arrange
         TestReplayAgent agent = new(TestMessages, TestAgentId, TestAgentName);
         Workflow handoffWorkflow = new HandoffsWorkflowBuilder(agent).Build();
-        AIAgent workflowAgent = handoffWorkflow.AsAIAgent();
-
-        // Act
-        AgentSession session = await workflowAgent.CreateSessionAsync();
-        AgentResponse response = await workflowAgent.RunAsync(session);
-
-        // Assert
-        WorkflowSession workflowSession = session.Should().BeOfType<WorkflowSession>().Subject;
-
-        ChatMessage[] responseMessages = response.Messages.ToArray();
-        ChatMessage[] sessionMessages = workflowSession.ChatHistoryProvider.GetAllMessages(workflowSession).ToArray();
-
-        // Since we never sent an incoming message, the expectation is that there should be nothing in the session
-        // except the response
-        responseMessages.Should().BeEquivalentTo(sessionMessages, options => options.WithStrictOrdering());
+        return this.Run_AsAgent_OutgoingMessagesInHistoryAsync(handoffWorkflow, runAsync);
     }
 }