Agent servers

Conrad Irwin created 2 months ago

Change summary

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(-)

Detailed changes

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())
         });
     }
 

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())
         });
     }
 

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);

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;