Wrapping up bedrock implementation

app/src/terminal/view/action.rs

@@ -5,14 +5,14 @@ use std::path::PathBuf;
 
 use ai::skills::SkillReference;
 use command_corrections::Correction;
-use pathfinder_geometry::vector::Vector2F;
-use session_sharing_protocol::common::Role;
-use session_sharing_protocol::sharer::RoleUpdateReason;
 use galaxy_util::user_input::UserInput;
 use galaxyui::elements::HyperlinkUrl;
 use galaxyui::event::ModifiersState;
 use galaxyui::units::Lines;
 use galaxyui::EntityId;
+use pathfinder_geometry::vector::Vector2F;
+use session_sharing_protocol::common::Role;
+use session_sharing_protocol::sharer::RoleUpdateReason;
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::agent::AIAgentExchangeId;

app/src/terminal/view/ambient_agent/block/entry.rs

@@ -1,4 +1,3 @@
-use settings::Setting;
 use galaxy_core::send_telemetry_from_ctx;
 use galaxy_core::ui::{appearance::Appearance, Icon};
 use galaxyui::prelude::Empty;
@@ -15,6 +14,7 @@ use galaxyui::{
     Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
     WeakModelHandle,
 };
+use settings::Setting;
 
 use crate::ai::blocklist::agent_view::{render_block_container, AgentViewEntryOrigin};
 use crate::terminal::view::ambient_agent::AmbientAgentViewModel;

app/src/terminal/view/ambient_agent/block/setup_command.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use parking_lot::FairMutex;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_terminal::model::BlockId;
 use galaxyui::{
@@ -8,6 +7,7 @@ use galaxyui::{
     scene::{CornerRadius, Radius},
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use parking_lot::FairMutex;
 
 use crate::{
     ai::{

app/src/terminal/view/ambient_agent/first_time_setup.rs

@@ -16,7 +16,6 @@ use crate::{
     },
     ui_components::blended_colors,
 };
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill};
 use galaxyui::{
     elements::{
@@ -27,6 +26,7 @@ use galaxyui::{
     fonts::{Properties, Weight},
     AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
 };
+use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 
 /// Max width for the content area (matches Figma: 592px)
 const CONTENT_MAX_WIDTH: f32 = 592.;

app/src/terminal/view/ambient_agent/footer.rs

@@ -1,4 +1,3 @@
-use pathfinder_color::ColorU;
 use galaxy_core::ui::appearance::Appearance;
 use galaxyui::{
     elements::{
@@ -8,6 +7,7 @@ use galaxyui::{
     fonts::{Properties, Weight},
     Element,
 };
+use pathfinder_color::ColorU;
 
 use crate::ui_components::blended_colors;
 

app/src/terminal/view/ambient_agent/harness_selector.rs

@@ -4,7 +4,6 @@
 
 use std::sync::Arc;
 
-use pathfinder_geometry::vector::vec2f;
 use galaxyui::{
     elements::{
         Border, ChildAnchor, ChildView, OffsetPositioning, ParentAnchor, ParentElement as _,
@@ -13,6 +12,7 @@ use galaxyui::{
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
     ViewHandle,
 };
+use pathfinder_geometry::vector::vec2f;
 
 use galaxy_cli::agent::Harness;
 use galaxy_core::ui::appearance::Appearance;

app/src/terminal/view/ambient_agent/host_selector.rs

@@ -1,7 +1,5 @@
 use std::sync::Arc;
 
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
 use galaxyui::{
     elements::{
         Border, ChildAnchor, ChildView, OffsetPositioning, ParentAnchor, ParentElement as _,
@@ -10,6 +8,8 @@ use galaxyui::{
     fonts::{Properties, Weight},
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
 };
+use pathfinder_color::ColorU;
+use pathfinder_geometry::vector::vec2f;
 
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;

app/src/terminal/view/ambient_agent/loading_screen.rs

@@ -1,6 +1,5 @@
 //! Loading screen UI for cloud mode initialization.
 
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::AnsiColorIdentifier;
 use galaxy_core::ui::Icon;
@@ -17,6 +16,7 @@ use galaxyui::text_layout::TextAlignment;
 use galaxyui::ui_components::button::ButtonVariant;
 use galaxyui::ui_components::components::UiComponent;
 use galaxyui::{AppContext, ModelHandle, SingletonEntity};
+use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 
 use crate::ai::agent_tips::{AITip, AITipModel};
 use crate::ai::loading::shimmering_warp_loading_text;

app/src/terminal/view/ambient_agent/mod.rs

@@ -14,6 +14,7 @@ mod view_impl;
 pub use block::*;
 pub use first_time_setup::{FirstTimeCloudAgentSetupView, FirstTimeCloudAgentSetupViewEvent};
 pub use footer::{render_error_footer, render_loading_footer};
+use galaxy_core::features::FeatureFlag;
 pub use harness_selector::{HarnessSelector, HarnessSelectorAction, HarnessSelectorEvent};
 pub use host_selector::{
     Host, HostSelector, HostSelectorAction, HostSelectorEvent, NakedHeaderButtonTheme,
@@ -24,7 +25,6 @@ pub use model_selector::{ModelSelector, ModelSelectorAction, ModelSelectorEvent}
 pub use progress::{render_progress, ProgressProps, ProgressStep, ProgressStepState};
 pub use progress_ui_state::AmbientAgentProgressUIState;
 pub use tips::{get_cloud_mode_tips, CloudModeTip};
-use galaxy_core::features::FeatureFlag;
 
 use crate::ai::blocklist::agent_view::{AgentViewController, AgentViewState};
 use crate::ai::blocklist::BlocklistAIHistoryModel;

app/src/terminal/view/ambient_agent/model.rs

@@ -1,12 +1,12 @@
 use std::time::Duration;
 
-use instant::Instant;
-use session_sharing_protocol::common::SessionId;
 use galaxy_cli::agent::Harness;
 use galaxy_core::features::FeatureFlag;
 use galaxy_core::send_telemetry_from_ctx;
 use galaxyui::r#async::{SpawnedFutureHandle, Timer};
 use galaxyui::{Entity, EntityId, ModelContext, SingletonEntity};
+use instant::Instant;
+use session_sharing_protocol::common::SessionId;
 
 use crate::ai::active_agent_views_model::ActiveAgentViewsModel;
 use crate::ai::agent::conversation::AIConversationId;

app/src/terminal/view/ambient_agent/model_selector.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use pathfinder_geometry::vector::vec2f;
 use galaxyui::{
     elements::{
         Border, ChildAnchor, ChildView, Container, OffsetPositioning, ParentAnchor,
@@ -9,6 +8,7 @@ use galaxyui::{
     AppContext, Element, Entity, EntityId, SingletonEntity, TypedActionView, View, ViewContext,
     ViewHandle,
 };
+use pathfinder_geometry::vector::vec2f;
 
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;

app/src/terminal/view/ambient_agent/progress.rs

@@ -3,7 +3,6 @@
 use std::borrow::Cow;
 use std::time::Duration;
 
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::Icon;
 use galaxyui::elements::{
@@ -12,6 +11,7 @@ use galaxyui::elements::{
     PositionedElementOffsetBounds, Radius, Rect, SavePosition, Stack, Text,
 };
 use galaxyui::{AppContext, Element, WindowId};
+use pathfinder_geometry::vector::vec2f;
 
 /// The state of a progress step.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

app/src/terminal/view/ambient_agent/view_impl.rs

@@ -1,9 +1,9 @@
 //! [`TerminalView`]-specific implementation for ambient agent functionality.
 
-use std::cell::Cell;
-use std::rc::Rc;
 use galaxy_cli::agent::Harness;
 use galaxy_terminal::model::BlockId;
+use std::cell::Cell;
+use std::rc::Rc;
 
 use crate::ai::agent::conversation::{AIConversationId, ConversationStatus};
 use crate::ai::AIRequestUsageModel;

app/src/terminal/view/block_banner/mod.rs

@@ -8,7 +8,6 @@
 
 mod warpify;
 
-pub use warpify::*;
 use galaxyui::{
     elements::{
         ConstrainedBox, Container, CornerRadius, Hoverable, MouseState, MouseStateHandle,
@@ -16,6 +15,7 @@ use galaxyui::{
     },
     Element,
 };
+pub use warpify::*;
 
 use crate::themes::theme::WarpTheme;
 

app/src/terminal/view/block_banner/warpify.rs

@@ -1,4 +1,3 @@
-use pathfinder_color::ColorU;
 use galaxyui::{
     elements::{
         Align, ConstrainedBox, Container, CrossAxisAlignment, Flex, HighlightedHyperlink,
@@ -12,6 +11,7 @@ use galaxyui::{
     },
     AppContext, Element,
 };
+use pathfinder_color::ColorU;
 
 use crate::{
     appearance::Appearance,

app/src/terminal/view/block_onboarding/onboarding_agentic_suggestions_block.rs

@@ -11,13 +11,6 @@ use crate::terminal::History;
 use crate::terminal::TerminalView;
 use crate::ui_components::icons as UIIcon;
 use crate::user_config::themes_dir;
-use lazy_static::lazy_static;
-use markdown_parser::weight::CustomWeight;
-use markdown_parser::FormattedText;
-use markdown_parser::FormattedTextFragment;
-use markdown_parser::FormattedTextLine;
-use regex::Regex;
-use serde::{Deserialize, Serialize};
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxyui::elements::CornerRadius;
@@ -37,6 +30,13 @@ use galaxyui::{
     platform::Cursor,
     AppContext, Element, Entity, ModelHandle, SingletonEntity, View, ViewContext,
 };
+use lazy_static::lazy_static;
+use markdown_parser::weight::CustomWeight;
+use markdown_parser::FormattedText;
+use markdown_parser::FormattedTextFragment;
+use markdown_parser::FormattedTextLine;
+use regex::Regex;
+use serde::{Deserialize, Serialize};
 
 const ONBOARDING_BOX_WIDTH: f32 = 210.;
 const ONBOARDING_BOX_HEIGHT: f32 = 140.;

app/src/terminal/view/block_onboarding/onboarding_drive_sharing_block.rs

@@ -1,4 +1,3 @@
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::appearance::Appearance;
 use galaxyui::{
     elements::{
@@ -13,6 +12,7 @@ use galaxyui::{
     },
     AppContext, Element, Entity, SingletonEntity, View, ViewContext,
 };
+use pathfinder_geometry::vector::vec2f;
 
 use crate::{
     cloud_object::model::persistence::{CloudModel, CloudModelEvent},

app/src/terminal/view/block_onboarding/onboarding_prompt_block.rs

@@ -10,8 +10,6 @@ use crate::terminal::model::ObfuscateSecrets;
 use crate::terminal::session_settings::SessionSettings;
 use crate::terminal::view::block_onboarding::util;
 use crate::terminal::SizeInfo;
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
-use settings::Setting as _;
 use galaxyui::{
     elements::{
         Align, Border, Clipped, ConstrainedBox, Container, CornerRadius, Flex,
@@ -23,6 +21,8 @@ use galaxyui::{
     ui_components::components::{UiComponent, UiComponentStyles},
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
+use settings::Setting as _;
 
 const CONFIRM_MARGIN_TOP: f32 = 16.;
 

app/src/terminal/view/block_onboarding/util.rs

@@ -1,7 +1,6 @@
 use crate::appearance::Appearance;
 use crate::editor::EditorView;
 use crate::ui_components::icons::Icon;
-use pathfinder_color::ColorU;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::elements::{Flex, ParentElement};
 use galaxyui::ui_components::components::Coords;
@@ -20,6 +19,7 @@ use galaxyui::{
     Action, AppContext, Element,
 };
 use galaxyui::{SingletonEntity, ViewHandle};
+use pathfinder_color::ColorU;
 
 pub const INPUT_BOX_FONT_SIZE: f32 = 14.;
 pub const TEAM_BLOCK_INITIAL_HEIGHT: f32 = 92.;

app/src/terminal/view/init.rs

@@ -1072,8 +1072,6 @@ pub fn init(app: &mut AppContext) {
     )
     .with_enabled(|| FeatureFlag::Projects.is_enabled())
     .with_context_predicate(id!("Workspace") & id!(flags::IS_ANY_AI_ENABLED))]);
-
-
 }
 
 /// Registers bindings related to input modes.

app/src/terminal/view/init_environment/mode_selector.rs

@@ -1,7 +1,5 @@
 use crate::appearance::Appearance;
 use crate::ui_components::icons::Icon;
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::color::blend::Blend;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxyui::elements::{
@@ -14,6 +12,8 @@ use galaxyui::keymap::{FixedBinding, Keystroke};
 use galaxyui::platform::Cursor;
 use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
 use galaxyui::{AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext};
+use pathfinder_color::ColorU;
+use pathfinder_geometry::vector::vec2f;
 
 // Figma node 6583:23542
 const MODAL_WIDTH: f32 = 441.;

app/src/terminal/view/init_project/mod.rs

@@ -22,11 +22,6 @@ use crate::view_components::DismissibleToast;
 use crate::workspace::ToastStack;
 use crate::TelemetryEvent;
 use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
-use lsp::supported_servers::LSPServerType;
-use lsp_server_selector::{create_lsp_server_selector, LSPServerInfo};
-pub use model::{InitProjectModel, InitProjectModelEvent, InitStepKind};
-use model::{InitStepData, InitStepStatus};
-use std::path::{Path, PathBuf};
 use galaxy_core::ui::theme::Fill;
 use galaxyui::{
     elements::{
@@ -37,6 +32,11 @@ use galaxyui::{
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
     ViewHandle,
 };
+use lsp::supported_servers::LSPServerType;
+use lsp_server_selector::{create_lsp_server_selector, LSPServerInfo};
+pub use model::{InitProjectModel, InitProjectModelEvent, InitStepKind};
+use model::{InitStepData, InitStepStatus};
+use std::path::{Path, PathBuf};
 
 const ONBOARDING_TEXT: &str = "Great - let's begin setting up this project! Would you like to give me permission to index this codebase? It allows me to quickly understand context and provide more targeted solutions when working in this codebase. No code is stored on Warp servers.";
 const ALREADY_SETUP_TEXT: &str = "It looks like this project has already been initialized. You can re-generate the AGENTS.md for this codebase by clicking the button below.";

app/src/terminal/view/init_project/model.rs

@@ -3,10 +3,10 @@ use std::path::{Path, PathBuf};
 use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
 use ai::project_context::model::ProjectContextModel;
 use enum_iterator::Sequence;
+use galaxyui::{Entity, ModelContext, SingletonEntity as _};
 use lsp::supported_servers::LSPServerType;
 #[cfg(not(target_family = "wasm"))]
 use repo_metadata::repositories::DetectedRepositories;
-use galaxyui::{Entity, ModelContext, SingletonEntity as _};
 
 use crate::{
     ai::persisted_workspace::PersistedWorkspace,

app/src/terminal/view/inline_banner/mod.rs

@@ -33,7 +33,6 @@ pub use shell_process_terminated::*;
 pub use ssh::*;
 pub use vim_mode::*;
 
-use pathfinder_color::ColorU;
 use galaxyui::elements::Clipped;
 use galaxyui::{
     elements::{
@@ -48,6 +47,7 @@ use galaxyui::{
     },
     Element,
 };
+use pathfinder_color::ColorU;
 
 use crate::ui_components::buttons::icon_button;
 use crate::ui_components::icons::Icon as UiIcon;

app/src/terminal/view/inline_banner/notifications_discovery.rs

@@ -1,5 +1,5 @@
-use serde::Serialize;
 use galaxyui::{elements::MouseStateHandle, notification::RequestPermissionsOutcome, Element};
+use serde::Serialize;
 
 use crate::{
     appearance::Appearance,

app/src/terminal/view/inline_banner/notifications_error.rs

@@ -1,5 +1,5 @@
-use serde::Serialize;
 use galaxyui::{elements::MouseStateHandle, Element};
+use serde::Serialize;
 
 use crate::{
     appearance::Appearance,

app/src/terminal/view/inline_banner/prompt_suggestions.rs

@@ -12,7 +12,6 @@ use crate::server::telemetry::InteractionSource;
 use crate::settings::InputSettings;
 use crate::terminal::view::passive_suggestions::PromptSuggestionResolution;
 use crate::util::bindings::keybinding_name_to_keystroke;
-use pathfinder_geometry::vector::vec2f;
 use galaxyui::elements::{
     ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty,
     Fill, Flex, HighlightedHyperlink, Hoverable, Icon, MainAxisAlignment, MainAxisSize,
@@ -27,6 +26,7 @@ use galaxyui::{
     AppContext, Entity, EventContext, ModelHandle, TypedActionView, ViewContext, ViewHandle,
 };
 use galaxyui::{SingletonEntity, View};
+use pathfinder_geometry::vector::vec2f;
 
 use crate::terminal::view::{ContextMenuAction, InputType, PromptSuggestion};
 use crate::ui_components::blended_colors;

app/src/terminal/view/inline_banner/session_state.rs

@@ -1,6 +1,6 @@
 use crate::settings::{AISettings, AISettingsChangedEvent};
-use settings::Setting;
 use galaxyui::{Entity, ModelContext, SingletonEntity};
+use settings::Setting;
 
 /// Tracks whether the BYO LLM auth banner (e.g., AWS Bedrock login) has been dismissed.
 ///

app/src/terminal/view/load_ai_conversation.rs

@@ -1,9 +1,9 @@
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{EntityId, ViewContext};
 use std::path::Path;
 use std::rc::Rc;
 use std::sync::Arc;
 use vec1::Vec1;
-use galaxy_core::features::FeatureFlag;
-use galaxyui::{EntityId, ViewContext};
 
 use super::blocklist_filter::exchanges_for_blocklist;
 use crate::ai::blocklist::agent_view::{
@@ -63,9 +63,9 @@ use crate::{
     },
 };
 use galaxy_core::channel::ChannelState;
-use warp_multi_agent_api as api;
 use galaxyui::units::IntoPixels;
 use galaxyui::{ModelHandle, SingletonEntity};
+use warp_multi_agent_api as api;
 
 /// Describes restore-context setup state for directory reconciliation and hinting.
 #[derive(Clone, Debug, PartialEq, Eq)]

app/src/terminal/view/open_in_warp.rs

@@ -4,13 +4,13 @@ use std::{
     sync::Arc,
 };
 
-use itertools::Itertools;
-use lazy_static::lazy_static;
 use galaxy_util::path::EscapeChar;
 use galaxyui::{
     accessibility::{AccessibilityContent, ActionAccessibilityContent, WarpA11yRole},
     SingletonEntity, ViewContext,
 };
+use itertools::Itertools;
+use lazy_static::lazy_static;
 
 #[cfg(feature = "local_fs")]
 use crate::code::editor_management::CodeSource;
@@ -24,7 +24,6 @@ use crate::{
     },
     util::openable_file_type::{is_file_openable_in_warp, OpenableFileType},
 };
-use settings::Setting as _;
 use galaxy_completer::{
     completer::TopLevelCommandCaseSensitivity,
     parsers::{
@@ -34,6 +33,7 @@ use galaxy_completer::{
     },
     signatures::CommandRegistry,
 };
+use settings::Setting as _;
 
 use super::{Event, InlineBannerItem, InlineBannerType, TerminalView};
 

app/src/terminal/view/pane_impl.rs

@@ -32,7 +32,6 @@ use crate::ui_components::blended_colors;
 use crate::ui_components::buttons::icon_button_with_color;
 use crate::ui_components::icons;
 use crate::workspace::tab_settings::TabSettings;
-use settings::Setting as _;
 use galaxy_core::context_flag::ContextFlag;
 use galaxy_core::ui::Icon as WarpIcon;
 use galaxyui::elements::{
@@ -46,6 +45,7 @@ use galaxyui::ui_components::components::UiComponent;
 use galaxyui::ui_components::components::UiComponentStyles;
 use galaxyui::WeakModelHandle;
 use galaxyui::{AppContext, Element, ModelHandle, SingletonEntity, TypedActionView, ViewContext};
+use settings::Setting as _;
 
 impl TerminalView {
     /// Returns a reference to the focus handle if one has been set.

app/src/terminal/view/plugin_instructions_block.rs

@@ -1,6 +1,5 @@
 use std::iter;
 
-use pathfinder_geometry::vector::vec2f;
 use galaxyui::clipboard::ClipboardContent;
 use galaxyui::elements::{
     Border, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
@@ -11,9 +10,10 @@ use galaxyui::fonts::{Properties, Weight};
 use galaxyui::{
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
 };
+use pathfinder_geometry::vector::vec2f;
 
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 use galaxyui::elements::FormattedTextElement;
+use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 
 use crate::ai::blocklist::code_block::{
     render_code_block_plain, CodeBlockOptions, CodeSnippetButtonHandles,

app/src/terminal/view/shared_session/adapter.rs

@@ -16,14 +16,14 @@ use crate::terminal::view::{TerminalAction, TerminalView};
 use crate::terminal::view::throttle;
 use crate::ui_components::icons::Icon;
 use chrono::{DateTime, Local};
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{elements::MouseStateHandle, ModelHandle, ViewContext, ViewHandle};
+use galaxyui::{AppContext, Element};
 use markdown_parser::FormattedTextFragment;
 use session_sharing_protocol::common::{ParticipantId, ParticipantList, Role, SessionId};
 use session_sharing_protocol::sharer::SessionSourceType;
 use std::collections::{HashMap, HashSet};
 use std::time::Duration;
-use galaxy_core::features::FeatureFlag;
-use galaxyui::{elements::MouseStateHandle, ModelHandle, ViewContext, ViewHandle};
-use galaxyui::{AppContext, Element};
 
 /// The kind of shared session this is.
 pub enum Kind {

app/src/terminal/view/shared_session/conversation_ended_tombstone_view.rs

@@ -12,10 +12,10 @@ use crate::ui_components::blended_colors;
 use crate::util::time_format::human_readable_precise_duration;
 use crate::view_components::action_button::{ActionButton, PrimaryTheme};
 use crate::workspace::WorkspaceAction;
-use std::path::Path;
 #[cfg(not(target_family = "wasm"))]
 use galaxy_cli::agent::Harness;
 use galaxy_core::paths::home_relative_path;
+use std::path::Path;
 
 #[cfg(not(target_family = "wasm"))]
 use crate::ai::ambient_agents::AmbientAgentTask;

app/src/terminal/view/shared_session/test_utils.rs

@@ -1,7 +1,7 @@
-use session_sharing_protocol::common::{ParticipantId, ParticipantList, SessionId};
-use session_sharing_protocol::sharer::SessionSourceType;
 use galaxyui::platform::WindowStyle;
 use galaxyui::{App, SingletonEntity, ViewHandle};
+use session_sharing_protocol::common::{ParticipantId, ParticipantList, SessionId};
+use session_sharing_protocol::sharer::SessionSourceType;
 
 use crate::auth::UserUid;
 use crate::editor::ReplicaId;

app/src/terminal/view/shared_session/view_impl.rs

@@ -33,6 +33,8 @@ use crate::{
 };
 use crate::{send_telemetry_from_ctx, TelemetryEvent};
 use chrono::{DateTime, Local};
+use galaxy_core::features::FeatureFlag;
+use galaxyui::r#async::Timer;
 use itertools::Itertools;
 use session_sharing_protocol::common::{
     ParticipantId, Role, RoleRequestId, RoleRequestResponse, SessionId, WindowSize,
@@ -40,10 +42,7 @@ use session_sharing_protocol::common::{
 use session_sharing_protocol::sharer::SessionSourceType;
 use session_sharing_protocol::sharer::{RoleUpdateReason, SessionEndedReason};
 use session_sharing_protocol::viewer::RoleUpdatedReason;
-use galaxy_core::features::FeatureFlag;
-use galaxyui::r#async::Timer;
 
-use settings::Setting as _;
 use galaxy_core::semantic_selection::SemanticSelection;
 use galaxy_core::ui::appearance::Appearance;
 use galaxyui::clipboard::ClipboardContent;
@@ -53,6 +52,7 @@ use galaxyui::ui_components::components::UiComponent;
 use galaxyui::units::IntoLines;
 use galaxyui::{Element, SingletonEntity};
 use galaxyui::{ModelHandle, ViewContext};
+use settings::Setting as _;
 
 use crate::menu::Event as MenuEvent;
 

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

@@ -5,8 +5,8 @@ use crate::pane_group::PaneHeaderCustomAction;
 use crate::terminal::view::{TerminalAction, TerminalView};
 use crate::ui_components::icons::Icon;
 
-use session_sharing_protocol::common::{Role, WindowSize};
 use galaxyui::{elements::MouseStateHandle, ViewContext, ViewHandle};
+use session_sharing_protocol::common::{Role, WindowSize};
 
 use super::adapter::Participant;
 

app/src/terminal/view/ssh_file_upload.rs

@@ -1,9 +1,5 @@
 use std::{collections::HashMap, path::Path};
 
-use itertools::Itertools;
-use markdown_parser::{
-    FormattedText, FormattedTextFragment, FormattedTextHeader, FormattedTextLine,
-};
 use galaxy_core::command::ExitCode;
 use galaxy_core::ui::{appearance::Appearance, color::blend::Blend as _};
 use galaxyui::{
@@ -14,6 +10,10 @@ use galaxyui::{
     ui_components::{button::ButtonVariant, components::UiComponent as _},
     Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use itertools::Itertools;
+use markdown_parser::{
+    FormattedText, FormattedTextFragment, FormattedTextHeader, FormattedTextLine,
+};
 
 use crate::{
     terminal::ssh::util::InteractiveSshCommand, ui_components::buttons::icon_button,

app/src/terminal/view/ssh_remote_server_choice_view.rs

@@ -16,7 +16,6 @@
 //!
 //! Dismissing the block (on click of either option, or when the session is
 //! deregistered) is the parent's responsibility.
-use settings::Setting;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxyui::{
     elements::{
@@ -28,6 +27,7 @@ use galaxyui::{
     AppContext, Element, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
     ViewHandle,
 };
+use settings::Setting;
 
 use crate::{
     ai::blocklist::{

app/src/terminal/view/testing.rs

@@ -32,8 +32,8 @@ impl TerminalView {
         restored_blocks: Option<&[SerializedBlockListItem]>,
         ctx: &mut ViewContext<Self>,
     ) -> Self {
-        use pathfinder_geometry::vector::vec2f;
         use galaxyui::units::{IntoPixels as _, Pixels};
+        use pathfinder_geometry::vector::vec2f;
 
         use crate::{
             server::server_api::ServerApiProvider,

app/src/terminal/view/tooltips.rs

@@ -53,8 +53,8 @@ fn open_in_warp_tooltip(
         settings::CodeSettings, util::file::external_editor::EditorSettings,
         util::tooltips::should_show_open_in_warp_link,
     };
-    use settings::Setting as _;
     use galaxyui::SingletonEntity;
+    use settings::Setting as _;
 
     if !should_show_open_in_warp_link(&path, app) {
         return None;

app/src/terminal/view/use_agent_footer/mod.rs

@@ -24,8 +24,6 @@ use galaxyui::r#async::Timer;
 use crate::code_review::diff_state::GitDeltaPreference;
 use crate::code_review::telemetry_event::CodeReviewPaneEntrypoint;
 use anyhow::anyhow;
-use parking_lot::FairMutex;
-use pathfinder_color::ColorU;
 use galaxy_core::{
     features::FeatureFlag,
     report_error, send_telemetry_from_ctx,
@@ -38,6 +36,8 @@ use galaxy_core::{
         theme::{color::internal_colors, Fill as ThemeFill},
     },
 };
+use parking_lot::FairMutex;
+use pathfinder_color::ColorU;
 
 use galaxyui::{
     elements::{

app/src/terminal/view/use_agent_footer/mod_test.rs

@@ -1,8 +1,8 @@
 use std::rc::Rc;
 
-use session_sharing_protocol::sharer::SessionSourceType;
 use galaxy_core::settings::Setting as _;
 use galaxyui::{App, AppContext, SingletonEntity, ViewContext};
+use session_sharing_protocol::sharer::SessionSourceType;
 
 use crate::{
     ai::{

app/src/terminal/view/use_agent_footer/warpify_footer.rs

@@ -1,6 +1,5 @@
 use std::sync::Arc;
 
-use parking_lot::FairMutex;
 use galaxyui::prelude::Empty;
 use galaxyui::{
     elements::{
@@ -8,6 +7,7 @@ use galaxyui::{
     },
     AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle,
 };
+use parking_lot::FairMutex;
 
 use crate::{
     terminal::view::{TerminalModel, PADDING_LEFT},
@@ -78,7 +78,9 @@ impl WarpifyFooterView {
             WarpificationMode::Ssh { .. } => {
                 ("Galaxyize SSH session", "terminal:warpify_ssh_session")
             }
-            WarpificationMode::Subshell { .. } => ("Galaxyize subshell", "terminal:warpify_subshell"),
+            WarpificationMode::Subshell { .. } => {
+                ("Galaxyize subshell", "terminal:warpify_subshell")
+            }
         };
         self.warpify_button.update(ctx, |button, ctx| {
             button.set_label(label, ctx);

app/src/terminal/view/zero_state_block.rs

@@ -1,4 +1,3 @@
-use settings::Setting;
 use galaxy_core::{report_if_error, ui::Icon};
 use galaxyui::{
     elements::{
@@ -15,6 +14,7 @@ use galaxyui::{
     },
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use settings::Setting;
 
 use crate::{
     ai::blocklist::agent_view::{