From 8b80d8b3543c0235fe1c67124c902a98bdf3ca00 Mon Sep 17 00:00:00 2001
From: Rizel Scarlett <rizel@squareup.com>
Date: Mon, 15 Dec 2025 21:10:24 -0500
Subject: [PATCH] fix: filter tools in Ollama streaming when chat mode is
 enabled (#6118)

---
 crates/goose/src/providers/ollama.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/goose/src/providers/ollama.rs b/crates/goose/src/providers/ollama.rs
index b39b9036..fc06ae42 100644
--- a/crates/goose/src/providers/ollama.rs
+++ b/crates/goose/src/providers/ollama.rs
@@ -254,11 +254,19 @@ impl Provider for OllamaProvider {
         messages: &[Message],
         tools: &[Tool],
     ) -> Result<MessageStream, ProviderError> {
+        let config = crate::config::Config::global();
+        let goose_mode = config.get_goose_mode().unwrap_or(GooseMode::Auto);
+        let filtered_tools = if goose_mode == GooseMode::Chat {
+            &[]
+        } else {
+            tools
+        };
+
         let mut payload = create_request(
             &self.model,
             system,
             messages,
-            tools,
+            filtered_tools,
             &super::utils::ImageFormat::OpenAi,
         )?;
         payload["stream"] = json!(true);