From 9837ce119702934da1785d5c7d1fc83e69922258 Mon Sep 17 00:00:00 2001
From: ZheFox <77232781+zhefox@users.noreply.github.com>
Date: Sat, 29 Aug 2026 02:50:07 +0800
Subject: [PATCH] fix(antigravity): use Gemini schema field for tools

---
 .../transport/src/antigravity/request.rs      | 42 ++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/crates/aether-provider/transport/src/antigravity/request.rs b/crates/aether-provider/transport/src/antigravity/request.rs
index 8142f21f7..aa390c142 100644
--- a/crates/aether-provider/transport/src/antigravity/request.rs
+++ b/crates/aether-provider/transport/src/antigravity/request.rs
@@ -78,6 +78,7 @@ pub fn build_antigravity_safe_v1internal_request(
         inner_request.remove("model");
         inner_request.remove("safetySettings");
         inner_request.remove("safety_settings");
+        normalize_antigravity_function_declaration_schemas(&mut inner_request);
         let request_id = non_empty_string_field(source, "requestId").unwrap_or(request_id);
         let user_agent =
             non_empty_string_field(source, "userAgent").unwrap_or(ANTIGRAVITY_REQUEST_USER_AGENT);
@@ -98,6 +99,7 @@ pub fn build_antigravity_safe_v1internal_request(
     inner_request.remove("model");
     inner_request.remove("safetySettings");
     inner_request.remove("safety_settings");
+    normalize_antigravity_function_declaration_schemas(&mut inner_request);
 
     AntigravityRequestEnvelopeSupport::Supported(serde_json::json!({
         "project": auth.project_id,
@@ -109,6 +111,33 @@ pub fn build_antigravity_safe_v1internal_request(
     }))
 }
 
+fn normalize_antigravity_function_declaration_schemas(request: &mut Map<String, Value>) {
+    let Some(tools) = request.get_mut("tools").and_then(Value::as_array_mut) else {
+        return;
+    };
+
+    for tool in tools {
+        let Some(tool_object) = tool.as_object_mut() else {
+            continue;
+        };
+        for key in ["functionDeclarations", "function_declarations"] {
+            let Some(declarations) = tool_object.get_mut(key).and_then(Value::as_array_mut) else {
+                continue;
+            };
+            for declaration in declarations {
+                let Some(declaration_object) = declaration.as_object_mut() else {
+                    continue;
+                };
+                if let Some(parameters) = declaration_object.remove("parameters") {
+                    declaration_object
+                        .entry("parametersJsonSchema".to_string())
+                        .or_insert(parameters);
+                }
+            }
+        }
+    }
+}
+
 fn existing_v1internal_request_object(source: &Map<String, Value>) -> Option<&Map<String, Value>> {
     source
         .get("request")
@@ -183,6 +212,9 @@ mod tests {
                 }
             },
             "tools": [
+                {
+                    "googleSearch": {}
+                },
                 {
                     "functionDeclarations": [
                         {
@@ -254,9 +286,17 @@ mod tests {
             .get("include_server_side_tool_invocations")
             .is_none());
         assert_eq!(
-            envelope["request"]["tools"][0]["functionDeclarations"][0]["name"],
+            envelope["request"]["tools"][1]["functionDeclarations"][0]["name"],
             "run_command"
         );
+        assert_eq!(
+            envelope["request"]["tools"][1]["functionDeclarations"][0]["parametersJsonSchema"]
+                ["properties"]["cmd"]["type"],
+            "string"
+        );
+        assert!(envelope["request"]["tools"][1]["functionDeclarations"][0]
+            .get("parameters")
+            .is_none());
         assert_eq!(
             envelope["request"]["labels"]["trajectory_id"],
             "trajectory-123"