From 1c9efdc3d78666d7a108913f8b4d4cccaccb4a28 Mon Sep 17 00:00:00 2001
From: Peter Ibekwe <peibekwe@microsoft.com>
Date: Mon, 30 Mar 2026 09:57:44 -0700
Subject: [PATCH] Fix bug to remove messages after sending to avoid losing
 messages on send failure.

---
 .../Specialized/RequestInfoExecutor.cs                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet/src/Microsoft.Agents.AI.Workflows/Specialized/RequestInfoExecutor.cs b/dotnet/src/Microsoft.Agents.AI.Workflows/Specialized/RequestInfoExecutor.cs
index bf3417a155..52dae66b88 100644
--- a/dotnet/src/Microsoft.Agents.AI.Workflows/Specialized/RequestInfoExecutor.cs
+++ b/dotnet/src/Microsoft.Agents.AI.Workflows/Specialized/RequestInfoExecutor.cs
@@ -132,8 +132,8 @@ internal sealed class RequestInfoExecutor : Executor
 
         if (this._allowWrapped && this._wrappedRequests.TryGetValue(message.RequestId, out ExternalRequest? originalRequest))
         {
-            this._wrappedRequests.Remove(message.RequestId);
             await context.SendMessageAsync(originalRequest.RewrapResponse(message), cancellationToken: cancellationToken).ConfigureAwait(false);
+            this._wrappedRequests.Remove(message.RequestId);
         }
         else
         {