first pass of merging in warp (doesn't build)

app/src/session_management.rs

@@ -5,13 +5,11 @@ use chrono::NaiveDateTime;
 use galaxyui::{AppContext, Entity, EntityId, WindowId};
 
 use crate::context_chips::prompt_snapshot::PromptSnapshot;
-use crate::pane_group::PaneGroup;
+use crate::pane_group::{PaneGroup, PaneId};
 use crate::terminal::model::blockgrid::BlockGrid;
 use crate::terminal::shared_session::SharedSessionStatus;
-use crate::{
-    pane_group::PaneId,
-    workspace::{PaneViewLocator, Workspace},
-};
+use crate::themes::theme::AnsiColorIdentifier;
+use crate::workspace::{PaneViewLocator, Workspace};
 
 /// Contains session metadata, including a prompt and running command (if there is one).
 #[derive(Clone)]
@@ -20,7 +18,7 @@ pub struct SessionNavigationData {
     prompt: String,
     /// The various parts of the prompt, like virtual environment and working directory.
     prompt_elements: SessionNavigationPromptElements,
-    /// A running commmand, if there is one.
+    /// A running command, if there is one.
     command_context: CommandContext,
     /// A `PaneViewLocator` to navigate to the session.
     pane_view_locator: PaneViewLocator,
@@ -234,3 +232,16 @@ pub fn num_shared_sessions(ctx: &AppContext) -> usize {
     }
     num_shared_sessions
 }
+
+/// Metadata for a single tab, used by the Ctrl+Tab MRU switcher.
+#[derive(Clone)]
+pub struct TabNavigationData {
+    pub pane_group_id: EntityId,
+    pub title: String,
+    pub subtitle: Option<String>,
+    pub window_id: WindowId,
+    /// 1-based left-to-right tab index for display disambiguation.
+    pub tab_index: usize,
+    /// The tab's color, if one has been set by the user.
+    pub color: Option<AnsiColorIdentifier>,
+}