From 27ee141c1edef7682fb19e3cf14b9433a592998e Mon Sep 17 00:00:00 2001
From: gaoren002 <gaoren002@users.noreply.github.com>
Date: Fri, 24 Apr 2026 13:24:21 +0000
Subject: [PATCH] fix(openai): preserve mcp tool call ids

---
 .../service/openai_codex_transform.go         |  1 +
 .../service/openai_codex_transform_test.go    | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/backend/internal/service/openai_codex_transform.go b/backend/internal/service/openai_codex_transform.go
index 4903c420..e765d7e9 100644
--- a/backend/internal/service/openai_codex_transform.go
+++ b/backend/internal/service/openai_codex_transform.go
@@ -951,6 +951,7 @@ func isCodexToolCallItemType(typ string) bool {
 		"local_shell_call",
 		"tool_search_call",
 		"custom_tool_call",
+		"mcp_tool_call",
 		"function_call_output",
 		"mcp_tool_call_output",
 		"custom_tool_call_output",
diff --git a/backend/internal/service/openai_codex_transform_test.go b/backend/internal/service/openai_codex_transform_test.go
index ca9b4cea..75f5c55c 100644
--- a/backend/internal/service/openai_codex_transform_test.go
+++ b/backend/internal/service/openai_codex_transform_test.go
@@ -289,6 +289,38 @@ func TestApplyCodexOAuthTransform_PreservesFunctionCallInputName(t *testing.T) {
 	require.Equal(t, "fc1", item["call_id"])
 }
 
+func TestApplyCodexOAuthTransform_PreservesMCPToolCallIDAndName(t *testing.T) {
+	reqBody := map[string]any{
+		"model": "gpt-5.4",
+		"input": []any{
+			map[string]any{
+				"type":      "mcp_tool_call",
+				"call_id":   "call_abc",
+				"name":      "remote_tool",
+				"arguments": "{}",
+			},
+		},
+	}
+
+	applyCodexOAuthTransform(reqBody, true, false)
+
+	input, ok := reqBody["input"].([]any)
+	require.True(t, ok)
+	require.Len(t, input, 1)
+	item, ok := input[0].(map[string]any)
+	require.True(t, ok)
+	require.Equal(t, "mcp_tool_call", item["type"])
+	require.Equal(t, "remote_tool", item["name"])
+	require.Equal(t, "fcabc", item["call_id"])
+}
+
+func TestCodexInputItemRequiresNameTypesAllowCallID(t *testing.T) {
+	for _, typ := range []string{"function_call", "custom_tool_call", "mcp_tool_call"} {
+		require.True(t, codexInputItemRequiresName(typ), typ)
+		require.True(t, isCodexToolCallItemType(typ), typ)
+	}
+}
+
 func TestApplyCodexOAuthTransform_ExplicitStoreFalsePreserved(t *testing.T) {
 	// 续链场景：显式 store=false 不再强制为 true，保持 false。