From d91a55232bea7352818a28a4e0ddc637c2b31f6d Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Fri, 16 May 2025 10:49:09 -0500
Subject: [PATCH] refine tool call and response

---
 .../Providers/Chat/ChatCompletionProvider.cs                 | 4 ++--
 .../Providers/Chat/GeminiChatCompletionProvider.cs           | 2 ++
 .../Providers/Realtime/RealTimeCompletionProvider.cs         | 2 ++
 .../Providers/Chat/ChatCompletionProvider.cs                 | 5 ++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
index 92b1a6b5..e2d9a161 100644
--- a/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.AzureOpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -305,10 +305,10 @@ public class ChatCompletionProvider : IChatCompletion
             {
                 messages.Add(new AssistantChatMessage(new List<ChatToolCall>
                 {
-                    ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))
+                    ChatToolCall.CreateFunctionToolCall(message.ToolCallId ?? message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? "{}"))
                 }));
 
-                messages.Add(new ToolChatMessage(message.FunctionName, message.Content));
+                messages.Add(new ToolChatMessage(message.ToolCallId ?? message.FunctionName, message.Content));
             }
             else if (message.Role == AgentRole.User)
             {
diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs
index 95dda6c1..60853362 100644
--- a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Chat/GeminiChatCompletionProvider.cs
@@ -271,6 +271,7 @@ public class GeminiChatCompletionProvider : IChatCompletion
                     {
                         FunctionCall = new FunctionCall
                         {
+                            Id = message.ToolCallId,
                             Name = message.FunctionName,
                             Args = JsonNode.Parse(message.FunctionArgs ?? "{}")
                         }
@@ -282,6 +283,7 @@ public class GeminiChatCompletionProvider : IChatCompletion
                     {
                         FunctionResponse = new FunctionResponse
                         {
+                            Id = message.ToolCallId,
                             Name = message.FunctionName,
                             Response = new JsonObject()
                             {
diff --git a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs
index f3fb11d7..5df8ee13 100644
--- a/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.GoogleAI/Providers/Realtime/RealTimeCompletionProvider.cs
@@ -512,6 +512,7 @@ public class GoogleRealTimeProvider : IRealTimeCompletion
                     {
                         FunctionCall = new FunctionCall
                         {
+                            Id = message.ToolCallId,
                             Name = message.FunctionName,
                             Args = JsonNode.Parse(message.FunctionArgs ?? "{}")
                         }
@@ -523,6 +524,7 @@ public class GoogleRealTimeProvider : IRealTimeCompletion
                     {
                         FunctionResponse = new FunctionResponse
                         {
+                            Id = message.ToolCallId,
                             Name = message.FunctionName ?? string.Empty,
                             Response = new JsonObject()
                             {
diff --git a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
index 95d4b909..c0a9c0d4 100644
--- a/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
+++ b/src/Plugins/BotSharp.Plugin.OpenAI/Providers/Chat/ChatCompletionProvider.cs
@@ -1,4 +1,3 @@
-using BotSharp.Abstraction.Agents.Models;
 using BotSharp.Abstraction.Hooks;
 using OpenAI.Chat;
 
@@ -273,10 +272,10 @@ public class ChatCompletionProvider : IChatCompletion
             {
                 messages.Add(new AssistantChatMessage(new List<ChatToolCall>
                 {
-                    ChatToolCall.CreateFunctionToolCall(message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? string.Empty))
+                    ChatToolCall.CreateFunctionToolCall(message.ToolCallId ?? message.FunctionName, message.FunctionName, BinaryData.FromString(message.FunctionArgs ?? "{}"))
                 }));
 
-                messages.Add(new ToolChatMessage(message.FunctionName, message.Content));
+                messages.Add(new ToolChatMessage(message.ToolCallId ?? message.FunctionName, message.Content));
             }
             else if (message.Role == AgentRole.User)
             {