fix(translator): apply upstream router-for-me#1077 fix - separate functionDeclarations and googleSearch tools

cyk · cyk · commit dae9fcf31b33 · 2026-01-24T13:18:11.000+08:00
diff --git a/go.mod b/go.mod
@@ -71,15 +71,9 @@ require (
 	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
-<<<<<<< HEAD
 	golang.org/x/arch v0.16.0 // indirect
 	golang.org/x/sys v0.38.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
-=======
-	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/text v0.31.0 // indirect
-	google.golang.org/protobuf v1.34.1 // indirect
->>>>>>> origin/main
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
diff --git a/internal/translator/antigravity/openai/chat-completions/antigravity_openai_request.go b/internal/translator/antigravity/openai/chat-completions/antigravity_openai_request.go
@@ -324,12 +324,12 @@ func ConvertOpenAIRequestToAntigravity(modelName string, inputRawJSON []byte, _
 		out, _ = sjson.SetRawBytes(out, "request.contents", buf.Bytes())
 	}
 
-	// tools -> request.tools[0].functionDeclarations + request.tools[0].googleSearch passthrough
+	// tools -> request.tools[].functionDeclarations + request.tools[].googleSearch passthrough
 	tools := parsed.Get("tools")
 	if tools.IsArray() && len(tools.Array()) > 0 {
-		toolNode := []byte(`{}`)
-		hasTool := false
+		functionToolNode := []byte(`{}`)
 		hasFunction := false
+		googleSearchNodes := make([][]byte, 0)
 		for _, t := range tools.Array() {
 			if t.Get("type").String() == "function" {
 				fn := t.Get("function")
@@ -368,31 +368,37 @@ func ConvertOpenAIRequestToAntigravity(modelName string, inputRawJSON []byte, _
 					}
 					fnRaw, _ = sjson.Delete(fnRaw, "strict")
 					if !hasFunction {
-						toolNode, _ = sjson.SetRawBytes(toolNode, "functionDeclarations", []byte("[]"))
+						functionToolNode, _ = sjson.SetRawBytes(functionToolNode, "functionDeclarations", []byte("[]"))
 					}
-					tmp, errSet := sjson.SetRawBytes(toolNode, "functionDeclarations.-1", []byte(fnRaw))
+					tmp, errSet := sjson.SetRawBytes(functionToolNode, "functionDeclarations.-1", []byte(fnRaw))
 					if errSet != nil {
 						log.Warnf("Failed to append tool declaration for '%s': %v", fn.Get("name").String(), errSet)
 						continue
 					}
-					toolNode = tmp
+					functionToolNode = tmp
 					hasFunction = true
-					hasTool = true
 				}
 			}
 			if gs := t.Get("google_search"); gs.Exists() {
+				googleToolNode := []byte(`{}`)
 				var errSet error
-				toolNode, errSet = sjson.SetRawBytes(toolNode, "googleSearch", []byte(gs.Raw))
+				googleToolNode, errSet = sjson.SetRawBytes(googleToolNode, "googleSearch", []byte(gs.Raw))
 				if errSet != nil {
 					log.Warnf("Failed to set googleSearch tool: %v", errSet)
 					continue
 				}
-				hasTool = true
+				googleSearchNodes = append(googleSearchNodes, googleToolNode)
 			}
 		}
-		if hasTool {
-			out, _ = sjson.SetRawBytes(out, "request.tools", []byte("[]"))
-			out, _ = sjson.SetRawBytes(out, "request.tools.0", toolNode)
+		if hasFunction || len(googleSearchNodes) > 0 {
+			toolsNode := []byte("[]")
+			if hasFunction {
+				toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", functionToolNode)
+			}
+			for _, googleNode := range googleSearchNodes {
+				toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", googleNode)
+			}
+			out, _ = sjson.SetRawBytes(out, "request.tools", toolsNode)
 		}
 	}
 
diff --git a/internal/translator/gemini-cli/openai/chat-completions/gemini-cli_openai_request.go b/internal/translator/gemini-cli/openai/chat-completions/gemini-cli_openai_request.go
@@ -283,12 +283,12 @@ func ConvertOpenAIRequestToGeminiCLI(modelName string, inputRawJSON []byte, _ bo
 		}
 	}
 
-	// tools -> request.tools[0].functionDeclarations + request.tools[0].googleSearch passthrough
+	// tools -> request.tools[].functionDeclarations + request.tools[].googleSearch passthrough
 	tools := gjson.GetBytes(rawJSON, "tools")
 	if tools.IsArray() && len(tools.Array()) > 0 {
-		toolNode := []byte(`{}`)
-		hasTool := false
+		functionToolNode := []byte(`{}`)
 		hasFunction := false
+		googleSearchNodes := make([][]byte, 0)
 		for _, t := range tools.Array() {
 			if t.Get("type").String() == "function" {
 				fn := t.Get("function")
@@ -327,31 +327,37 @@ func ConvertOpenAIRequestToGeminiCLI(modelName string, inputRawJSON []byte, _ bo
 					}
 					fnRaw, _ = sjson.Delete(fnRaw, "strict")
 					if !hasFunction {
-						toolNode, _ = sjson.SetRawBytes(toolNode, "functionDeclarations", []byte("[]"))
+						functionToolNode, _ = sjson.SetRawBytes(functionToolNode, "functionDeclarations", []byte("[]"))
 					}
-					tmp, errSet := sjson.SetRawBytes(toolNode, "functionDeclarations.-1", []byte(fnRaw))
+					tmp, errSet := sjson.SetRawBytes(functionToolNode, "functionDeclarations.-1", []byte(fnRaw))
 					if errSet != nil {
 						log.Warnf("Failed to append tool declaration for '%s': %v", fn.Get("name").String(), errSet)
 						continue
 					}
-					toolNode = tmp
+					functionToolNode = tmp
 					hasFunction = true
-					hasTool = true
 				}
 			}
 			if gs := t.Get("google_search"); gs.Exists() {
+				googleToolNode := []byte(`{}`)
 				var errSet error
-				toolNode, errSet = sjson.SetRawBytes(toolNode, "googleSearch", []byte(gs.Raw))
+				googleToolNode, errSet = sjson.SetRawBytes(googleToolNode, "googleSearch", []byte(gs.Raw))
 				if errSet != nil {
 					log.Warnf("Failed to set googleSearch tool: %v", errSet)
 					continue
 				}
-				hasTool = true
+				googleSearchNodes = append(googleSearchNodes, googleToolNode)
 			}
 		}
-		if hasTool {
-			out, _ = sjson.SetRawBytes(out, "request.tools", []byte("[]"))
-			out, _ = sjson.SetRawBytes(out, "request.tools.0", toolNode)
+		if hasFunction || len(googleSearchNodes) > 0 {
+			toolsNode := []byte("[]")
+			if hasFunction {
+				toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", functionToolNode)
+			}
+			for _, googleNode := range googleSearchNodes {
+				toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", googleNode)
+			}
+			out, _ = sjson.SetRawBytes(out, "request.tools", toolsNode)
 		}
 	}
 
diff --git a/internal/translator/gemini/openai/chat-completions/gemini_openai_request.go b/internal/translator/gemini/openai/chat-completions/gemini_openai_request.go
@@ -289,12 +289,12 @@ func ConvertOpenAIRequestToGemini(modelName string, inputRawJSON []byte, _ bool)
 		}
 	}
 
-	// tools -> tools[0].functionDeclarations + tools[0].googleSearch passthrough
+	// tools -> tools[].functionDeclarations + tools[].googleSearch passthrough
 	tools := gjson.GetBytes(rawJSON, "tools")
 	if tools.IsArray() && len(tools.Array()) > 0 {
-		toolNode := []byte(`{}`)
-		hasTool := false
+		functionToolNode := []byte(`{}`)
 		hasFunction := false
+		googleSearchNodes := make([][]byte, 0)
 		for _, t := range tools.Array() {
 			if t.Get("type").String() == "function" {
 				fn := t.Get("function")
@@ -333,31 +333,37 @@ func ConvertOpenAIRequestToGemini(modelName string, inputRawJSON []byte, _ bool)
 					}
 					fnRaw, _ = sjson.Delete(fnRaw, "strict")
 					if !hasFunction {
-						toolNode, _ = sjson.SetRawBytes(toolNode, "functionDeclarations", []byte("[]"))
+						functionToolNode, _ = sjson.SetRawBytes(functionToolNode, "functionDeclarations", []byte("[]"))
 					}
-					tmp, errSet := sjson.SetRawBytes(toolNode, "functionDeclarations.-1", []byte(fnRaw))
+					tmp, errSet := sjson.SetRawBytes(functionToolNode, "functionDeclarations.-1", []byte(fnRaw))
 					if errSet != nil {
 						log.Warnf("Failed to append tool declaration for '%s': %v", fn.Get("name").String(), errSet)
 						continue
 					}
-					toolNode = tmp
+					functionToolNode = tmp
 					hasFunction = true
-					hasTool = true
 				}
 			}
 			if gs := t.Get("google_search"); gs.Exists() {
+				googleToolNode := []byte(`{}`)
 				var errSet error
-				toolNode, errSet = sjson.SetRawBytes(toolNode, "googleSearch", []byte(gs.Raw))
+				googleToolNode, errSet = sjson.SetRawBytes(googleToolNode, "googleSearch", []byte(gs.Raw))
 				if errSet != nil {
 					log.Warnf("Failed to set googleSearch tool: %v", errSet)
 					continue
 				}
-				hasTool = true
+				googleSearchNodes = append(googleSearchNodes, googleToolNode)
 			}
 		}
-		if hasTool {
-			out, _ = sjson.SetRawBytes(out, "tools", []byte("[]"))
-			out, _ = sjson.SetRawBytes(out, "tools.0", toolNode)
+		if hasFunction || len(googleSearchNodes) > 0 {
+			toolsNode := []byte("[]")
+			if hasFunction {
+				toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", functionToolNode)
+			}
+			for _, googleNode := range googleSearchNodes {
+				toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", googleNode)
+			}
+			out, _ = sjson.SetRawBytes(out, "tools", toolsNode)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -283,12 +283,12 @@ func ConvertOpenAIRequestToGeminiCLI(modelName string, inputRawJSON []byte, _ bo`
`283`	`283`	`}`
`284`	`284`	`}`
`285`	`285`
`286`		`- // tools -> request.tools[0].functionDeclarations + request.tools[0].googleSearch passthrough`
	`286`	`+ // tools -> request.tools[].functionDeclarations + request.tools[].googleSearch passthrough`
`287`	`287`	`tools := gjson.GetBytes(rawJSON, "tools")`
`288`	`288`	`if tools.IsArray() && len(tools.Array()) > 0 {`
`289`		- toolNode := []byte(`{}`)
`290`		`- hasTool := false`
	`289`	+ functionToolNode := []byte(`{}`)
`291`	`290`	`hasFunction := false`
	`291`	`+ googleSearchNodes := make([][]byte, 0)`
`292`	`292`	`for _, t := range tools.Array() {`
`293`	`293`	`if t.Get("type").String() == "function" {`
`294`	`294`	`fn := t.Get("function")`
`@@ -327,31 +327,37 @@ func ConvertOpenAIRequestToGeminiCLI(modelName string, inputRawJSON []byte, _ bo`
`327`	`327`	`}`
`328`	`328`	`fnRaw, _ = sjson.Delete(fnRaw, "strict")`
`329`	`329`	`if !hasFunction {`
`330`		`- toolNode, _ = sjson.SetRawBytes(toolNode, "functionDeclarations", []byte("[]"))`
	`330`	`+ functionToolNode, _ = sjson.SetRawBytes(functionToolNode, "functionDeclarations", []byte("[]"))`
`331`	`331`	`}`
`332`		`- tmp, errSet := sjson.SetRawBytes(toolNode, "functionDeclarations.-1", []byte(fnRaw))`
	`332`	`+ tmp, errSet := sjson.SetRawBytes(functionToolNode, "functionDeclarations.-1", []byte(fnRaw))`
`333`	`333`	`if errSet != nil {`
`334`	`334`	`log.Warnf("Failed to append tool declaration for '%s': %v", fn.Get("name").String(), errSet)`
`335`	`335`	`continue`
`336`	`336`	`}`
`337`		`- toolNode = tmp`
	`337`	`+ functionToolNode = tmp`
`338`	`338`	`hasFunction = true`
`339`		`- hasTool = true`
`340`	`339`	`}`
`341`	`340`	`}`
`342`	`341`	`if gs := t.Get("google_search"); gs.Exists() {`
	`342`	+ googleToolNode := []byte(`{}`)
`343`	`343`	`var errSet error`
`344`		`- toolNode, errSet = sjson.SetRawBytes(toolNode, "googleSearch", []byte(gs.Raw))`
	`344`	`+ googleToolNode, errSet = sjson.SetRawBytes(googleToolNode, "googleSearch", []byte(gs.Raw))`
`345`	`345`	`if errSet != nil {`
`346`	`346`	`log.Warnf("Failed to set googleSearch tool: %v", errSet)`
`347`	`347`	`continue`
`348`	`348`	`}`
`349`		`- hasTool = true`
	`349`	`+ googleSearchNodes = append(googleSearchNodes, googleToolNode)`
`350`	`350`	`}`
`351`	`351`	`}`
`352`		`- if hasTool {`
`353`		`- out, _ = sjson.SetRawBytes(out, "request.tools", []byte("[]"))`
`354`		`- out, _ = sjson.SetRawBytes(out, "request.tools.0", toolNode)`
	`352`	`+ if hasFunction \|\| len(googleSearchNodes) > 0 {`
	`353`	`+ toolsNode := []byte("[]")`
	`354`	`+ if hasFunction {`
	`355`	`+ toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", functionToolNode)`
	`356`	`+ }`
	`357`	`+ for _, googleNode := range googleSearchNodes {`
	`358`	`+ toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", googleNode)`
	`359`	`+ }`
	`360`	`+ out, _ = sjson.SetRawBytes(out, "request.tools", toolsNode)`
`355`	`361`	`}`
`356`	`362`	`}`
`357`	`363`
Original file line number	Diff line number	Diff line change
`@@ -289,12 +289,12 @@ func ConvertOpenAIRequestToGemini(modelName string, inputRawJSON []byte, _ bool)`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`292`		`- // tools -> tools[0].functionDeclarations + tools[0].googleSearch passthrough`
	`292`	`+ // tools -> tools[].functionDeclarations + tools[].googleSearch passthrough`
`293`	`293`	`tools := gjson.GetBytes(rawJSON, "tools")`
`294`	`294`	`if tools.IsArray() && len(tools.Array()) > 0 {`
`295`		- toolNode := []byte(`{}`)
`296`		`- hasTool := false`
	`295`	+ functionToolNode := []byte(`{}`)
`297`	`296`	`hasFunction := false`
	`297`	`+ googleSearchNodes := make([][]byte, 0)`
`298`	`298`	`for _, t := range tools.Array() {`
`299`	`299`	`if t.Get("type").String() == "function" {`
`300`	`300`	`fn := t.Get("function")`
`@@ -333,31 +333,37 @@ func ConvertOpenAIRequestToGemini(modelName string, inputRawJSON []byte, _ bool)`
`333`	`333`	`}`
`334`	`334`	`fnRaw, _ = sjson.Delete(fnRaw, "strict")`
`335`	`335`	`if !hasFunction {`
`336`		`- toolNode, _ = sjson.SetRawBytes(toolNode, "functionDeclarations", []byte("[]"))`
	`336`	`+ functionToolNode, _ = sjson.SetRawBytes(functionToolNode, "functionDeclarations", []byte("[]"))`
`337`	`337`	`}`
`338`		`- tmp, errSet := sjson.SetRawBytes(toolNode, "functionDeclarations.-1", []byte(fnRaw))`
	`338`	`+ tmp, errSet := sjson.SetRawBytes(functionToolNode, "functionDeclarations.-1", []byte(fnRaw))`
`339`	`339`	`if errSet != nil {`
`340`	`340`	`log.Warnf("Failed to append tool declaration for '%s': %v", fn.Get("name").String(), errSet)`
`341`	`341`	`continue`
`342`	`342`	`}`
`343`		`- toolNode = tmp`
	`343`	`+ functionToolNode = tmp`
`344`	`344`	`hasFunction = true`
`345`		`- hasTool = true`
`346`	`345`	`}`
`347`	`346`	`}`
`348`	`347`	`if gs := t.Get("google_search"); gs.Exists() {`
	`348`	+ googleToolNode := []byte(`{}`)
`349`	`349`	`var errSet error`
`350`		`- toolNode, errSet = sjson.SetRawBytes(toolNode, "googleSearch", []byte(gs.Raw))`
	`350`	`+ googleToolNode, errSet = sjson.SetRawBytes(googleToolNode, "googleSearch", []byte(gs.Raw))`
`351`	`351`	`if errSet != nil {`
`352`	`352`	`log.Warnf("Failed to set googleSearch tool: %v", errSet)`
`353`	`353`	`continue`
`354`	`354`	`}`
`355`		`- hasTool = true`
	`355`	`+ googleSearchNodes = append(googleSearchNodes, googleToolNode)`
`356`	`356`	`}`
`357`	`357`	`}`
`358`		`- if hasTool {`
`359`		`- out, _ = sjson.SetRawBytes(out, "tools", []byte("[]"))`
`360`		`- out, _ = sjson.SetRawBytes(out, "tools.0", toolNode)`
	`358`	`+ if hasFunction \|\| len(googleSearchNodes) > 0 {`
	`359`	`+ toolsNode := []byte("[]")`
	`360`	`+ if hasFunction {`
	`361`	`+ toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", functionToolNode)`
	`362`	`+ }`
	`363`	`+ for _, googleNode := range googleSearchNodes {`
	`364`	`+ toolsNode, _ = sjson.SetRawBytes(toolsNode, "-1", googleNode)`
	`365`	`+ }`
	`366`	`+ out, _ = sjson.SetRawBytes(out, "tools", toolsNode)`
`361`	`367`	`}`
`362`	`368`	`}`
`363`	`369`