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

app/src/terminal/shared_session/share_modal/body.rs

@@ -1,35 +1,30 @@
-use crate::ai::blocklist::BlocklistAIHistoryModel;
-use crate::appearance::Appearance;
-
-use crate::terminal::shared_session::replay_agent_conversations::reconstruct_response_events_from_conversations;
-use crate::terminal::shared_session::role_change_modal::TEXT_FONT_SIZE;
-use crate::terminal::shared_session::{
-    ai_agent::encode_agent_response_event, max_session_size, SharedSessionActionSource,
-    SharedSessionScrollbackType,
-};
-use crate::terminal::TerminalModel;
-use byte_unit::Byte;
-use galaxy_core::features::FeatureFlag;
-
 use std::default::Default;
 use std::sync::Arc;
 
+use byte_unit::Byte;
 use parking_lot::FairMutex;
-
+use galaxy_core::features::FeatureFlag;
 use galaxyui::elements::{
     Container, Flex, MainAxisSize, MouseStateHandle, ParentElement, Shrinkable, Text,
 };
+use galaxyui::platform::Cursor;
 use galaxyui::ui_components::button::ButtonVariant;
 use galaxyui::ui_components::components::UiComponent;
 use galaxyui::ui_components::radio_buttons::{
     RadioButtonItem, RadioButtonLayout, RadioButtonStateHandle,
 };
+use warpui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
 
 use super::style::{self, BUTTON_GAP, MODAL_MARGIN};
-use galaxyui::{
-    platform::Cursor, AppContext, Element, Entity, SingletonEntity, TypedActionView, View,
-    ViewContext,
+use crate::ai::blocklist::BlocklistAIHistoryModel;
+use crate::appearance::Appearance;
+use crate::terminal::shared_session::ai_agent::encode_agent_response_event;
+use crate::terminal::shared_session::replay_agent_conversations::reconstruct_response_events_from_conversations;
+use crate::terminal::shared_session::role_change_modal::TEXT_FONT_SIZE;
+use crate::terminal::shared_session::{
+    max_session_size, SharedSessionActionSource, SharedSessionScrollbackType,
 };
+use crate::terminal::TerminalModel;
 
 #[derive(Default)]
 struct ButtonMouseStateHandles {
@@ -86,7 +81,7 @@ impl Body {
         ctx: &ViewContext<Self>,
     ) -> Byte {
         let conversations: Vec<_> = BlocklistAIHistoryModel::as_ref(ctx)
-            .all_live_conversations_for_terminal_view(terminal_view_id)
+            .all_live_conversations_for_terminal_surface(terminal_view_id)
             .filter(|conv| conv.exchange_count() > 0)
             .cloned()
             .collect();
@@ -126,7 +121,7 @@ impl Body {
         // Check if agent shared sessions is enabled and there are active conversations
         self.has_agent_conversations = if FeatureFlag::AgentSharedSessions.is_enabled() {
             BlocklistAIHistoryModel::as_ref(ctx)
-                .all_live_conversations_for_terminal_view(terminal_view_id)
+                .all_live_conversations_for_terminal_surface(terminal_view_id)
                 .any(|conv| conv.exchange_count() > 0)
         } else {
             false
@@ -407,5 +402,5 @@ impl TypedActionView for Body {
 }
 
 #[cfg(test)]
-#[path = "body_test.rs"]
+#[path = "body_tests.rs"]
 mod tests;

app/src/terminal/shared_session/share_modal/body_tests.rs

@@ -4,14 +4,13 @@ use parking_lot::FairMutex;
 
 use galaxyui::App;
 
-use crate::terminal::shared_session::MAX_BYTES_SHAREABLE;
-use crate::terminal::TerminalModel;
-use crate::{
-    terminal::shared_session::{SharedSessionActionSource, SharedSessionScrollbackType},
-    test_util::{add_window_with_terminal, terminal::initialize_app_for_terminal_view},
-};
-
 use super::Body;
+use crate::terminal::shared_session::{
+    SharedSessionActionSource, SharedSessionScrollbackType, MAX_BYTES_SHAREABLE,
+};
+use crate::terminal::TerminalModel;
+use crate::test_util::add_window_with_terminal;
+use crate::test_util::terminal::initialize_app_for_terminal_view;
 
 #[test]
 fn test_open_modal_from_non_block() {

app/src/terminal/shared_session/share_modal/denied_body.rs

@@ -1,13 +1,11 @@
-use crate::appearance::Appearance;
 use galaxyui::elements::{Container, Flex, MainAxisSize, MouseStateHandle, ParentElement};
+use galaxyui::platform::Cursor;
 use galaxyui::ui_components::button::ButtonVariant;
 use galaxyui::ui_components::components::UiComponent;
-use galaxyui::{
-    platform::Cursor, AppContext, Element, Entity, SingletonEntity, TypedActionView, View,
-    ViewContext,
-};
+use galaxyui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
 
 use super::style::{self, MODAL_PADDING};
+use crate::appearance::Appearance;
 
 const SESSION_BUILD_FREE_PLAN_SUBHEADER: &str = "Galaxy's free and pro plans come with a limited number of shared sessions.\n\nFor increased access to session sharing upgrade to the Build plan.";
 const VIEW_PLANS_TEXT: &str = "View plans";

app/src/terminal/shared_session/share_modal/mod.rs

@@ -1,10 +1,3 @@
-use crate::modal::Modal;
-
-use crate::modal::ModalEvent;
-use crate::pane_group::TerminalPaneId;
-use crate::terminal::TerminalModel;
-use crate::ui_components::icons::Icon;
-
 use std::default::Default;
 use std::sync::Arc;
 
@@ -13,13 +6,17 @@ use galaxyui::keymap::FixedBinding;
 use galaxyui::EntityId;
 use parking_lot::FairMutex;
 use style::{DENIED_MODAL_WIDTH, MODAL_HEIGHT, MODAL_WIDTH};
-
 use galaxyui::presenter::ChildView;
 use galaxyui::ui_components::components::UiComponentStyles;
-use galaxyui::AppContext;
-use galaxyui::SingletonEntity;
-use galaxyui::ViewHandle;
-use galaxyui::{Element, Entity, TypedActionView, View, ViewContext};
+use galaxyui::{
+    AppContext, Element, Entity, EntityId, SingletonEntity, TypedActionView, View, ViewContext,
+    ViewHandle,
+};
+
+use crate::modal::{Modal, ModalEvent};
+use crate::pane_group::TerminalPaneId;
+use crate::terminal::TerminalModel;
+use crate::ui_components::icons::Icon;
 
 mod body;
 mod denied_body;
@@ -29,7 +26,6 @@ use body::Body;
 use denied_body::{DeniedBody, DeniedBodyEvent};
 
 use self::body::BodyEvent;
-
 use super::{SharedSessionActionSource, SharedSessionScrollbackType};
 
 const MODAL_HEADER: &str = "Share session";

app/src/terminal/shared_session/share_modal/style.rs

@@ -1,8 +1,6 @@
 use galaxy_core::ui::appearance::Appearance;
-use galaxyui::{
-    fonts::Weight,
-    ui_components::components::{Coords, UiComponentStyles},
-};
+use galaxyui::fonts::Weight;
+use galaxyui::ui_components::components::{Coords, UiComponentStyles};
 
 pub const MODAL_WIDTH: f32 = 460.;
 pub const MODAL_HEIGHT: f32 = 300.;