warpdotdev · rgatx · May 1, 2026
diff --git a/app/src/code/view.rs b/app/src/code/view.rs
@@ -20,7 +20,7 @@ use crate::terminal::cli_agent::{
 };
 use crate::terminal::view::CliAgentRouting;
 use crate::workspace::util::get_context_target_terminal_view;
-use crate::workspace::TabBarDropTargetData;
+use crate::workspace::{TabBarDropTargetData, VerticalTabsPaneDropTargetData};
 use crate::{code::EditorTabBarDropTargetData, pane_group::pane::ActionOrigin};
 use lsp::LspManagerModel;
 use pathfinder_color::ColorU;
@@ -634,6 +634,10 @@ impl CodeView {
         })
     }
 
+    pub fn local_paths(&self) -> Vec<PathBuf> {
+        self.tab_group.iter().filter_map(TabData::path).collect()
+    }
+
     pub fn pane_configuration(&self) -> ModelHandle<PaneConfiguration> {
         self.pane_configuration.clone()
     }
@@ -1581,6 +1585,26 @@ impl CodeView {
                         precomputed_tab_hover_index: None,
                     },
                 );
+            } else if let Some(data) = data.and_then(|data| {
+                data.as_any()
+                    .downcast_ref::<VerticalTabsPaneDropTargetData>()
+            }) {
+                // If an editor tab is dragged over the vertical workspace tab bar, we should clear
+                // all drag indicators on the editor tab group.
+                ctx.dispatch_typed_action(
+                    PaneHeaderAction::<CodeViewAction, CodeViewAction>::CustomAction(
+                        CodeViewAction::ClearEditorTabGroupDragPositions,
+                    ),
+                );
+
+                ctx.dispatch_typed_action(
+                    PaneHeaderAction::<CodeViewAction, CodeViewAction>::PaneHeaderDragged {
+                        origin: ActionOrigin::EditorTab(index),
+                        drag_location: PaneDragDropLocation::TabBar(data.tab_bar_location),
+                        drag_position,
+                        precomputed_tab_hover_index: Some(data.tab_hover_index),
+                    },
+                );
             } else {
                 // If an editor tab is dragged anywhere else, we should clear all drag indicators on the editor and workspace tab groups.
                 ctx.dispatch_typed_action(
@@ -1615,6 +1639,18 @@ impl CodeView {
                     PaneHeaderAction::<CodeViewAction, CodeViewAction>::PaneHeaderDropped {
                         origin: ActionOrigin::EditorTab(index),
                         drop_location: PaneDragDropLocation::TabBar(data.tab_bar_location),
+                        visual_tab_order: None,
+                    },
+                );
+            } else if let Some(data) = data.and_then(|data| {
+                data.as_any()
+                    .downcast_ref::<VerticalTabsPaneDropTargetData>()
+            }) {
+                ctx.dispatch_typed_action(
+                    PaneHeaderAction::<CodeViewAction, CodeViewAction>::PaneHeaderDropped {
+                        origin: ActionOrigin::EditorTab(index),
+                        drop_location: PaneDragDropLocation::TabBar(data.tab_bar_location),
+                        visual_tab_order: data.visual_tab_order.clone(),
                     },
                 );
             }

diff --git a/app/src/code/wasm.rs b/app/src/code/wasm.rs
@@ -153,6 +153,10 @@ impl CodeView {
         None
     }
 
+    pub fn local_paths(&self) -> Vec<PathBuf> {
+        Vec::new()
+    }
+
     pub fn focus(&self, _ctx: &mut ViewContext<Self>) {}
 
     pub fn pane_configuration(&self) -> ModelHandle<PaneConfiguration> {

diff --git a/app/src/pane_group/mod.rs b/app/src/pane_group/mod.rs
@@ -580,6 +580,7 @@ pub enum Event {
     DroppedOnTabBar {
         origin: ActionOrigin,
         pane_id: PaneId,
+        visual_tab_order: Option<Vec<usize>>,
     },
     /// Switches the focus to the specified tab and moves the given
     /// pane_id into the tab as a hidden pane. This will insert it into the pane
@@ -1147,10 +1148,14 @@ impl PaneGroup {
                     ctx.emit(Event::ClearHoveredTabIndex);
                     self.move_pane(pane_id, *target_id, *direction, ctx);
                 }
-                PaneViewEvent::DroppedOnTabBar { origin } => {
+                PaneViewEvent::DroppedOnTabBar {
+                    origin,
+                    visual_tab_order,
+                } => {
                     ctx.emit(Event::DroppedOnTabBar {
                         origin: *origin,
                         pane_id,
+                        visual_tab_order: visual_tab_order.clone(),
                     });
                     ctx.emit(Event::ClearHoveredTabIndex);
                 }

diff --git a/app/src/pane_group/pane/view/header/mod.rs b/app/src/pane_group/pane/view/header/mod.rs
@@ -84,6 +84,7 @@ pub enum Event<A: ActionPayload, B: ActionPayload> {
     /// A pane or file tab was dropped on the workspace tab bar.
     DroppedOnTabBar {
         origin: ActionOrigin,
+        visual_tab_order: Option<Vec<usize>>,
     },
     // This header was dropped on a place outside of the pane group or tab bar
     PaneDroppedOutsideofTabBarOrPaneGroup,
@@ -116,6 +117,7 @@ pub enum PaneHeaderAction<A: ActionPayload, B: ActionPayload> {
     PaneHeaderDropped {
         origin: ActionOrigin,
         drop_location: PaneDragDropLocation, // Represents what kind of drop target the pane was dropped over
+        visual_tab_order: Option<Vec<usize>>,
     },
     PaneHeaderClicked,
 }
@@ -913,11 +915,9 @@ impl<P: BackingView> TypedActionView for PaneHeader<P> {
                                 ctx,
                             )
                         }),
-                        hidden_pane_preview_direction: if precomputed_tab_hover_index.is_some() {
-                            Direction::Up
-                        } else {
-                            Direction::Left
-                        },
+                        // Precomputed hover indices are supplied by vertical tabs, whose over-tab
+                        // drop path commits the same left root split.
+                        hidden_pane_preview_direction: Direction::Left,
                     });
                 }
                 PaneDragDropLocation::PaneGroup(target_id) => {
@@ -945,11 +945,15 @@ impl<P: BackingView> TypedActionView for PaneHeader<P> {
             PaneHeaderAction::PaneHeaderDropped {
                 origin,
                 drop_location,
+                visual_tab_order,
             } => {
                 match drop_location {
                     PaneDragDropLocation::TabBar(_) => {
                         self.is_visible_in_pane_group = true;
-                        ctx.emit(Event::DroppedOnTabBar { origin: *origin })
+                        ctx.emit(Event::DroppedOnTabBar {
+                            origin: *origin,
+                            visual_tab_order: visual_tab_order.clone(),
+                        })
                     }
                     PaneDragDropLocation::PaneGroup(_) => {
                         ctx.emit(Event::PaneDroppedWithinPaneGroup)
@@ -1093,6 +1097,7 @@ pub fn render_pane_header_draggable<P: BackingView>(
                 >::PaneHeaderDropped {
                     origin: ActionOrigin::Pane,
                     drop_location: PaneDragDropLocation::TabBar(data.tab_bar_location),
+                    visual_tab_order: None,
                 })
             } else if let Some(data) = data.and_then(|data| {
                 data.as_any()
@@ -1104,6 +1109,7 @@ pub fn render_pane_header_draggable<P: BackingView>(
                 >::PaneHeaderDropped {
                     origin: ActionOrigin::Pane,
                     drop_location: PaneDragDropLocation::TabBar(data.tab_bar_location),
+                    visual_tab_order: data.visual_tab_order.clone(),
                 })
             } else if let Some(data) =
                 data.and_then(|data| data.as_any().downcast_ref::<PaneDropTargetData>())
@@ -1114,6 +1120,7 @@ pub fn render_pane_header_draggable<P: BackingView>(
                 >::PaneHeaderDropped {
                     origin: ActionOrigin::Pane,
                     drop_location: PaneDragDropLocation::PaneGroup(data.id),
+                    visual_tab_order: None,
                 })
             } else {
                 ctx.dispatch_typed_action(PaneHeaderAction::<
@@ -1122,6 +1129,7 @@ pub fn render_pane_header_draggable<P: BackingView>(
                 >::PaneHeaderDropped {
                     origin: ActionOrigin::Pane,
                     drop_location: PaneDragDropLocation::Other,
+                    visual_tab_order: None,
                 })
             }
         })

diff --git a/app/src/pane_group/pane/view/mod.rs b/app/src/pane_group/pane/view/mod.rs
@@ -55,6 +55,7 @@ pub enum PaneViewEvent {
     },
     DroppedOnTabBar {
         origin: ActionOrigin,
+        visual_tab_order: Option<Vec<usize>>,
     },
     DraggedOntoTabBar {
         origin: ActionOrigin,
@@ -301,13 +302,19 @@ impl<P: BackingView> PaneView<P> {
                 self.is_being_dragged = false;
                 ctx.notify();
             }
-            header::Event::DroppedOnTabBar { origin } => {
+            header::Event::DroppedOnTabBar {
+                origin,
+                visual_tab_order,
+            } => {
                 // If we're handling a drop event for a workspace pane, we want to get rid of the neutral background that obscures it.
                 if matches!(origin, ActionOrigin::Pane) {
                     self.is_being_dragged = false;
                 }
 
-                ctx.emit(PaneViewEvent::DroppedOnTabBar { origin: *origin });
+                ctx.emit(PaneViewEvent::DroppedOnTabBar {
+                    origin: *origin,
+                    visual_tab_order: visual_tab_order.clone(),
+                });
                 ctx.notify();
             }
             header::Event::DraggedOverTabBar {

diff --git a/app/src/tab.rs b/app/src/tab.rs
@@ -1662,6 +1662,7 @@ impl UiComponent for TabComponent<'_> {
                 ctx.dispatch_typed_action(WorkspaceAction::DragTab {
                     tab_index,
                     tab_position: rect,
+                    vertical_context: None,
                 });
             })
             .on_drop(|ctx, _, _, _| ctx.dispatch_typed_action(WorkspaceAction::DropTab));

diff --git a/app/src/workspace/action.rs b/app/src/workspace/action.rs
@@ -81,6 +81,15 @@ pub enum TabContextMenuAnchor {
     VerticalTabsKebab,
 }
 
+#[derive(Clone, Debug)]
+pub struct VerticalTabDragContext {
+    pub visual_above_index: Option<usize>,
+    pub visual_below_index: Option<usize>,
+    pub current_group_indices: Vec<usize>,
+    pub visual_above_group_indices: Option<Vec<usize>>,
+    pub visual_below_group_indices: Option<Vec<usize>>,
+}
+
 #[derive(Debug, Clone, Copy)]
 pub enum VerticalTabsPaneContextMenuTarget {
     ClickedPane(PaneViewLocator),
@@ -245,6 +254,7 @@ pub enum WorkspaceAction {
     DragTab {
         tab_index: usize,
         tab_position: RectF,
+        vertical_context: Option<VerticalTabDragContext>,
     },
     HandoffPendingTransfer {
         target_window_id: WindowId,
@@ -280,6 +290,7 @@ pub enum WorkspaceAction {
     SetVerticalTabsCompactSubtitle(VerticalTabsCompactSubtitle),
     ToggleVerticalTabsShowPrLink,
     ToggleVerticalTabsShowDiffStats,
+    ToggleVerticalTabsGroupByProject,
     ToggleVerticalTabsShowDetailsOnHover,
     /// Closes the focused panel. This happens as an explicit action from the user.
     ClosePanel,
@@ -845,6 +856,7 @@ impl WorkspaceAction {
             | SetVerticalTabsCompactSubtitle(_)
             | ToggleVerticalTabsShowPrLink
             | ToggleVerticalTabsShowDiffStats
+            | ToggleVerticalTabsGroupByProject
             | ToggleVerticalTabsShowDetailsOnHover
             | ToggleWelcomeTips
             | CopyTextToClipboard(_)

diff --git a/app/src/workspace/mod.rs b/app/src/workspace/mod.rs
@@ -1533,10 +1533,11 @@ pub struct TabBarDropTargetData {
     pub tab_bar_location: TabBarLocation,
 }
 
-#[derive(PartialEq, Copy, Clone, Debug)]
+#[derive(PartialEq, Clone, Debug)]
 pub struct VerticalTabsPaneDropTargetData {
     pub tab_bar_location: TabBarLocation,
     pub tab_hover_index: TabBarHoverIndex,
+    pub visual_tab_order: Option<Vec<usize>>,
 }
 
 #[derive(PartialEq, Copy, Clone, Debug, Serialize, Deserialize)]

diff --git a/app/src/workspace/tab_settings.rs b/app/src/workspace/tab_settings.rs
@@ -507,6 +507,15 @@ define_settings_group!(TabSettings, settings: [
     vertical_tabs_view_mode: VerticalTabsViewMode,
     vertical_tabs_primary_info: VerticalTabsPrimaryInfo,
     vertical_tabs_compact_subtitle: VerticalTabsCompactSubtitle,
+    vertical_tabs_group_by_project: VerticalTabsGroupByProject {
+        type: bool,
+        default: false,
+        supported_platforms: SupportedPlatforms::ALL,
+        sync_to_cloud: SyncToCloud::Globally(RespectUserSyncSetting::Yes),
+        private: false,
+        toml_path: "appearance.vertical_tabs.group_by_project",
+        description: "Group vertical tabs by project / git repo root.",
+    },
     vertical_tabs_show_pr_link: VerticalTabsShowPrLink {
         type: bool,
         default: true,