From cc561961525b5e47e2a6eba52b3382233b6d49a6 Mon Sep 17 00:00:00 2001
From: Agus Zubiaga <agus@zed.dev>
Date: Mon, 21 Jul 2025 11:26:00 -0300
Subject: [PATCH] Fix loading agent server settings (#34662)

Release Notes:

- N/A
---
 crates/agent_servers/src/settings.rs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/crates/agent_servers/src/settings.rs b/crates/agent_servers/src/settings.rs
index 29dcf5eb8c..645674b5f1 100644
--- a/crates/agent_servers/src/settings.rs
+++ b/crates/agent_servers/src/settings.rs
@@ -29,9 +29,12 @@ impl settings::Settings for AllAgentServersSettings {
     fn load(sources: SettingsSources<Self::FileContent>, _: &mut App) -> Result<Self> {
         let mut settings = AllAgentServersSettings::default();
 
-        for value in sources.defaults_and_customizations() {
-            if value.gemini.is_some() {
-                settings.gemini = value.gemini.clone();
+        for AllAgentServersSettings { gemini, claude } in sources.defaults_and_customizations() {
+            if gemini.is_some() {
+                settings.gemini = gemini.clone();
+            }
+            if claude.is_some() {
+                settings.claude = claude.clone();
             }
         }