From 72fb69f4642c403dafad9d4dec77d93a4b4f9260 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Wed, 17 Sep 2025 11:32:55 -0600
Subject: [PATCH] Agent servers

---
 crates/agent_servers/src/claude.rs            |  9 +++++++--
 crates/agent_servers/src/custom.rs            | 10 ++++++++--
 crates/assistant_tools/src/edit_file_tool.rs  |  1 +
 crates/language_models/src/provider/ollama.rs |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/crates/agent_servers/src/claude.rs b/crates/agent_servers/src/claude.rs
index c75c9539abe5fdd03293d98719d4a905b368c4a4..489839d82244fe76f6e9d1e9ea025a7b7c4a3bf7 100644
--- a/crates/agent_servers/src/claude.rs
+++ b/crates/agent_servers/src/claude.rs
@@ -45,8 +45,13 @@ impl AgentServer for ClaudeCode {
     }
 
     fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
-        update_settings_file::<AllAgentServersSettings>(fs, cx, |settings, _| {
-            settings.claude.get_or_insert_default().default_mode = mode_id.map(|m| m.to_string())
+        update_settings_file(fs, cx, |settings, _| {
+            settings
+                .agent_servers
+                .get_or_insert_default()
+                .claude
+                .get_or_insert_default()
+                .default_mode = mode_id.map(|m| m.to_string())
         });
     }
 
diff --git a/crates/agent_servers/src/custom.rs b/crates/agent_servers/src/custom.rs
index f035952a7939201e4b7d990b97e1fc695105d505..aa2bbc0868dc64c5b415c445d19a357eb4b2ea85 100644
--- a/crates/agent_servers/src/custom.rs
+++ b/crates/agent_servers/src/custom.rs
@@ -49,8 +49,14 @@ impl crate::AgentServer for CustomAgentServer {
 
     fn set_default_mode(&self, mode_id: Option<acp::SessionModeId>, fs: Arc<dyn Fs>, cx: &mut App) {
         let name = self.name();
-        update_settings_file::<AllAgentServersSettings>(fs, cx, move |settings, _| {
-            settings.custom.get_mut(&name).unwrap().default_mode = mode_id.map(|m| m.to_string())
+        update_settings_file(fs, cx, move |settings, _| {
+            settings
+                .agent_servers
+                .get_or_insert_default()
+                .custom
+                .get_mut(&name)
+                .unwrap()
+                .default_mode = mode_id.map(|m| m.to_string())
         });
     }
 
diff --git a/crates/assistant_tools/src/edit_file_tool.rs b/crates/assistant_tools/src/edit_file_tool.rs
index d13f9891c3af1933ee49428c223d3e6737871047..43dcb4a3c4b07839f414a5df241da1fa25697979 100644
--- a/crates/assistant_tools/src/edit_file_tool.rs
+++ b/crates/assistant_tools/src/edit_file_tool.rs
@@ -1540,6 +1540,7 @@ mod tests {
                 store.update_user_settings::<language::language_settings::AllLanguageSettings>(
                     cx,
                     |settings| {
+                        se
                         settings.defaults.format_on_save = Some(FormatOnSave::On);
                         settings.defaults.formatter =
                             Some(language::language_settings::SelectedFormatter::Auto);
diff --git a/crates/language_models/src/provider/ollama.rs b/crates/language_models/src/provider/ollama.rs
index 86226ea9199702ee329fc6d39d227314574fe8e9..2e377071789b6008965e40a45b37795f0c649acf 100644
--- a/crates/language_models/src/provider/ollama.rs
+++ b/crates/language_models/src/provider/ollama.rs
@@ -11,7 +11,7 @@ use language_model::{
     LanguageModelToolUseId, MessageContent, RateLimiter, Role, StopReason, TokenUsage,
 };
 use ollama::{
-    ChatMessage, ChatOptions, ChatRequest, ChatResponseDelta, KeepAlive, OllamaFunctionCall,
+    ChatMessage, ChatOptions, ChatRequest, ChatResponseDelta, OllamaFunctionCall,
     OllamaFunctionTool, OllamaToolCall, get_models, show_model, stream_chat_completion,
 };
 pub use settings::OllamaAvailableModel as AvailableModel;