From d07955208fcb235fd247b4c4303b1b1d2cb3859c Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Wed, 11 Feb 2026 14:09:44 -0800
Subject: [PATCH] Swap `agent.single_file_review`'s default value to false
 (#48619)

Release Notes:

- Swapped the default value for `agent.single_file_review` to `false`.
Agent diffs will no longer override the git diff in your buffer. You can
still review the agent's changes via the action log review button, or by
flipping this setting back to `true`
---
 assets/settings/default.json      |  2 +-
 crates/agent_ui/src/agent_diff.rs | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index 5c04662021e9506a5581b8017da51b69b19f9f43..489d6191eafc6ed880e4dc3d447e6a9cdbc8d56a 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -1000,7 +1000,7 @@
       },
     },
     // When enabled, agent edits will be displayed in single-file editors for review
-    "single_file_review": true,
+    "single_file_review": false,
     // When enabled, show voting thumbs for feedback on agent edits.
     "enable_feedback": true,
     "default_profile": "write",
diff --git a/crates/agent_ui/src/agent_diff.rs b/crates/agent_ui/src/agent_diff.rs
index c5bdaaf91bc3cfc633e5ed9812ae9a1154b5e659..efaa670720283054ee1d81f0691ce2e31cfc236c 100644
--- a/crates/agent_ui/src/agent_diff.rs
+++ b/crates/agent_ui/src/agent_diff.rs
@@ -1726,6 +1726,7 @@ mod tests {
     use super::*;
     use crate::Keep;
     use acp_thread::AgentConnection as _;
+    use agent_settings::AgentSettings;
     use editor::EditorSettings;
     use gpui::{TestAppContext, UpdateGlobal, VisualTestContext};
     use project::{FakeFs, Project};
@@ -1889,7 +1890,7 @@ mod tests {
     }
 
     #[gpui::test]
-    async fn test_singleton_agent_diff(cx: &mut TestAppContext) {
+    async fn test_single_file_review_diff(cx: &mut TestAppContext) {
         cx.update(|cx| {
             let settings_store = SettingsStore::test(cx);
             cx.set_global(settings_store);
@@ -1899,6 +1900,14 @@ mod tests {
             workspace::register_project_item::<Editor>(cx);
         });
 
+        cx.update(|cx| {
+            SettingsStore::update_global(cx, |store, _cx| {
+                let mut agent_settings = store.get::<AgentSettings>(None).clone();
+                agent_settings.single_file_review = true;
+                store.override_global(agent_settings);
+            });
+        });
+
         let fs = FakeFs::new(cx.executor());
         fs.insert_tree(
             path!("/test"),