fix: gemini models via databricks

crates/goose/src/providers/databricks.rs

@@ -257,6 +257,11 @@ impl DatabricksProvider {
         normalized.contains("codex")
     }
 
+    fn supports_stream_options(model_name: &str) -> bool {
+        let normalized = model_name.to_ascii_lowercase();
+        !normalized.contains("gemini")
+    }
+
     fn get_endpoint_path(&self, model_name: &str, is_embedding: bool) -> String {
         if is_embedding {
             "serving-endpoints/text-embedding-3-small/invocations".to_string()
@@ -389,16 +394,18 @@ impl Provider for DatabricksProvider {
                 .unwrap()
                 .insert("stream".to_string(), Value::Bool(true));
 
-            if let Some(opts) = payload
-                .get_mut("stream_options")
-                .and_then(|v| v.as_object_mut())
-            {
-                opts.entry("include_usage").or_insert(json!(true));
-            } else {
-                payload
-                    .as_object_mut()
-                    .unwrap()
-                    .insert("stream_options".to_string(), json!({"include_usage": true}));
+            if Self::supports_stream_options(&model_config.model_name) {
+                if let Some(opts) = payload
+                    .get_mut("stream_options")
+                    .and_then(|v| v.as_object_mut())
+                {
+                    opts.entry("include_usage").or_insert(json!(true));
+                } else {
+                    payload
+                        .as_object_mut()
+                        .unwrap()
+                        .insert("stream_options".to_string(), json!({"include_usage": true}));
+                }
             }
 
             let mut log = RequestLog::start(model_config, &payload)?;

crates/goose/src/providers/formats/openai.rs

@@ -48,9 +48,25 @@ struct DeltaToolCall {
     extra: Option<serde_json::Map<String, Value>>,
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(untagged)]
+enum DeltaContent {
+    String(String),
+    Array(Vec<ContentPart>),
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+struct ContentPart {
+    r#type: String,
+    text: String,
+    #[serde(rename = "thoughtSignature")]
+    thought_signature: Option<String>,
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 struct Delta {
-    content: Option<String>,
+    #[serde(default)]
+    content: Option<DeltaContent>,
     role: Option<String>,
     tool_calls: Option<Vec<DeltaToolCall>>,
     reasoning_details: Option<Vec<Value>>,
@@ -74,6 +90,32 @@ struct StreamingChunk {
     model: Option<String>,
 }
 
+fn extract_content_and_signature(
+    delta_content: Option<&DeltaContent>,
+) -> (Option<String>, Option<String>) {
+    match delta_content {
+        Some(DeltaContent::String(s)) => (Some(s.clone()), None),
+        Some(DeltaContent::Array(parts)) => {
+            let text_parts: Vec<_> = parts.iter().filter(|p| p.r#type == "text").collect();
+
+            let text = text_parts
+                .iter()
+                .map(|p| p.text.as_str())
+                .collect::<String>();
+
+            let signature = text_parts
+                .iter()
+                .find_map(|p| p.thought_signature.as_ref())
+                .cloned();
+
+            let text = if text.is_empty() { None } else { Some(text) };
+
+            (text, signature)
+        }
+        None => (None, None),
+    }
+}
+
 pub fn format_messages(messages: &[Message], image_format: &ImageFormat) -> Vec<Value> {
     let mut messages_spec = Vec::new();
     for message in messages {
@@ -735,9 +777,11 @@ where
                     }
                 }
 
-                if let Some(text) = &chunk.choices[0].delta.content {
+                let (text_content, _thought_signature) = extract_content_and_signature(chunk.choices[0].delta.content.as_ref());
+
+                if let Some(text) = text_content {
                     if !text.is_empty() {
-                        content.push(MessageContent::text(text));
+                        content.push(MessageContent::text(&text));
                     }
                 }
 
@@ -748,7 +792,6 @@ where
                         content,
                     );
 
-                    // Add ID if present
                     if let Some(id) = chunk.id {
                         msg = msg.with_id(id);
                     }