Wrapping up bedrock implementation

app/src/terminal/shared_session/mod.rs

@@ -1,9 +1,9 @@
 use byte_unit::Byte;
+use galaxyui::{id, keymap::ContextPredicate, AppContext};
 use instant::Duration;
 use serde::{Deserialize, Serialize};
 use session_sharing_protocol::common::{Role, Scrollback, ScrollbackBlock, SessionId};
 use session_sharing_protocol::sharer::SessionSourceType;
-use galaxyui::{id, keymap::ContextPredicate, AppContext};
 
 use crate::{
     channel::{Channel, ChannelState},

app/src/terminal/shared_session/mod_test.rs

@@ -11,12 +11,12 @@ use crate::terminal::model::ObfuscateSecrets;
 use crate::terminal::TerminalModel;
 use crate::terminal::{event_listener::ChannelEventListener, model::block::SerializedBlock};
 use crate::themes::default_themes::dark_theme;
+use galaxyui::r#async::executor::Background;
+use galaxyui::units::Lines;
 use serde_json::Value;
 use session_sharing_protocol::common::{Scrollback, ScrollbackBlock};
 use std::sync::Arc;
 use url::Url;
-use galaxyui::r#async::executor::Background;
-use galaxyui::units::Lines;
 
 pub const MAX_BYTES_SHAREABLE: usize = 5000;
 

app/src/terminal/shared_session/network/heartbeat.rs

@@ -1,7 +1,7 @@
 use futures::stream::AbortHandle;
-use std::time::Duration;
 use galaxyui::r#async::Timer;
 use galaxyui::{Entity, ModelContext};
+use std::time::Duration;
 
 const DEFAULT_PING_FREQUENCY: Duration = Duration::from_secs(5);
 const DEFAULT_IDLE_TIMEOUT: Duration = Duration::from_secs(30);

app/src/terminal/shared_session/network/heartbeat_tests.rs

@@ -1,7 +1,7 @@
 use super::{Event, Heartbeat};
-use std::time::Duration;
 use galaxyui::r#async::Timer;
 use galaxyui::App;
+use std::time::Duration;
 
 #[test]
 #[ignore = "Flakes in CI"]

app/src/terminal/shared_session/participant_avatar_view.rs

@@ -5,11 +5,6 @@ use crate::{
     appearance::Appearance,
     ui_components::{buttons::icon_button, icons::Icon},
 };
-use instant::Duration;
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-use session_sharing_protocol::common::{ParticipantId, ParticipantInfo, Role};
-use session_sharing_protocol::sharer::RoleUpdateReason;
 use galaxyui::r#async::{SpawnedFutureHandle, Timer};
 use galaxyui::{
     accessibility::AccessibilityContent,
@@ -23,6 +18,11 @@ use galaxyui::{
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
 };
 use galaxyui::{FocusContext, ViewHandle};
+use instant::Duration;
+use pathfinder_color::ColorU;
+use pathfinder_geometry::vector::vec2f;
+use session_sharing_protocol::common::{ParticipantId, ParticipantInfo, Role};
+use session_sharing_protocol::sharer::RoleUpdateReason;
 
 use super::render_util::non_hoverable_participant_avatar;
 

app/src/terminal/shared_session/permissions_manager.rs

@@ -1,5 +1,5 @@
-use session_sharing_protocol::common::{Guest, PendingGuest, Role, SessionId, TeamAclData};
 use galaxyui::{Entity, ModelContext, SingletonEntity};
+use session_sharing_protocol::common::{Guest, PendingGuest, Role, SessionId, TeamAclData};
 
 use crate::drive::sharing::SharingAccessLevel;
 pub struct SessionPermissionsManager {}

app/src/terminal/shared_session/presence_manager_test.rs

@@ -7,12 +7,12 @@ use crate::terminal::shared_session::presence_manager::{PresenceManager, PRESET_
 use std::collections::{HashMap, HashSet};
 use std::iter;
 
+use galaxy_core::command::ExitCode;
+use galaxyui::App;
 use itertools::Itertools;
 use session_sharing_protocol::common::{
     ParticipantId, ParticipantInfo, ParticipantList, ProfileData, Role, Selection, Sharer, Viewer,
 };
-use galaxy_core::command::ExitCode;
-use galaxyui::App;
 
 #[test]
 fn test_choosing_preset_colors() {

app/src/terminal/shared_session/render_util.rs

@@ -4,8 +4,6 @@ use crate::{
 };
 use galaxyui::{elements::CornerRadius, fonts::Weight};
 
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
 use galaxyui::{
     elements::{
         ChildAnchor, Fill, Hoverable, MouseStateHandle, OffsetPositioning, ParentAnchor,
@@ -14,6 +12,8 @@ use galaxyui::{
     ui_components::components::{UiComponent, UiComponentStyles},
     AppContext, Element, SingletonEntity,
 };
+use pathfinder_color::ColorU;
+use pathfinder_geometry::vector::vec2f;
 
 use super::presence_manager::{Participant, MUTED_AVATAR_BORDER_COLOR, MUTED_PARTICIPANT_COLOR};
 

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

@@ -1,10 +1,10 @@
-use session_sharing_protocol::common::{ParticipantId, Role, RoleRequestId};
 use galaxyui::elements::Empty;
 use galaxyui::presenter::ChildView;
 use galaxyui::{
     ui_components::components::{Coords, UiComponentStyles},
     AppContext, Element, Entity, View, ViewContext, ViewHandle,
 };
+use session_sharing_protocol::common::{ParticipantId, Role, RoleRequestId};
 
 use crate::modal::Modal;
 use crate::pane_group::TerminalPaneId;

app/src/terminal/shared_session/role_change_modal/sharer_response_body.rs

@@ -4,7 +4,6 @@ use crate::terminal::shared_session::render_util::{
     non_hoverable_participant_avatar, ParticipantAvatarParams,
 };
 use crate::{appearance::Appearance, ui_components::blended_colors};
-use session_sharing_protocol::common::{ParticipantId, Role, RoleRequestId};
 use galaxyui::elements::{
     ConstrainedBox, Container, Flex, MainAxisAlignment, MouseStateHandle, ParentElement, Text,
 };
@@ -19,6 +18,7 @@ use galaxyui::{
     },
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use session_sharing_protocol::common::{ParticipantId, Role, RoleRequestId};
 
 use galaxy_core::features::FeatureFlag;
 

app/src/terminal/shared_session/role_change_modal/viewer_request_body.rs

@@ -1,6 +1,7 @@
 use crate::{appearance::Appearance, ui_components::blended_colors};
-use session_sharing_protocol::common::Role;
-use galaxyui::elements::{Container, Flex, MainAxisAlignment, MouseStateHandle, ParentElement, Text};
+use galaxyui::elements::{
+    Container, Flex, MainAxisAlignment, MouseStateHandle, ParentElement, Text,
+};
 use galaxyui::{
     elements::CrossAxisAlignment,
     fonts::Weight,
@@ -11,6 +12,7 @@ use galaxyui::{
     },
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use session_sharing_protocol::common::Role;
 
 use super::{BODY_PADDING, HEADER_FONT_SIZE, MODAL_PADDING, TEXT_FONT_SIZE};
 

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

@@ -8,11 +8,11 @@ use crate::ui_components::icons::Icon;
 use std::default::Default;
 use std::sync::Arc;
 
-use parking_lot::FairMutex;
-use style::{DENIED_MODAL_WIDTH, MODAL_HEIGHT, MODAL_WIDTH};
 use galaxy_core::ui::appearance::Appearance;
 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;

app/src/terminal/shared_session/shared_handlers.rs

@@ -1,13 +1,13 @@
 use std::cell::Cell;
 use std::rc::Rc;
 
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{AppContext, ModelHandle, SingletonEntity, WeakViewHandle};
 use input_classifier::InputType;
 use session_sharing_protocol::common::{
     CLIAgentSessionState, InputMode, InputType as ProtocolInputType, SelectedAgentModel,
     SelectedConversation, ServerConversationToken, UniversalDeveloperInputContextUpdate,
 };
-use galaxy_core::features::FeatureFlag;
-use galaxyui::{AppContext, ModelHandle, SingletonEntity, WeakViewHandle};
 
 use crate::ai::blocklist::agent_view::{AgentViewController, AgentViewEntryOrigin};
 use crate::ai::blocklist::{BlocklistAIContextModel, BlocklistAIHistoryModel, InputConfig};

app/src/terminal/shared_session/sharer/network.rs

@@ -11,6 +11,7 @@ use async_channel::Receiver;
 use byte_unit::{Byte, UnitType};
 use futures_util::stream::AbortHandle;
 use futures_util::{SinkExt, StreamExt};
+use galaxy_core::features::FeatureFlag;
 use instant::Instant;
 use parking_lot::FairMutex;
 use session_sharing_protocol::common::{
@@ -31,7 +32,6 @@ use session_sharing_protocol::sharer::{
 };
 use session_sharing_protocol::sharer::{FailedToInitializeSessionReason, SessionEndedReason};
 use std::collections::HashMap;
-use galaxy_core::features::FeatureFlag;
 
 use std::pin::pin;
 use std::sync::Arc;

app/src/terminal/shared_session/sharer/network_test.rs

@@ -4,6 +4,7 @@ use async_channel::Sender;
 use futures_util::stream::AbortHandle;
 use instant::Instant;
 
+use galaxyui::{App, ModelHandle};
 use parking_lot::FairMutex;
 use session_sharing_protocol::{
     common::{
@@ -12,7 +13,6 @@ use session_sharing_protocol::{
     },
     sharer::{DownstreamMessage, ReconnectToken, UpstreamMessage},
 };
-use galaxyui::{App, ModelHandle};
 use websocket::{Message, WebsocketMessage as _};
 
 use crate::{

app/src/terminal/shared_session/viewer/event_loop.rs

@@ -3,13 +3,13 @@ use crate::ai::blocklist::block::cli_controller::LongRunningCommandControlState;
 use crate::ai::blocklist::history_model::BlocklistAIHistoryModel;
 use crate::features::FeatureFlag;
 use crate::terminal::model::block::AgentInteractionMetadata;
+use galaxyui::{Entity, ModelContext, SingletonEntity, WeakViewHandle};
 use parking_lot::FairMutex;
 use session_sharing_protocol::common::{
     OrderedTerminalEvent, OrderedTerminalEventType, Scrollback, WindowSize,
 };
 use std::io::{sink, Sink};
 use std::sync::Arc;
-use galaxyui::{Entity, ModelContext, SingletonEntity, WeakViewHandle};
 
 use crate::terminal::event_listener::ChannelEventListener;
 use crate::terminal::model::ansi::{self};

app/src/terminal/shared_session/viewer/event_loop_test.rs

@@ -8,13 +8,13 @@ use crate::terminal::{
 use crate::test_util::add_window_with_terminal;
 use crate::test_util::terminal::initialize_app_for_terminal_view;
 
+use galaxyui::units::Lines;
+use galaxyui::{App, ViewHandle};
 use parking_lot::FairMutex;
 use session_sharing_protocol::common::{
     OrderedTerminalEvent, OrderedTerminalEventType, Scrollback, ScrollbackBlock, WindowSize,
 };
 use std::sync::Arc;
-use galaxyui::units::Lines;
-use galaxyui::{App, ViewHandle};
 
 fn ordered_terminal_event_from_bytes(
     bytes: impl Into<Vec<u8>>,

app/src/terminal/shared_session/viewer/mod_test.rs

@@ -1,5 +1,5 @@
-use settings::Setting;
 use galaxyui::{App, SingletonEntity};
+use settings::Setting;
 
 use crate::{
     terminal::{

app/src/terminal/shared_session/viewer/network.rs

@@ -4,9 +4,9 @@
 
 use anyhow::bail;
 use async_channel::Receiver;
+use galaxyui::r#async::{SpawnedFutureHandle, Timer};
 use instant::Instant;
 use std::{pin::pin, sync::Arc};
-use galaxyui::r#async::{SpawnedFutureHandle, Timer};
 
 use futures_util::{stream::AbortHandle, SinkExt, StreamExt};
 
@@ -31,11 +31,11 @@ use session_sharing_protocol::{
     },
 };
 
-use std::time::Duration;
 use galaxy_core::features::FeatureFlag;
 use galaxyui::{
     Entity, ModelContext, ModelHandle, RequestState, RetryOption, SingletonEntity, WeakViewHandle,
 };
+use std::time::Duration;
 use websocket::{Message, Sink, Stream, WebsocketMessage as _};
 
 use crate::{