diff --git a/internal/translator/antigravity/gemini/antigravity_gemini_request.go b/internal/translator/antigravity/gemini/antigravity_gemini_request.go
index 2c8ff402..e5ce0c31 100644
--- a/internal/translator/antigravity/gemini/antigravity_gemini_request.go
+++ b/internal/translator/antigravity/gemini/antigravity_gemini_request.go
@@ -305,11 +305,7 @@ func fixCLIToolResponse(input string) (string, error) {
 
 			functionResponseContent := `{"parts":[],"role":"function"}`
 			for ri, response := range groupResponses {
-				fallbackName := ""
-				if ri < len(group.CallNames) {
-					fallbackName = group.CallNames[ri]
-				}
-				partRaw := parseFunctionResponseRaw(response, fallbackName)
+				partRaw := parseFunctionResponseRaw(response, group.CallNames[ri])
 				if partRaw != "" {
 					functionResponseContent, _ = sjson.SetRaw(functionResponseContent, "parts.-1", partRaw)
 				}
diff --git a/internal/translator/gemini-cli/gemini/gemini-cli_gemini_request.go b/internal/translator/gemini-cli/gemini/gemini-cli_gemini_request.go
index c6039088..a2af6f83 100644
--- a/internal/translator/gemini-cli/gemini/gemini-cli_gemini_request.go
+++ b/internal/translator/gemini-cli/gemini/gemini-cli_gemini_request.go
@@ -261,10 +261,7 @@ func fixCLIToolResponse(input string) (string, error) {
 					log.Warnf("failed to parse function response")
 					continue
 				}
-				raw := response.Raw
-				if ri < len(group.CallNames) {
-					raw = backfillFunctionResponseName(raw, group.CallNames[ri])
-				}
+				raw := backfillFunctionResponseName(response.Raw, group.CallNames[ri])
 				functionResponseContent, _ = sjson.SetRaw(functionResponseContent, "parts.-1", raw)
 			}