Fix cursor focus and selection in input box, add AWS env var warning box, and remove AWS Bedrock login banner

app/src/workspace/action.rs

@@ -2,14 +2,14 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use session_sharing_protocol::common::SessionId;
-use ui_components::lightbox;
 use galaxy_util::path::LineAndColumnArg;
 use galaxyui::accessibility::AccessibilityVerbosity;
 use galaxyui::geometry::rect::RectF;
 use galaxyui::geometry::vector::Vector2F;
 use galaxyui::platform::Cursor;
 use galaxyui::{EntityId, WeakViewHandle, WindowId};
+use session_sharing_protocol::common::SessionId;
+use ui_components::lightbox;
 
 use super::global_actions::{ForkFromExchange, ForkedConversationDestination};
 use super::tab_settings::{
@@ -884,6 +884,7 @@ impl From<&WorkspaceAction> for LoginGatedFeature {
 
 impl WorkspaceAction {
     pub fn blocked_for_anonymous_user(&self) -> bool {
+        use WorkspaceAction::*;
         matches!(
             self,
             ImportToTeamDrive
@@ -900,6 +901,7 @@ impl WorkspaceAction {
     /// actions directly, rather than using _, so we're forced to make a conscious decision for each
     /// of them, rather than following some default.
     pub fn should_save_app_state_on_action(&self) -> bool {
+        use WorkspaceAction::*;
         match self {
             #[cfg(not(target_family = "wasm"))]
             ContinueConversationLocally { .. } => true,

app/src/workspace/close_session_confirmation_dialog.rs

@@ -1,4 +1,3 @@
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::elements::{
     Align, ChildAnchor, Container, MouseStateHandle, OffsetPositioning, ParentAnchor,
@@ -12,6 +11,7 @@ use galaxyui::ui_components::text::Span;
 use galaxyui::{
     AppContext, Element, Entity, EntityId, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use pathfinder_geometry::vector::vec2f;
 
 use crate::appearance::Appearance;
 use crate::pane_group::PaneId;

app/src/workspace/delete_conversation_confirmation_dialog.rs

@@ -1,4 +1,3 @@
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::elements::{
     Align, ChildAnchor, ChildView, Container, OffsetPositioning, ParentAnchor, ParentOffsetBounds,
@@ -9,6 +8,7 @@ use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
 use galaxyui::{
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
 };
+use pathfinder_geometry::vector::vec2f;
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::appearance::Appearance;

app/src/workspace/header_toolbar_editor.rs

@@ -1,6 +1,6 @@
-use settings::Setting as _;
 use galaxyui::keymap::FixedBinding;
 use galaxyui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
+use settings::Setting as _;
 
 use crate::chip_configurator::{
     render_chip_editor_modal, render_chip_editor_sections, ChipConfigurator,

app/src/workspace/hoa_onboarding/hoa_onboarding_flow.rs

@@ -1,10 +1,5 @@
 use std::path::PathBuf;
 
-use markdown_parser::{
-    FormattedText, FormattedTextFragment, FormattedTextLine, FormattedTextStyles, Hyperlink,
-};
-use pathfinder_color::ColorU;
-use settings::Setting;
 use galaxy_core::ui::theme::phenomenon::PhenomenonStyle;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::elements::{
@@ -25,6 +20,8 @@ use galaxyui::{
 use markdown_parser::{
     FormattedText, FormattedTextFragment, FormattedTextLine, FormattedTextStyles, Hyperlink,
 };
+use pathfinder_color::ColorU;
+use settings::Setting;
 
 use super::{tab_config_step, welcome_banner};
 use crate::appearance::Appearance;

app/src/workspace/hoa_onboarding/mod.rs

@@ -2,9 +2,9 @@ mod hoa_onboarding_flow;
 mod tab_config_step;
 mod welcome_banner;
 
-pub use hoa_onboarding_flow::{init, HoaOnboardingFlow, HoaOnboardingFlowEvent, HoaOnboardingStep};
 use galaxy_core::user_preferences::GetUserPreferences;
 use galaxyui::AppContext;
+pub use hoa_onboarding_flow::{init, HoaOnboardingFlow, HoaOnboardingFlowEvent, HoaOnboardingStep};
 
 const HAS_COMPLETED_HOA_ONBOARDING_KEY: &str = "HasCompletedHOAOnboarding";
 

app/src/workspace/hoa_onboarding/welcome_banner.rs

@@ -1,4 +1,3 @@
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::theme::phenomenon::PhenomenonStyle;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::assets::asset_cache::AssetSource;
@@ -9,6 +8,7 @@ use galaxyui::elements::{
 };
 use galaxyui::fonts::{Properties, Weight};
 use galaxyui::{Element, ViewHandle};
+use pathfinder_geometry::vector::vec2f;
 
 use crate::appearance::Appearance;
 use crate::ui_components::icons::Icon;

app/src/workspace/lightbox_view.rs

@@ -1,5 +1,11 @@
 use std::sync::Arc;
 
+use galaxyui::assets::asset_cache::{AssetCache, AssetSource, AssetState};
+use galaxyui::image_cache::ImageType;
+use galaxyui::keymap::{FixedBinding, Keystroke};
+use galaxyui::{
+    AppContext, BlurContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext,
+};
 pub use lightbox::LightboxImage;
 use pathfinder_geometry::vector::Vector2F;
 use ui_components::{lightbox, Component as _};

app/src/workspace/mod.rs

@@ -29,6 +29,7 @@ pub use action::{
     TabContextMenuAnchor, VerticalTabsPaneContextMenuTarget, WorkspaceAction,
 };
 pub use active_session::ActiveSession;
+use galaxy_core::context_flag::ContextFlag;
 pub use global_actions::{
     ForkAIConversationParams, ForkFromExchange, ForkedConversationDestination,
 };
@@ -38,9 +39,9 @@ pub use view::{
     Workspace, NEW_SESSION_MENU_BUTTON_POSITION_ID, NEW_TAB_BUTTON_POSITION_ID,
     PANEL_HEADER_HEIGHT, TAB_BAR_HEIGHT, TOTAL_TAB_BAR_HEIGHT, WORKSPACE_PADDING,
 };
-use galaxy_core::context_flag::ContextFlag;
 use warpui::accessibility::AccessibilityVerbosity;
 use warpui::elements::DropTargetData;
+use warpui::keymap::macros::id;
 use warpui::keymap::{BindingDescription, EditableBinding, FixedBinding};
 use warpui::AppContext;
 
@@ -1486,7 +1487,6 @@ pub fn init(app: &mut AppContext) {
 }
 
 fn add_open_setting_pages_as_editable_binding(app: &mut AppContext) {
-
     // Add the ability to open setting modals to the command palette.
     app.register_editable_bindings([
         EditableBinding::new(
@@ -1630,7 +1630,6 @@ fn add_open_setting_pages_as_editable_binding(app: &mut AppContext) {
 }
 
 fn add_overflow_menu_items_as_editable_binding(app: &mut AppContext) {
-
     // Add the ability to open all overflow menu items to the command palette.
     app.register_editable_bindings([
         EditableBinding::new(

app/src/workspace/native_modal.rs

@@ -1,5 +1,5 @@
-use settings::Setting as _;
 use galaxy_core::ui::theme::Fill;
+use settings::Setting as _;
 use warpui::elements::{Align, Container, Empty, Flex, MouseStateHandle, ParentElement};
 use warpui::fonts::Weight;
 use warpui::keymap::FixedBinding;

app/src/workspace/one_time_modal_model.rs

@@ -1,9 +1,9 @@
 use std::future::Future;
 
 use ai::api_keys::ApiKeyManager;
-use settings::Setting as _;
 use galaxy_core::features::FeatureFlag;
 use galaxy_core::send_telemetry_from_ctx;
+use settings::Setting as _;
 use warp_util::sync::Condition;
 use warpui::{AppContext, Entity, ModelContext, SingletonEntity, WindowId};
 
@@ -627,7 +627,6 @@ impl OneTimeModalModel {
         &mut self,
         ctx: &mut ModelContext<Self>,
     ) -> bool {
-
         // Check if already dismissed
         let general_settings = GeneralSettings::as_ref(ctx);
         if *general_settings

app/src/workspace/rewind_confirmation_dialog.rs

@@ -1,4 +1,3 @@
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::color::coloru_with_opacity;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::elements::{
@@ -14,6 +13,7 @@ use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles
 use galaxyui::{
     AppContext, Element, Entity, EntityId, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use pathfinder_geometry::vector::vec2f;
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::agent::AIAgentExchangeId;

app/src/workspace/tab_settings.rs

@@ -1,9 +1,13 @@
 use std::collections::HashMap;
 use std::path::Path;
 
-use settings::macros::define_settings_group;
-use settings::{RespectUserSyncSetting, SupportedPlatforms, SyncToCloud};
 use galaxy_core::ui::theme::AnsiColorIdentifier;
+use settings::macros::define_settings_group;
+use settings::{
+    ChangeEventReason, RespectUserSyncSetting, Setting, SupportedPlatforms, SyncToCloud,
+};
+
+use super::header_toolbar_item::HeaderToolbarItemKind;
 
 #[derive(
     Default,
@@ -259,7 +263,6 @@ pub enum HeaderToolbarChipSelection {
 
 impl HeaderToolbarChipSelection {
     pub fn left_items(&self) -> Vec<super::header_toolbar_item::HeaderToolbarItemKind> {
-        use super::header_toolbar_item::HeaderToolbarItemKind;
         match self {
             Self::Default => HeaderToolbarItemKind::default_left(),
             Self::Custom { left, .. } => left.clone(),

app/src/workspace/tab_settings_tests.rs

@@ -1,4 +1,5 @@
 use settings::Setting;
+use warpui::{App, SingletonEntity};
 
 use super::*;
 use crate::test_util::settings::initialize_settings_for_tests;

app/src/workspace/util.rs

@@ -1,6 +1,6 @@
-use serde::{Deserialize, Serialize};
 use galaxyui::elements::MouseStateHandle;
 use galaxyui::{AppContext, EntityId, SingletonEntity, ViewContext, ViewHandle, WindowId};
+use serde::{Deserialize, Serialize};
 
 use super::OneTimeModalModel;
 use crate::appearance::Appearance;

app/src/workspace/view.rs

@@ -51,22 +51,6 @@ use autoupdate::AutoupdateStage;
 #[cfg(target_os = "macos")]
 use command::blocking::Command;
 use futures::Future;
-use itertools::Itertools;
-use lazy_static::lazy_static;
-pub(crate) use onboarding::OnboardingTutorial;
-use parking_lot::FairMutex;
-use pathfinder_color::ColorU;
-use pathfinder_geometry::rect::RectF;
-#[cfg(feature = "local_fs")]
-use repo_metadata::repositories::DetectedRepositories;
-#[cfg(feature = "local_fs")]
-use repo_metadata::RemoteRepositoryIdentifier;
-#[cfg(all(target_os = "macos", feature = "crash_reporting"))]
-use sentry::protocol::{Attachment, AttachmentType};
-use serde_json;
-use session_sharing_protocol::common::SessionId as SharedSessionId;
-#[cfg(target_family = "wasm")]
-use url::Url;
 use galaxy_cli::agent::Harness;
 use galaxy_core::context_flag::ContextFlag;
 use galaxy_core::execution_mode::AppExecutionMode;
@@ -84,7 +68,8 @@ use galaxy_util::path::{user_friendly_path, LineAndColumnArg};
 #[cfg(all(feature = "local_fs", not(target_family = "wasm")))]
 use galaxy_util::standardized_path::StandardizedPath;
 use galaxyui::accessibility::{
-    AccessibilityContent, AccessibilityVerbosity, ActionAccessibilityContent, WarpA11yRole,
+    AccessibilityContent, AccessibilityVerbosity, ActionAccessibilityContent, GalaxyA11yRole,
+    WarpA11yRole,
 };
 use galaxyui::clipboard::ClipboardContent;
 #[cfg(target_family = "wasm")]
@@ -115,6 +100,22 @@ use galaxyui::{
     AppContext, Entity, EntityId, FocusContext, ModelHandle, SingletonEntity, TypedActionView,
     UpdateModel, UpdateView, View, ViewAsRef, ViewContext, ViewHandle, WeakViewHandle, WindowId,
 };
+use itertools::Itertools;
+use lazy_static::lazy_static;
+pub(crate) use onboarding::OnboardingTutorial;
+use parking_lot::FairMutex;
+use pathfinder_color::ColorU;
+use pathfinder_geometry::rect::RectF;
+#[cfg(feature = "local_fs")]
+use repo_metadata::repositories::DetectedRepositories;
+#[cfg(feature = "local_fs")]
+use repo_metadata::RemoteRepositoryIdentifier;
+#[cfg(all(target_os = "macos", feature = "crash_reporting"))]
+use sentry::protocol::{Attachment, AttachmentType};
+use serde_json;
+use session_sharing_protocol::common::SessionId as SharedSessionId;
+#[cfg(target_family = "wasm")]
+use url::Url;
 
 use self::vertical_tabs::telemetry::{VerticalTabsDisplayOption, VerticalTabsTelemetryEvent};
 use self::vertical_tabs::{
@@ -266,7 +267,8 @@ use crate::drive::settings::{WarpDriveSettings, WarpDriveSettingsChangedEvent};
 use crate::drive::workflows::arguments::ArgumentsState;
 use crate::drive::workflows::modal::{WorkflowModal, WorkflowModalEvent};
 use crate::drive::{
-    CloudObjectTypeAndId, DriveObjectType, DrivePanel, DrivePanelEvent, OpenWarpDriveObjectSettings,
+    CloudObjectTypeAndId, DriveObjectType, DrivePanel, DrivePanelEvent,
+    OpenGalaxyDriveObjectSettings,
 };
 use crate::editor::{
     EditorView, Event as EditorEvent, PropagateAndNoOpNavigationKeys, SingleLineEditorOptions,
@@ -372,9 +374,9 @@ use crate::tab_configs::{
     NewWorktreeModal, NewWorktreeModalEvent, TabConfigParamsModal, TabConfigParamsModalEvent,
 };
 use crate::terminal::alt_screen_reporting::AltScreenReporting;
-use crate::terminal::available_shells::AvailableShell;
 #[cfg(target_os = "windows")]
 use crate::terminal::available_shells::AvailableShells;
+use crate::terminal::available_shells::{AvailableShell, AvailableShells};
 use crate::terminal::block_list_viewport::InputMode;
 #[cfg(not(target_family = "wasm"))]
 use crate::terminal::cli_agent_sessions::plugin_manager::{plugin_manager_for, PluginModalKind};
@@ -404,6 +406,7 @@ use crate::terminal::session_settings::{
     SessionSettingsChangedEvent, WorkingDirectoryMode,
 };
 use crate::terminal::settings::{SpacingMode, TerminalSettings};
+use crate::terminal::shared_session::manager::Manager;
 use crate::terminal::shared_session::SharedSessionActionSource;
 use crate::terminal::shell::ShellType;
 use crate::terminal::view::ambient_agent::{AuthSecretFtuxView, AuthSecretFtuxViewEvent};
@@ -444,7 +447,7 @@ use crate::user_config::{
     find_unused_worktree_config_path, materialize_default_worktree_config, sanitize_toml_base_name,
     tab_configs_dir,
 };
-use crate::user_config::{WarpConfig, WarpConfigUpdateEvent};
+use crate::user_config::{GalaxyConfig, GalaxyConfigUpdateEvent};
 use crate::util::bindings::{
     keybinding_name_to_display_string, keybinding_name_to_keystroke, trigger_to_keystroke,
 };
@@ -2696,12 +2699,12 @@ impl Workspace {
                         });
                     }
                 }
-                WarpConfigUpdateEvent::ModelConfigs => {
+                GalaxyConfigUpdateEvent::ModelConfigs => {
                     toast_stack.update(ctx, |toast_stack, ctx| {
                         toast_stack.dismiss_toasts_by_prefix("model_config_error:", ctx);
                     });
                 }
-                WarpConfigUpdateEvent::ModelConfigErrors(errors) => {
+                GalaxyConfigUpdateEvent::ModelConfigErrors(errors) => {
                     let home_dir = dirs::home_dir();
                     for error in errors {
                         let object_id = format!("model_config_error:{}", error.file_path.display());
@@ -24202,7 +24205,7 @@ impl TypedActionView for Workspace {
                 send_telemetry_from_ctx!(TelemetryEvent::DragAndDropTabGroup, ctx);
                 ctx.notify();
             }
-            OpenWarpDrive => {
+            OpenGalaxyDrive => {
                 if WarpDriveSettings::is_warp_drive_enabled(ctx) {
                     self.open_left_panel_view(&LeftPanelAction::WarpDrive, ctx);
                 }
@@ -25601,7 +25604,7 @@ impl TypedActionView for Workspace {
                     self.open_left_panel_view(&LeftPanelAction::ProjectExplorer, ctx);
                 }
             }
-            ToggleWarpDrive => {
+            ToggleGalaxyDrive => {
                 if WarpDriveSettings::is_warp_drive_enabled(ctx) {
                     let is_showing =
                         self.left_panel_view.as_ref(ctx).active_view() == ToolPanelView::WarpDrive;

app/src/workspace/view/auto_handoff_sleep_modal/view.rs

@@ -1,6 +1,6 @@
+use galaxy_core::ui::theme::Fill;
 use pathfinder_color::ColorU;
 use pathfinder_geometry::vector::vec2f;
-use galaxy_core::ui::theme::Fill;
 use warpui::assets::asset_cache::AssetSource;
 use warpui::elements::{
     Align, CacheOption, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius,

app/src/workspace/view/conversation_list/item.rs

@@ -1,4 +1,3 @@
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::color::coloru_with_opacity;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxy_util::path::user_friendly_path;
@@ -16,6 +15,7 @@ use galaxyui::text_layout::TextStyle;
 use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
 use galaxyui::ui_components::text_input::TextInput;
 use galaxyui::{AppContext, SingletonEntity, ViewHandle};
+use pathfinder_geometry::vector::vec2f;
 
 use crate::ai::active_agent_views_model::ActiveAgentViewsModel;
 use crate::ai::agent_conversations_model::{

app/src/workspace/view/conversation_list/view.rs

@@ -2,7 +2,6 @@ use std::collections::{HashMap, HashSet};
 use std::ops::Range;
 use std::sync::{Arc, Mutex};
 
-use pathfinder_geometry::vector::Vector2F;
 use galaxy_core::features::FeatureFlag;
 use galaxy_core::send_telemetry_from_ctx;
 use galaxy_core::ui::Icon;
@@ -23,6 +22,7 @@ use galaxyui::{
     AppContext, BlurContext, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View,
     ViewContext, ViewHandle, WindowId,
 };
+use pathfinder_geometry::vector::Vector2F;
 
 use super::view_model::{ConversationEntry, ConversationListViewModel};
 use crate::ai::active_agent_views_model::{ActiveAgentViewsModel, ConversationOrTaskId};

app/src/workspace/view/conversation_list/view_model.rs

@@ -143,7 +143,7 @@ impl ConversationListViewModel {
                 })
                 .collect();
 
-            matched_items.sort_by(|a, b| b.0.cmp(&a.0));
+            matched_items.sort_by_key(|b| std::cmp::Reverse(b.0));
             self.filtered_items = matched_items.into_iter().map(|(_, item)| item).collect();
         }
     }

app/src/workspace/view/free_ai_removal_modal.rs

@@ -1,11 +1,11 @@
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-use serde_json::{json, Value};
-use strum_macros::{EnumDiscriminants, EnumIter};
 use galaxy_core::send_telemetry_from_ctx;
 use galaxy_core::telemetry::{EnablementState, TelemetryEvent, TelemetryEventDesc};
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::Fill;
+use pathfinder_color::ColorU;
+use pathfinder_geometry::vector::vec2f;
+use serde_json::{json, Value};
+use strum_macros::{EnumDiscriminants, EnumIter};
 use warpui::elements::{
     Align, Border, ChildAnchor, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
     DropShadow, Flex, FormattedTextElement, MainAxisAlignment, MainAxisSize, MouseStateHandle,

app/src/workspace/view/global_search/model.rs

@@ -5,8 +5,11 @@ use std::path::PathBuf;
 use anyhow::Result;
 use futures::StreamExt as _;
 use galaxy_ripgrep::search::{Match as RipgrepMatch, Submatch};
+use galaxy_util::local_or_remote_path::LocalOrRemotePath;
+use galaxy_util::remote_path::RemotePath;
+use galaxy_util::standardized_path::StandardizedPath;
 use galaxyui::r#async::SpawnedFutureHandle;
-use galaxyui::{Entity, ModelContext, ModelSpawner};
+use galaxyui::{Entity, ModelContext, ModelSpawner, SingletonEntity};
 use instant::Instant;
 use num_traits::SaturatingSub;
 use regex::escape;
@@ -15,10 +18,6 @@ use remote_server::proto::RipgrepSearchSuccess;
 use remote_server::protocol::RequestId;
 use remote_server::HostId;
 use string_offset::ByteOffset;
-use galaxy_util::local_or_remote_path::LocalOrRemotePath;
-use galaxy_util::remote_path::RemotePath;
-use galaxy_util::standardized_path::StandardizedPath;
-use galaxyui::{Entity, ModelContext, ModelSpawner, SingletonEntity};
 
 use crate::workspace::view::global_search::view::GlobalSearchEvent;
 use crate::workspace::view::global_search::{GlobalSearchMatch, SearchConfig};

app/src/workspace/view/global_search/view.rs

@@ -6,10 +6,6 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use async_channel::Sender;
-use instant::Instant;
-use pathfinder_geometry::vector::vec2f;
-use remote_server::HostId;
-use string_offset::{ByteOffset, CharCounter};
 use galaxy_core::r#async::debounce;
 use galaxy_core::send_telemetry_from_ctx;
 use galaxy_core::ui::appearance::Appearance;
@@ -39,6 +35,10 @@ use galaxyui::{
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
     ViewHandle, WeakViewHandle,
 };
+use instant::Instant;
+use pathfinder_geometry::vector::vec2f;
+use remote_server::HostId;
+use string_offset::{ByteOffset, CharCounter};
 
 use crate::code::icon_from_file_path;
 use crate::coding_panel_enablement_state::CodingPanelEnablementState;

app/src/workspace/view/launch_modal/mod.rs

@@ -4,10 +4,6 @@ pub mod oz_launch;
 
 use std::collections::HashMap;
 
-use markdown_parser::{parse_markdown, FormattedText, FormattedTextLine};
-// Re-export slide types for convenience
-pub use oz_launch::OzLaunchSlide;
-use pathfinder_color::ColorU;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::assets::asset_cache::AssetSource;
@@ -26,6 +22,10 @@ use galaxyui::ui_components::components::UiComponent;
 use galaxyui::{
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
 };
+use markdown_parser::{parse_markdown, FormattedText, FormattedTextLine};
+// Re-export slide types for convenience
+pub use oz_launch::OzLaunchSlide;
+use pathfinder_color::ColorU;
 
 use crate::settings::PrivacySettings;
 use crate::ui_components::blended_colors;

app/src/workspace/view/launch_modal/oz_launch.rs

@@ -1,6 +1,6 @@
 use asset_macro::bundled_or_fetched_asset;
-use markdown_parser::{FormattedTextFragment, FormattedTextLine};
 use galaxy_core::send_telemetry_from_ctx;
+use markdown_parser::{FormattedTextFragment, FormattedTextLine};
 use warpui::assets::asset_cache::AssetSource;
 use warpui::{AppContext, SingletonEntity};
 

app/src/workspace/view/onboarding.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::Arc;
 
-use onboarding::{ProjectOnboardingSettings, SelectedSettings};
 use galaxy_core::execution_mode::AppExecutionMode;
+use onboarding::{ProjectOnboardingSettings, SelectedSettings};
 use warpui::{SingletonEntity as _, ViewContext};
 
 use crate::pane_group::{NewTerminalOptions, PanesLayout};

app/src/workspace/view/openwarp_launch_modal/view.rs

@@ -1,8 +1,3 @@
-use markdown_parser::{
-    FormattedText, FormattedTextFragment, FormattedTextLine, FormattedTextStyles, Hyperlink,
-};
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
 use galaxy_core::ui::theme::phenomenon::PhenomenonStyle;
 use galaxy_core::ui::theme::Fill;
 use galaxyui::assets::asset_cache::AssetSource;
@@ -20,6 +15,8 @@ use galaxyui::{
 use markdown_parser::{
     FormattedText, FormattedTextFragment, FormattedTextLine, FormattedTextStyles, Hyperlink,
 };
+use pathfinder_color::ColorU;
+use pathfinder_geometry::vector::vec2f;
 
 use crate::appearance::Appearance;
 use crate::ui_components::icons::Icon;

app/src/workspace/view/orchestration_launch_modal/view.rs

@@ -1,6 +1,6 @@
+use galaxy_core::ui::theme::Fill;
 use pathfinder_color::ColorU;
 use pathfinder_geometry::vector::vec2f;
-use galaxy_core::ui::theme::Fill;
 use warpui::assets::asset_cache::AssetSource;
 use warpui::elements::{
     Align, CacheOption, ChildAnchor, ChildView, Clipped, ConstrainedBox, Container, CornerRadius,

app/src/workspace/view/right_panel.rs

@@ -2,10 +2,10 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
 use dunce::canonicalize;
-use itertools::Itertools;
-use pathfinder_color::ColorU;
 use galaxy_core::features::FeatureFlag;
 use galaxy_core::ui::Icon;
+use itertools::Itertools;
+use pathfinder_color::ColorU;
 use warp_util::path::LineAndColumnArg;
 use warpui::elements::{
     resizable_state_handle, ChildAnchor, ChildView, Clipped, ConstrainedBox, Container,

app/src/workspace/view/tab_grouping.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 
-use itertools::{Either, Itertools};
 use galaxy_core::features::FeatureFlag;
+use itertools::{Either, Itertools};
 use warpui::{EntityId, UpdateView, ViewContext};
 
 use super::{group_member_indices, Workspace};

app/src/workspace/view/vertical_tabs.rs

@@ -5,18 +5,14 @@ use std::collections::HashMap;
 use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex};
 
-use languages::language_by_local_filename;
-use pathfinder_color::ColorU;
-use pathfinder_geometry::rect::RectF;
-use pathfinder_geometry::vector::{vec2f, Vector2F};
-use settings::Setting as _;
 use galaxy_core::context_flag::ContextFlag;
-use galaxy_core::telemetry::TelemetryEvent as _;
 use galaxy_core::ui::color::blend::Blend;
 use galaxy_core::ui::color::coloru_with_opacity;
 use galaxy_core::ui::theme::color::internal_colors;
-use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill as WarpThemeFill, WarpTheme};
-use galaxy_core::ui::Icon as WarpIcon;
+use galaxy_core::ui::theme::{
+    AnsiColorIdentifier, Fill as GalaxyThemeFill, Fill as WarpThemeFill, GalaxyTheme, WarpTheme,
+};
+use galaxy_core::ui::{Icon as GalaxyIcon, Icon as WarpIcon};
 use galaxyui::elements::{
     resizable_state_handle, Border, ChildAnchor, Clipped, ClippedScrollStateHandle,
     ClippedScrollable, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
@@ -34,6 +30,11 @@ use galaxyui::text_layout::ClipConfig;
 use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
 use galaxyui::ui_components::text_input::TextInput;
 use galaxyui::{AppContext, EntityId, SingletonEntity, ViewHandle, WindowId};
+use languages::language_by_local_filename;
+use pathfinder_color::ColorU;
+use pathfinder_geometry::rect::RectF;
+use pathfinder_geometry::vector::{vec2f, Vector2F};
+use settings::Setting as _;
 
 use super::{render_group_member_icon_collage, select_unique_pane_kinds};
 use crate::ai::agent::conversation::{ConversationStatus, StatusColorStyle};

app/src/workspace/view/vertical_tabs_tests.rs

@@ -1,9 +1,9 @@
 use std::path::PathBuf;
 
-use pathfinder_geometry::rect::RectF;
-use pathfinder_geometry::vector::Vector2F;
 use galaxyui::elements::PositionedElementOffsetBounds;
 use galaxyui::EntityId;
+use pathfinder_geometry::rect::RectF;
+use pathfinder_geometry::vector::Vector2F;
 
 use super::{
     branch_label_display, coalesce_summary_branch_entries, code_detail_kind_label,

app/src/workspace/view_tests.rs

@@ -2,6 +2,8 @@ use std::collections::HashMap;
 
 use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
 use ai::project_context::model::ProjectContextModel;
+#[cfg(feature = "local_fs")]
+use galaxy_files::FileModel;
 use pane_group::{NotebookPane, PaneState, SplitPaneState, TerminalPaneId};
 use repo_metadata::repositories::DetectedRepositories;
 use repo_metadata::watcher::DirectoryWatcher;
@@ -15,8 +17,6 @@ use tempfile::TempDir;
 use terminal::shared_session::permissions_manager::SessionPermissionsManager;
 use terminal::view::ActiveSessionState;
 use warp_editor::editor::NavigationKey;
-#[cfg(feature = "local_fs")]
-use warp_files::FileModel;
 use warpui::platform::WindowStyle;
 use warpui::{AddSingletonModel, App, ViewHandle};
 use watcher::HomeDirectoryWatcher;
@@ -185,7 +185,7 @@ pub(crate) fn initialize_app(app: &mut App) {
     app.add_singleton_model(|_| DetectedRepositories::default());
     app.add_singleton_model(HomeDirectoryWatcher::new_for_test);
     app.add_singleton_model(DirectoryWatcher::new);
-    app.add_singleton_model(GalaxyManagedPathsWatcher::new_for_testing);
+    app.add_singleton_model(WarpManagedPathsWatcher::new_for_testing);
     app.add_singleton_model(FileMCPWatcher::new);
     app.add_singleton_model(|_| FileBasedMCPManager::default());