From 6120452e63e33b8ccdcb6c34c73c5876932a8b4b Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Mon, 30 Mar 2026 15:58:07 -0700
Subject: [PATCH] Remove follow agent setting (#52775)

Self-Review Checklist:

- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable

Closes #ISSUE

Release Notes:

- N/A
---
 assets/settings/default.json                | 4 ++--
 crates/agent_settings/src/agent_settings.rs | 4 ----
 crates/settings_content/src/agent.rs        | 6 ++----
 crates/workspace/src/multi_workspace.rs     | 3 +--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/assets/settings/default.json b/assets/settings/default.json
index c9664980a34d31b193c8d381da7352e6383d6e53..6c0b4e1eca294c96bca445fd4fbed258c8cc969a 100644
--- a/assets/settings/default.json
+++ b/assets/settings/default.json
@@ -947,8 +947,8 @@
     //
     // Default: true
     "flexible": true,
-    // Where to position the sidebar. Can be 'left', 'right', or 'follow_agent'.
-    "sidebar_side": "follow_agent",
+    // Where to position the sidebar. Can be 'left' or 'right'.
+    "sidebar_side": "left",
     // Default width when the agent panel is docked to the left or right.
     "default_width": 640,
     // Default height when the agent panel is docked to the bottom.
diff --git a/crates/agent_settings/src/agent_settings.rs b/crates/agent_settings/src/agent_settings.rs
index 258293ee65de1815fb91f7130a2bf5043f0f18f3..5ba7a95b3a2df16bdb198722da73e589475cfd8d 100644
--- a/crates/agent_settings/src/agent_settings.rs
+++ b/crates/agent_settings/src/agent_settings.rs
@@ -85,10 +85,6 @@ impl AgentSettings {
         match self.sidebar_side {
             SidebarDockPosition::Left => SidebarSide::Left,
             SidebarDockPosition::Right => SidebarSide::Right,
-            SidebarDockPosition::FollowAgent => match self.dock {
-                DockPosition::Right => SidebarSide::Right,
-                _ => SidebarSide::Left,
-            },
         }
     }
 
diff --git a/crates/settings_content/src/agent.rs b/crates/settings_content/src/agent.rs
index dc5395bba805a932ccc3f66f9004e01be4171d4e..716e5fea3d48b969345f2d60bdd1cb84e9ce4d58 100644
--- a/crates/settings_content/src/agent.rs
+++ b/crates/settings_content/src/agent.rs
@@ -51,12 +51,10 @@ pub enum NewThreadLocation {
 #[serde(rename_all = "snake_case")]
 pub enum SidebarDockPosition {
     /// Always show the sidebar on the left side.
+    #[default]
     Left,
     /// Always show the sidebar on the right side.
     Right,
-    /// Show the sidebar on the same side as the agent panel.
-    #[default]
-    FollowAgent,
 }
 
 #[derive(Copy, Clone, Debug, Default, PartialEq, Eq)]
@@ -115,7 +113,7 @@ pub struct AgentSettingsContent {
     pub flexible: Option<bool>,
     /// Where to position the sidebar.
     ///
-    /// Default: follow_agent
+    /// Default: left
     pub sidebar_side: Option<SidebarDockPosition>,
     /// Default width in pixels when the agent panel is docked to the left or right.
     ///
diff --git a/crates/workspace/src/multi_workspace.rs b/crates/workspace/src/multi_workspace.rs
index ae3af8046bef3efced56e31cc4d063b7dcc80811..276b7a8ddd06f300f7e7aa228eb5ddfc7e04bbaa 100644
--- a/crates/workspace/src/multi_workspace.rs
+++ b/crates/workspace/src/multi_workspace.rs
@@ -58,10 +58,9 @@ pub fn sidebar_side_context_menu(
     right_click_menu(id).menu(move |window, cx| {
         let fs = <dyn fs::Fs>::global(cx);
         ContextMenu::build(window, cx, move |mut menu, _, _cx| {
-            let positions: [(SidebarDockPosition, &str); 3] = [
+            let positions: [(SidebarDockPosition, &str); 2] = [
                 (SidebarDockPosition::Left, "Left"),
                 (SidebarDockPosition::Right, "Right"),
-                (SidebarDockPosition::FollowAgent, "Follow Agent Panel"),
             ];
             for (position, label) in positions {
                 let fs = fs.clone();