From 98c55357ef4fa9f87d2b06a1560b856fe40ec84c Mon Sep 17 00:00:00 2001
From: Kunal Karmakar <kkdthunlshd@gmail.com>
Date: Fri, 27 Mar 2026 16:53:56 +0000
Subject: [PATCH] revert behaviour

---
 .../responses_common.go                       | 17 ++++++++-------
 .../responses_common_test.go                  | 21 +++++++++++++------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pkg/providers/openai_responses_common/responses_common.go b/pkg/providers/openai_responses_common/responses_common.go
index e5eea5ccb..2800ff6ef 100644
--- a/pkg/providers/openai_responses_common/responses_common.go
+++ b/pkg/providers/openai_responses_common/responses_common.go
@@ -61,8 +61,8 @@ func TranslateMessages(messages []protocoltypes.Message) (input responses.Respon
 					})
 				}
 				for _, tc := range msg.ToolCalls {
-					name, args := ResolveToolCall(tc)
-					if name == "" {
+					name, args, ok := ResolveToolCall(tc)
+					if !ok {
 						continue
 					}
 					input = append(input, responses.ResponseInputItemUnionParam{
@@ -152,28 +152,29 @@ func ParseDataAudioURL(mediaURL string) (format, data string, ok bool) {
 }
 
 // ResolveToolCall extracts the function name and JSON arguments string from a ToolCall.
-func ResolveToolCall(tc protocoltypes.ToolCall) (name string, arguments string) {
+// Returns ok=false if the tool call has no name or if arguments fail to marshal.
+func ResolveToolCall(tc protocoltypes.ToolCall) (name string, arguments string, ok bool) {
 	name = tc.Name
 	if name == "" && tc.Function != nil {
 		name = tc.Function.Name
 	}
 	if name == "" {
-		return "", ""
+		return "", "", false
 	}
 
 	if len(tc.Arguments) > 0 {
 		argsJSON, err := json.Marshal(tc.Arguments)
 		if err != nil {
-			return name, "{}"
+			return "", "", false
 		}
-		return name, string(argsJSON)
+		return name, string(argsJSON), true
 	}
 
 	if tc.Function != nil && tc.Function.Arguments != "" {
-		return name, tc.Function.Arguments
+		return name, tc.Function.Arguments, true
 	}
 
-	return name, "{}"
+	return name, "{}", true
 }
 
 // TranslateTools converts internal ToolDefinition entries to the OpenAI Responses API
diff --git a/pkg/providers/openai_responses_common/responses_common_test.go b/pkg/providers/openai_responses_common/responses_common_test.go
index bddb3c3e7..98ca3e2f6 100644
--- a/pkg/providers/openai_responses_common/responses_common_test.go
+++ b/pkg/providers/openai_responses_common/responses_common_test.go
@@ -148,7 +148,10 @@ func TestResolveToolCall_FromNameAndArguments(t *testing.T) {
 		Name:      "get_weather",
 		Arguments: map[string]any{"city": "SF"},
 	}
-	name, args := ResolveToolCall(tc)
+	name, args, ok := ResolveToolCall(tc)
+	if !ok {
+		t.Fatal("expected ok=true")
+	}
 	if name != "get_weather" {
 		t.Errorf("name = %q, want %q", name, "get_weather")
 	}
@@ -165,7 +168,10 @@ func TestResolveToolCall_FromFunctionField(t *testing.T) {
 			Arguments: `{"path":"README.md"}`,
 		},
 	}
-	name, args := ResolveToolCall(tc)
+	name, args, ok := ResolveToolCall(tc)
+	if !ok {
+		t.Fatal("expected ok=true")
+	}
 	if name != "read_file" {
 		t.Errorf("name = %q, want %q", name, "read_file")
 	}
@@ -176,15 +182,18 @@ func TestResolveToolCall_FromFunctionField(t *testing.T) {
 
 func TestResolveToolCall_EmptyName(t *testing.T) {
 	tc := protocoltypes.ToolCall{}
-	name, _ := ResolveToolCall(tc)
-	if name != "" {
-		t.Errorf("name = %q, want empty", name)
+	_, _, ok := ResolveToolCall(tc)
+	if ok {
+		t.Error("expected ok=false for empty tool call")
 	}
 }
 
 func TestResolveToolCall_NoArgsFallsBackToEmptyObject(t *testing.T) {
 	tc := protocoltypes.ToolCall{Name: "do_something"}
-	name, args := ResolveToolCall(tc)
+	name, args, ok := ResolveToolCall(tc)
+	if !ok {
+		t.Fatal("expected ok=true")
+	}
 	if name != "do_something" {
 		t.Errorf("name = %q, want %q", name, "do_something")
 	}