Merge pull request #202 from hchen2020/master

Fix rich content text in InstructExecutor.

Author: Oceania2018

src/Infrastructure/BotSharp.Core/Conversations/Services/ConversationService.SendMessage.cs

@@ -101,6 +101,14 @@ private async Task HandleAssistantMessage(RoleDialogModel response, Func<RoleDia
         _logger.LogInformation(text);
 #endif
 
+        // Process rich content
+        if (response.RichContent != null &&
+            response.RichContent is RichContent<IMessageTemplate> template &&
+            string.IsNullOrEmpty(template.Message.Text))
+        {
+            template.Message.Text = response.Content;
+        }
+
         // Only read content from RichContent for UI rendering. When richContent is null, create a basic text message for richContent.
         var state = _services.GetRequiredService<IConversationStateService>();
         response.RichContent = response.RichContent ?? new RichContent<IMessageTemplate>

src/Infrastructure/BotSharp.Core/Planning/InstructExecutor.cs

@@ -1,6 +1,4 @@
 using BotSharp.Abstraction.Functions.Models;
-using BotSharp.Abstraction.Messaging.Models;
-using BotSharp.Abstraction.Messaging.Models.RichContent;
 using BotSharp.Abstraction.Planning;
 using BotSharp.Abstraction.Routing;
 
@@ -35,14 +33,6 @@ public async Task<RoleDialogModel> Execute(IRoutingService routing,
         response.MessageId = message.MessageId;
         response.Instruction = inst;
 
-        // Process rich content
-        if (response.RichContent != null &&
-            response.RichContent is RichContent<IMessageTemplate> template &&
-            string.IsNullOrEmpty(template.Message.Text))
-        {
-            template.Message.Text = response.Content;
-        }
-
         return response;
     }
 }