From 7ed243c7ce38ccc2b411e0a8d248d45906402ed5 Mon Sep 17 00:00:00 2001
From: Conrad Irwin <conrad.irwin@gmail.com>
Date: Thu, 18 Sep 2025 09:34:37 -0600
Subject: [PATCH] Fix missing merge

---
 crates/agent_settings/src/agent_settings.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 3913bfb808b86b7d28ff75440d76c6d42f4c6866..176e8b1a1aa85214f79be1b8ec2696ab387434c1 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -208,6 +208,11 @@ impl Settings for AgentSettings {
             .or(self.thread_summary_model.take());
         self.inline_alternatives
             .merge_from(&value.inline_alternatives.clone());
+        self.default_profile
+            .merge_from(&value.default_profile.clone().map(AgentProfileId));
+        self.default_view.merge_from(&value.default_view);
+        self.always_allow_tool_actions
+            .merge_from(&value.always_allow_tool_actions);
         self.notify_when_agent_waiting
             .merge_from(&value.notify_when_agent_waiting);
         self.play_sound_when_agent_done
@@ -215,9 +220,6 @@ impl Settings for AgentSettings {
         self.stream_edits.merge_from(&value.stream_edits);
         self.single_file_review
             .merge_from(&value.single_file_review);
-        self.default_profile
-            .merge_from(&value.default_profile.clone().map(AgentProfileId));
-        self.default_view.merge_from(&value.default_view);
         self.preferred_completion_mode
             .merge_from(&value.preferred_completion_mode.map(Into::into));
         self.enable_feedback.merge_from(&value.enable_feedback);