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

app/src/terminal/view/action.rs

@@ -4,6 +4,11 @@ use std::path::PathBuf;
 
 use ai::skills::SkillReference;
 use command_corrections::Correction;
+use galaxy_util::user_input::UserInput;
+use galaxyui::elements::HyperlinkUrl;
+use galaxyui::event::ModifiersState;
+use galaxyui::units::Lines;
+use galaxyui::EntityId;
 pub use onboarding::OnboardingIntention;
 use pathfinder_geometry::vector::Vector2F;
 use session_sharing_protocol::common::Role;

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

@@ -1,7 +1,7 @@
-use warp_cli::agent::Harness;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxy_core::ui::theme::Fill;
+use warp_cli::agent::Harness;
 use warp_editor::editor::NavigationKey;
 use warpui::elements::{
     Border, ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,

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

@@ -1,7 +1,7 @@
-use warp_cli::agent::Harness;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxy_core::ui::theme::Fill;
+use warp_cli::agent::Harness;
 use warp_editor::editor::NavigationKey;
 use warp_managed_secrets::client::SecretOwner;
 use warpui::elements::{

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

@@ -1,12 +1,12 @@
 use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
-use pathfinder_geometry::vector::vec2f;
-use settings::Setting as _;
-use warp_cli::agent::Harness;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxy_core::ui::theme::Fill;
+use pathfinder_geometry::vector::vec2f;
+use settings::Setting as _;
+use warp_cli::agent::Harness;
 use warp_managed_secrets::client::SecretOwner;
 use warpui::elements::{
     Border, ChildAnchor, ChildView, OffsetPositioning, ParentAnchor, ParentElement as _,

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

@@ -4,13 +4,12 @@ mod setup_command;
 mod setup_command_text;
 
 pub use entry::*;
+use galaxyui::prelude::Container;
+use galaxyui::{AppContext, Element, ModelHandle};
 pub use harness_session_header::*;
 pub use setup_command::*;
 pub use setup_command_text::*;
 
-use galaxyui::prelude::Container;
-use galaxyui::{AppContext, Element, ModelHandle};
-
 use super::AmbientAgentViewModel;
 use crate::ai::blocklist::block::view_impl::{
     WithContentItemSpacing, CONTENT_ITEM_VERTICAL_MARGIN,

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;
 use galaxy_core::ui::Icon;
@@ -14,6 +13,7 @@ use galaxyui::{
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
     ViewHandle, WeakModelHandle,
 };
+use settings::Setting;
 
 use super::super::{AmbientAgentViewModelEvent, Status};
 use crate::ai::agent::conversation::ConversationStatus;

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::prelude::{Container, Empty, MouseStateHandle};
@@ -8,6 +7,7 @@ use galaxyui::scene::{CornerRadius, Radius};
 use galaxyui::{
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use parking_lot::FairMutex;
 
 use crate::ai::agent::icons::{failed_icon, yellow_running_icon};
 use crate::ai::blocklist::inline_action::inline_action_header::{

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

@@ -3,7 +3,6 @@
 //! This view is displayed as an overlay when users first try to use cloud agent mode
 //! and need to create an environment.
 
-use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill};
 use galaxyui::elements::new_scrollable::SingleAxisConfig;
 use galaxyui::elements::{
@@ -12,7 +11,10 @@ use galaxyui::elements::{
     NewScrollable, ParentElement, Radius, Text,
 };
 use galaxyui::fonts::{Properties, Weight};
-use galaxyui::{AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle};
+use galaxyui::{
+    AppContext, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
+};
+use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 
 use crate::ai::ambient_agents::github_auth_url::{AuthSource, GithubAuthRedirectTarget};
 use crate::ai::request_usage_model::AMBIENT_AGENT_TRIAL_CREDIT_THRESHOLD;

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::{
     Border, ConstrainedBox, Container, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize,
@@ -6,6 +5,7 @@ use galaxyui::elements::{
 };
 use galaxyui::fonts::{Properties, Weight};
 use galaxyui::Element;
+use pathfinder_color::ColorU;
 
 use crate::ui_components::blended_colors;
 

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

@@ -4,8 +4,6 @@
 
 use std::sync::Arc;
 
-use pathfinder_geometry::vector::vec2f;
-use settings::Setting as _;
 use galaxy_cli::agent::Harness;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;
@@ -18,6 +16,8 @@ use galaxyui::{
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
     ViewHandle,
 };
+use pathfinder_geometry::vector::vec2f;
+use settings::Setting as _;
 
 use crate::ai::blocklist::agent_view::agent_input_footer::AgentInputButtonTheme;
 use crate::ai::cloud_agent_settings::CloudAgentSettings;

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

@@ -1,8 +1,5 @@
 use std::sync::Arc;
 
-use pathfinder_color::ColorU;
-use pathfinder_geometry::vector::vec2f;
-use settings::Setting as _;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxy_core::ui::theme::Fill;
@@ -14,6 +11,9 @@ use galaxyui::fonts::{Properties, Weight};
 use galaxyui::{
     AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext, ViewHandle,
 };
+use pathfinder_color::ColorU;
+use pathfinder_geometry::vector::vec2f;
+use settings::Setting as _;
 
 use crate::ai::blocklist::inline_action::orchestration_controls::ORCHESTRATION_WARP_WORKER_HOST;
 use crate::ai::cloud_agent_settings::CloudAgentSettings;

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

@@ -6,8 +6,8 @@ use galaxy_core::ui::Icon;
 use galaxyui::elements::shimmering_text::ShimmeringTextStateHandle;
 use galaxyui::elements::{
     Align, Border, ConstrainedBox, Container, CrossAxisAlignment, Element, Expanded, Flex,
-    FormattedTextElement, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement,
-    SelectableArea, SelectionHandle, Text,
+    FormattedTextElement, HyperlinkLens, MainAxisAlignment, MainAxisSize, MouseStateHandle,
+    ParentElement, SelectableArea, SelectionHandle, Text,
 };
 use galaxyui::fonts::{Properties, Weight};
 use galaxyui::prelude::{CornerRadius, Radius};
@@ -15,6 +15,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

@@ -25,6 +25,8 @@ pub use block::*;
 pub use first_time_setup::{FirstTimeCloudAgentSetupView, FirstTimeCloudAgentSetupViewEvent};
 pub use footer::{render_error_footer, render_loading_footer};
 use galaxy_core::features::FeatureFlag;
+use galaxyui::geometry::vector::Vector2F;
+use galaxyui::{AppContext, ModelHandle, ViewHandle, WindowId};
 pub use harness_selector::{HarnessSelector, HarnessSelectorAction, HarnessSelectorEvent};
 pub use host_selector::{
     Host, HostSelector, HostSelectorAction, HostSelectorEvent, NakedHeaderButtonTheme,
@@ -42,8 +44,6 @@ pub use model_selector::{
 pub use progress::{render_progress, ProgressProps, ProgressStep, ProgressStepState};
 pub use progress_ui_state::AmbientAgentProgressUIState;
 pub use tips::{get_cloud_mode_tips, CloudModeTip};
-use galaxyui::geometry::vector::Vector2F;
-use galaxyui::{AppContext, ModelHandle, ViewHandle, WindowId};
 
 use crate::ai::blocklist::agent_view::{AgentViewController, AgentViewState};
 use crate::pane_group::TerminalViewResources;

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

@@ -3,12 +3,11 @@ use std::time::Duration;
 use galaxy_cli::agent::Harness;
 use galaxy_core::features::FeatureFlag;
 use galaxy_core::send_telemetry_from_ctx;
+use galaxy_terminal::model::BlockId;
 use galaxyui::r#async::{SpawnedFutureHandle, Timer};
-use galaxyui::{Entity, EntityId, ModelContext, SingletonEntity};
+use galaxyui::{AppContext, Entity, EntityId, ModelContext, SingletonEntity};
 use instant::Instant;
 use session_sharing_protocol::common::SessionId;
-use galaxy_terminal::model::BlockId;
-use galaxyui::{AppContext, Entity, EntityId, ModelContext, SingletonEntity};
 
 use super::AmbientAgentProgressUIState;
 use crate::ai::active_agent_views_model::ActiveAgentViewsModel;

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

@@ -1,7 +1,5 @@
 use std::sync::Arc;
 
-use pathfinder_geometry::vector::vec2f;
-use settings::Setting as _;
 use galaxy_cli::agent::Harness;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::theme::color::internal_colors;
@@ -15,6 +13,8 @@ use galaxyui::{
     AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View,
     ViewContext, ViewHandle,
 };
+use pathfinder_geometry::vector::vec2f;
+use settings::Setting as _;
 
 use crate::ai::blocklist::agent_view::agent_input_footer::AgentInputButtonTheme;
 use crate::ai::cloud_agent_settings::CloudAgentSettings;

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

@@ -1,13 +1,13 @@
 //! [`TerminalView`]-specific implementation for ambient agent functionality.
 
-use galaxy_cli::agent::Harness;
-use galaxy_terminal::model::BlockId;
 use std::cell::Cell;
 use std::rc::Rc;
 
+use galaxy_cli::agent::Harness;
 use galaxy_core::features::FeatureFlag;
 use galaxy_core::send_telemetry_from_ctx;
 use galaxy_core::ui::appearance::Appearance;
+use galaxy_terminal::model::BlockId;
 use galaxyui::elements::Align;
 use galaxyui::prelude::{Empty, Vector2F};
 use galaxyui::{

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

@@ -8,12 +8,12 @@
 
 mod warpify;
 
-pub use warpify::*;
 use galaxyui::elements::{
     ConstrainedBox, Container, CornerRadius, Hoverable, MouseState, MouseStateHandle,
     ParentElement, Radius, Stack,
 };
 use galaxyui::Element;
+pub use warpify::*;
 
 use crate::themes::theme::GalaxyTheme;
 

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

@@ -1,4 +1,3 @@
-use pathfinder_color::ColorU;
 use galaxyui::elements::{
     Align, Container, CrossAxisAlignment, Flex, MouseStateHandle, ParentElement, Shrinkable,
 };
@@ -7,6 +6,7 @@ use galaxyui::keymap::Keystroke;
 use galaxyui::ui_components::button::ButtonVariant;
 use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
 use galaxyui::Element;
+use pathfinder_color::ColorU;
 
 use super::render_block_banner;
 use crate::appearance::Appearance;

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::{
     Border, Container, Flex, MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Text,
@@ -8,6 +7,7 @@ use galaxyui::platform::Cursor;
 use galaxyui::ui_components::button::{ButtonVariant, TextAndIcon, TextAndIconAlignment};
 use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
 use galaxyui::{AppContext, Element, Entity, SingletonEntity, View, ViewContext};
+use pathfinder_geometry::vector::vec2f;
 
 use crate::cloud_object::model::persistence::{CloudModel, CloudModelEvent};
 use crate::drive::CloudObjectTypeAndId;

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

@@ -1,5 +1,5 @@
-use pathfinder_color::ColorU;
 use galaxy_core::ui::theme::Fill;
+use pathfinder_color::ColorU;
 use warpui::elements::{
     ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, MouseStateHandle,
     ParentElement, Radius, Shrinkable,

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

@@ -5,8 +5,6 @@ use std::path::PathBuf;
 #[cfg(feature = "local_tty")]
 use std::sync::mpsc::SyncSender;
 
-#[cfg(not(target_family = "wasm"))]
-use warp_cli::agent::Harness;
 #[cfg(feature = "local_tty")]
 use galaxyui::geometry::vector::Vector2F;
 #[cfg(not(target_family = "wasm"))]
@@ -16,6 +14,8 @@ use galaxyui::ModelHandle;
 use galaxyui::ViewContext;
 #[cfg(not(target_family = "wasm"))]
 use galaxyui::{SingletonEntity, View, ViewHandle};
+#[cfg(not(target_family = "wasm"))]
+use warp_cli::agent::Harness;
 
 use super::TerminalView;
 #[cfg(not(target_family = "wasm"))]

app/src/terminal/view/init.rs

@@ -78,7 +78,6 @@ fn init_overlapping_keybindings(app: &mut AppContext) {
 
 /// Register keybindings for [`TerminalView`] actions.
 pub fn init(app: &mut AppContext) {
-
     app.register_binding_validator::<TerminalView>(is_binding_pty_compliant);
 
     init_overlapping_keybindings(app);
@@ -1105,7 +1104,6 @@ pub fn init(app: &mut AppContext) {
 
 /// Registers bindings related to input modes.
 fn register_input_mode_bindings(app: &mut AppContext) {
-
     // A context predicate that matches when the input mode bindings are
     // available for use. Disabled when a CLI agent session is active — the
     // Warp agent should not be tagged into a CLI agent's command, and the

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

@@ -1,5 +1,3 @@
-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::{
@@ -12,6 +10,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;
 
 use crate::appearance::Appearance;
 use crate::ui_components::icons::Icon;

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

@@ -4,11 +4,11 @@ pub mod model;
 use std::path::{Path, PathBuf};
 
 use ai::index::full_source_code_embedding::manager::CodebaseIndexManager;
+use galaxy_core::ui::theme::Fill;
 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 galaxy_core::ui::theme::Fill;
 use warpui::elements::{
     Border, ChildView, Container, CrossAxisAlignment, Empty, Flex, MouseStateHandle, ParentElement,
     Text,

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

@@ -3,11 +3,11 @@ 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 galaxy_util::local_or_remote_path::LocalOrRemotePath;
 use galaxyui::{Entity, ModelContext, SingletonEntity as _};
 use lsp::supported_servers::LSPServerType;
 #[cfg(not(target_family = "wasm"))]
 use repo_metadata::repositories::DetectedRepositories;
-use galaxy_util::local_or_remote_path::LocalOrRemotePath;
 
 use crate::ai::persisted_workspace::PersistedWorkspace;
 use crate::settings::CodeSettings;

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

@@ -21,15 +21,6 @@ pub use alias_expansion::*;
 pub use anonymous_user_ai_sign_up::*;
 pub use aws_bedrock_login::*;
 pub use aws_cli_not_installed::*;
-pub use notifications_discovery::*;
-pub use notifications_error::*;
-pub use open_in_warp::*;
-pub use passive_code_diff::*;
-use pathfinder_color::ColorU;
-pub use session_state::*;
-pub use shared_sessions::*;
-pub use shell_process_terminated::*;
-pub use vim_mode::*;
 use galaxyui::elements::{
     Align, Clipped, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, Icon,
     MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, SavePosition,
@@ -39,6 +30,15 @@ use galaxyui::fonts::{FamilyId, Properties, Weight};
 use galaxyui::ui_components::button::ButtonVariant;
 use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
 use galaxyui::Element;
+pub use notifications_discovery::*;
+pub use notifications_error::*;
+pub use open_in_warp::*;
+pub use passive_code_diff::*;
+use pathfinder_color::ColorU;
+pub use session_state::*;
+pub use shared_sessions::*;
+pub use shell_process_terminated::*;
+pub use vim_mode::*;
 
 pub use self::prompt_suggestions::*;
 use crate::appearance::Appearance;

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

@@ -1,8 +1,7 @@
-use galaxyui::{elements::MouseStateHandle, notification::RequestPermissionsOutcome, Element};
-use serde::Serialize;
 use galaxyui::elements::MouseStateHandle;
 use galaxyui::notification::RequestPermissionsOutcome;
 use galaxyui::Element;
+use serde::Serialize;
 
 use super::{
     render_inline_block_list_banner, InlineBannerButtonState, InlineBannerCloseButton,

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

@@ -1,8 +1,7 @@
-use galaxyui::{elements::MouseStateHandle, Element};
-use serde::Serialize;
 use galaxyui::elements::MouseStateHandle;
 use galaxyui::notification::NotificationSendError;
 use galaxyui::Element;
+use serde::Serialize;
 
 use super::{
     render_inline_block_list_banner, InlineBannerButtonState, InlineBannerCloseButton,

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

@@ -1,10 +1,10 @@
 use std::rc::Rc;
 
-use pathfinder_geometry::vector::vec2f;
-use serde::Serialize;
 use galaxy_core::channel::ChannelState;
 use galaxy_core::features::FeatureFlag;
 use galaxy_core::ui::theme::color::internal_colors::{neutral_2, neutral_3};
+use pathfinder_geometry::vector::vec2f;
+use serde::Serialize;
 use warpui::elements::{
     ChildAnchor, ChildView, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Empty,
     Fill, Flex, HighlightedHyperlink, Hoverable, Icon, MainAxisAlignment, MainAxisSize,

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

@@ -1,3 +1,4 @@
+use galaxyui::{Entity, ModelContext, SingletonEntity};
 use settings::Setting;
 
 use crate::settings::{AISettings, AISettingsChangedEvent};
@@ -22,7 +23,7 @@ impl ByoLlmAuthBannerSessionState {
 
         // Subscribe to changes in the permanent dismissal setting
         ctx.subscribe_to_model(&AISettings::handle(ctx), |state, _, event, ctx| {
-            if let AISettingsChangedEvent::AwsBedrockLoginBannerDismissed { .. } = event {
+            if let AISettingsChangedEvent::BedrockLoginBannerDismissed { .. } = event {
                 let permanently_dismissed = *AISettings::as_ref(ctx)
                     .bedrock_login_banner_dismissed
                     .value();

app/src/terminal/view/load_ai_conversation.rs

@@ -4,14 +4,14 @@ use std::rc::Rc;
 use std::sync::Arc;
 
 use chrono::{DateTime, Local};
+use galaxy_core::channel::ChannelState;
+use galaxy_core::features::FeatureFlag;
+use galaxyui::units::IntoPixels;
+use galaxyui::{EntityId, ModelHandle, SingletonEntity, ViewContext};
 use itertools::Itertools;
 use prost::Message;
 use vec1::Vec1;
-use galaxy_core::channel::ChannelState;
-use galaxy_core::features::FeatureFlag;
 use warp_multi_agent_api as api;
-use galaxyui::units::IntoPixels;
-use galaxyui::{EntityId, ModelHandle, SingletonEntity, ViewContext};
 
 use super::blocklist_filter::exchanges_for_blocklist;
 use super::DEFAULT_AI_BLOCK_HEIGHT;
@@ -951,6 +951,8 @@ impl TerminalView {
             autoexecute_override: None,
             last_event_sequence: None,
             pinned: false,
+            progressive_summary: None,
+            messages_summarized_up_to: 0,
         };
 
         // We already early-return for empty `tasks` above, so the strict

app/src/terminal/view/open_in_warp.rs

@@ -2,17 +2,17 @@ use std::collections::HashSet;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
-use itertools::Itertools;
-use lazy_static::lazy_static;
-use settings::Setting as _;
 use galaxy_completer::completer::TopLevelCommandCaseSensitivity;
 use galaxy_completer::parsers::classify_command;
 use galaxy_completer::parsers::hir::{Command, Expression};
 use galaxy_completer::parsers::simple::all_parsed_commands;
 use galaxy_completer::signatures::CommandRegistry;
 use galaxy_util::path::EscapeChar;
-use galaxyui::accessibility::{AccessibilityContent, ActionAccessibilityContent, WarpA11yRole};
+use galaxyui::accessibility::{AccessibilityContent, ActionAccessibilityContent, GalaxyA11yRole};
 use galaxyui::{SingletonEntity, ViewContext};
+use itertools::Itertools;
+use lazy_static::lazy_static;
+use settings::Setting as _;
 
 use super::{Event, InlineBannerItem, InlineBannerType, TerminalView};
 #[cfg(feature = "local_fs")]

app/src/terminal/view/pane_impl.rs

@@ -1,7 +1,7 @@
 //! This module contains the implementation of `BackingView` for `TerminalView`, as well as
 //! business logic for integrating the terminal view with the pane infra (`crate::pane_group`).
-use settings::Setting as _;
 use galaxy_core::context_flag::ContextFlag;
+use settings::Setting as _;
 use warpui::elements::{
     ConstrainedBox, CrossAxisAlignment, Empty, Flex, MainAxisAlignment, MainAxisSize,
     ParentElement, Shrinkable,

app/src/terminal/view/plugin_instructions_block.rs

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

app/src/terminal/view/queued_prompts_panel.rs

@@ -8,11 +8,11 @@
 //! completion, which the host uses to submit or update the input editor.
 use std::collections::HashMap;
 
+use galaxy_core::features::FeatureFlag;
+use galaxy_core::ui::theme::color::internal_colors;
 use pathfinder_color::ColorU;
 use pathfinder_geometry::rect::RectF;
 use pathfinder_geometry::vector::vec2f;
-use galaxy_core::features::FeatureFlag;
-use galaxy_core::ui::theme::color::internal_colors;
 use warpui::elements::new_scrollable::{NewScrollable, ScrollableAppearance, SingleAxisConfig};
 use warpui::elements::{
     Border, ChildAnchor, ChildView, Clipped, ClippedScrollStateHandle, ConstrainedBox, Container,

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

@@ -5,13 +5,11 @@ use std::time::Duration;
 
 use chrono::{DateTime, Local};
 use galaxy_core::features::FeatureFlag;
-use galaxyui::{elements::MouseStateHandle, ModelHandle, ViewContext, ViewHandle};
-use galaxyui::{AppContext, Element};
+use galaxyui::elements::MouseStateHandle;
+use galaxyui::{AppContext, Element, ModelHandle, ViewContext, ViewHandle};
 use markdown_parser::FormattedTextFragment;
 use session_sharing_protocol::common::{ParticipantId, ParticipantList, Role, SessionId};
 use session_sharing_protocol::sharer::SessionSourceType;
-use galaxyui::elements::MouseStateHandle;
-use galaxyui::{AppContext, Element, ModelHandle, ViewContext, ViewHandle};
 
 use super::sharer::Sharer;
 use super::viewer::Viewer;

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

@@ -279,6 +279,7 @@ fn server_conversation_metadata(
             token_usage: vec![],
             tool_usage_metadata: Default::default(),
             context_window_segments: Vec::new(),
+            ..Default::default()
         },
         metadata: server_metadata(creator_uid),
         creator: None,

app/src/terminal/view/shared_session/sharer/mod.rs

@@ -1,9 +1,9 @@
 pub mod inactivity_modal;
 use async_channel::Sender;
-use inactivity_modal::InactivityModal;
 use galaxyui::elements::MouseStateHandle;
 use galaxyui::r#async::SpawnedFutureHandle;
 use galaxyui::{SingletonEntity, ViewContext, ViewHandle};
+use inactivity_modal::InactivityModal;
 
 use crate::terminal::shared_session::settings::SharedSessionSettings;
 use crate::terminal::TerminalView;

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

@@ -1,6 +1,9 @@
 //! [`TerminalView`]-specific implementation for shared sessions.
 
 use chrono::{DateTime, Local};
+use galaxy_core::features::FeatureFlag;
+use galaxy_core::semantic_selection::SemanticSelection;
+use galaxy_core::ui::appearance::Appearance;
 use itertools::Itertools;
 use session_sharing_protocol::common::{
     ParticipantId, ParticipantList, ParticipantPresenceUpdate, Role, RoleRequestId,
@@ -9,9 +12,6 @@ use session_sharing_protocol::common::{
 use session_sharing_protocol::sharer::{RoleUpdateReason, SessionEndedReason, SessionSourceType};
 use session_sharing_protocol::viewer::RoleUpdatedReason;
 use settings::Setting as _;
-use galaxy_core::features::FeatureFlag;
-use galaxy_core::semantic_selection::SemanticSelection;
-use galaxy_core::ui::appearance::Appearance;
 use warpui::clipboard::ClipboardContent;
 use warpui::elements::MouseStateHandle;
 use warpui::platform::Cursor;

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

@@ -632,6 +632,7 @@ fn server_conversation_metadata(
             token_usage: vec![],
             tool_usage_metadata: Default::default(),
             context_window_segments: Vec::new(),
+            ..Default::default()
         },
         metadata: ServerMetadata {
             uid: ServerId::default(),

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

@@ -1,6 +1,6 @@
-use session_sharing_protocol::common::{Role, WindowSize};
 use galaxyui::elements::MouseStateHandle;
 use galaxyui::{ViewContext, ViewHandle};
+use session_sharing_protocol::common::{Role, WindowSize};
 
 use super::adapter::Participant;
 use crate::menu::{Menu, MenuItem, MenuItemFields};

app/src/terminal/view/shell_terminated_banner.rs

@@ -4,7 +4,7 @@ use std::cell::RefCell;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::builder::UiBuilder;
 use galaxy_core::ui::theme::color::internal_colors;
-use galaxy_core::ui::theme::WarpTheme;
+use galaxy_core::ui::theme::GalaxyTheme;
 use galaxyui::clipboard::ClipboardContent;
 use galaxyui::elements::*;
 use galaxyui::text_layout::ClipConfig;

app/src/terminal/view/ssh_file_upload.rs

@@ -1,10 +1,6 @@
 use std::collections::HashMap;
 use std::path::Path;
 
-use itertools::Itertools;
-use markdown_parser::{
-    FormattedText, FormattedTextFragment, FormattedTextHeader, FormattedTextLine,
-};
 use galaxy_core::command::ExitCode;
 use galaxy_core::ui::appearance::Appearance;
 use galaxy_core::ui::color::blend::Blend as _;
@@ -15,6 +11,10 @@ use galaxyui::elements::{
 use galaxyui::ui_components::button::ButtonVariant;
 use galaxyui::ui_components::components::UiComponent as _;
 use galaxyui::{Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
+use itertools::Itertools;
+use markdown_parser::{
+    FormattedText, FormattedTextFragment, FormattedTextHeader, FormattedTextLine,
+};
 
 use crate::terminal::ssh::util::InteractiveSshCommand;
 use crate::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::{
     Border, ChildView, Container, CornerRadius, CrossAxisAlignment, Flex, Hoverable,
@@ -28,6 +27,7 @@ use galaxyui::{
     AppContext, Element, Entity, FocusContext, SingletonEntity, TypedActionView, View, ViewContext,
     ViewHandle,
 };
+use settings::Setting;
 
 use crate::ai::blocklist::block::keyboard_navigable_buttons::{
     rich_navigation_button, KeyboardNavigableButtons,

app/src/terminal/view/ssh_remote_server_failed_banner.rs

@@ -1,13 +1,13 @@
 //! Banner shown when the remote-server binary check, installation, or connection fails on the remote host.
 //! We fall back to the existing Warpification behavior and display this banner so the user knows why advanced features are unavailable.
 
-use remote_server::transport::UserFacingError;
 use galaxy_core::ui::theme::color::internal_colors;
 use galaxy_core::ui::theme::AnsiColorIdentifier;
 use galaxyui::elements::{
     ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, Flex, Hoverable,
     MainAxisAlignment, MainAxisSize, MouseStateHandle, ParentElement, Radius, Shrinkable, Text,
 };
+use remote_server::transport::UserFacingError;
 use warpui::platform::Cursor;
 use warpui::{AppContext, Element, Entity, SingletonEntity, TypedActionView, View, ViewContext};
 

app/src/terminal/view/testing.rs

@@ -42,6 +42,7 @@ impl TerminalView {
         is_cloud_mode: bool,
         ctx: &mut ViewContext<Self>,
     ) -> Self {
+        use galaxyui::units::{IntoPixels, Pixels};
         use pathfinder_geometry::vector::vec2f;
 
         use crate::server::server_api::ServerApiProvider;

app/src/terminal/view/tooltips.rs

@@ -1,10 +1,11 @@
 //! Grid tooltips for the terminal view
 
-use pathfinder_geometry::vector::vec2f;
 use galaxyui::elements::{
     ChildAnchor, Dismiss, MouseStateHandle, OffsetPositioning, PositionedElementAnchor,
     PositionedElementOffsetBounds, Stack,
 };
+use galaxyui::SingletonEntity;
+use pathfinder_geometry::vector::vec2f;
 use warpui::{AppContext, Element, EventContext};
 
 use super::{TerminalAction, TerminalView};

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

@@ -23,8 +23,6 @@ use std::sync::{Arc, LazyLock};
 use std::time::Duration;
 
 use anyhow::anyhow;
-use parking_lot::FairMutex;
-use pathfinder_color::ColorU;
 use galaxy_core::features::FeatureFlag;
 use galaxy_core::settings::Setting;
 use galaxy_core::ui::appearance::Appearance;
@@ -35,7 +33,6 @@ use galaxy_core::ui::theme::color::internal_colors;
 use galaxy_core::ui::theme::Fill as ThemeFill;
 use galaxy_core::{report_error, send_telemetry_from_ctx};
 use galaxy_terminal::model::escape_sequences::{BRACKETED_PASTE_END, BRACKETED_PASTE_START};
-use warpify_footer::{WarpifyFooterView, WarpifyFooterViewEvent};
 use galaxyui::elements::{
     ChildView, Container, CrossAxisAlignment, Empty, Expanded, Flex, MainAxisSize, ParentElement,
 };
@@ -45,6 +42,9 @@ use galaxyui::{
     AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity, TypedActionView, View,
     ViewContext, ViewHandle,
 };
+use parking_lot::FairMutex;
+use pathfinder_color::ColorU;
+use warpify_footer::{WarpifyFooterView, WarpifyFooterViewEvent};
 
 use super::{RichContentInsertionPosition, TerminalAction, TerminalView};
 use crate::ai::blocklist::agent_view::agent_view_bg_fill;
@@ -1276,6 +1276,10 @@ pub enum UseAgentToolbarEvent {
     Warpify,
     /// User chose to use the agent.
     UseAgent,
+    StartRemoteControl {
+        scrollback_type: SharedSessionScrollbackType,
+    },
+    StopRemoteControl,
 }
 
 impl Entity for UseAgentToolbar {

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

@@ -1,11 +1,11 @@
 use std::sync::Arc;
 
-use parking_lot::FairMutex;
 use galaxyui::elements::{
     ChildView, Container, CrossAxisAlignment, Expanded, Flex, MainAxisSize, ParentElement,
 };
 use galaxyui::prelude::Empty;
 use galaxyui::{AppContext, Element, Entity, TypedActionView, View, ViewContext, ViewHandle};
+use parking_lot::FairMutex;
 
 use super::{AgentFooterButtonTheme, USE_AGENT_KEYSTROKE};
 use crate::terminal::view::{TerminalModel, PADDING_LEFT};

app/src/terminal/view/zero_state_block.rs

@@ -1,4 +1,3 @@
-use settings::Setting;
 use galaxy_core::report_if_error;
 use galaxy_core::ui::Icon;
 use galaxyui::elements::{
@@ -14,6 +13,7 @@ use galaxyui::ui_components::components::{UiComponent, UiComponentStyles};
 use galaxyui::{
     AppContext, Element, Entity, ModelHandle, SingletonEntity, TypedActionView, View, ViewContext,
 };
+use settings::Setting;
 
 use crate::ai::blocklist::agent_view::{
     AgentViewController, AgentViewControllerEvent, AgentViewEntryOrigin,