Rebrand to Galaxy, major improvements to Bedrock support, still needs some TLC though

app/src/terminal/input/agent.rs

@@ -22,10 +22,10 @@ use crate::{
     terminal::{settings::TerminalSettings, view::TerminalAction},
     BlocklistAIHistoryModel,
 };
-use warp_core::settings::Setting;
-use warp_core::ui::theme::color::internal_colors;
-use warpui::elements::Expanded;
-use warpui::{
+use galaxy_core::settings::Setting;
+use galaxy_core::ui::theme::color::internal_colors;
+use galaxyui::elements::Expanded;
+use galaxyui::{
     elements::{
         Align, AnchorPair, Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment,
         DispatchEventResult, DropTarget, Element, EventHandler, Flex, Hoverable, MainAxisSize,
@@ -600,7 +600,7 @@ impl Input {
 
 pub mod styles {
     use pathfinder_color::ColorU;
-    use warp_core::ui::theme::WarpTheme;
+    use galaxy_core::ui::theme::WarpTheme;
 
     use crate::ui_components::blended_colors;
 

app/src/terminal/input/buffer_model.rs

@@ -1,4 +1,4 @@
-use warpui::{Entity, ModelContext, ViewHandle};
+use galaxyui::{Entity, ModelContext, ViewHandle};
 
 use crate::editor::{self, EditorView, Point};
 

app/src/terminal/input/classic.rs

@@ -23,7 +23,7 @@ use crate::{
 };
 use pathfinder_geometry::vector::vec2f;
 use settings::Setting;
-use warpui::{
+use galaxyui::{
     elements::{
         Border, ChildAnchor, ChildView, Clipped, Container, DropTarget, Element, Empty, Flex,
         Hoverable, OffsetPositioning, ParentAnchor, ParentElement, ParentOffsetBounds,

app/src/terminal/input/cli_agent.rs

@@ -11,11 +11,11 @@ use crate::{
     features::FeatureFlag,
     terminal::{cli_agent_sessions::CLIAgentSessionsModel, view::TerminalAction},
 };
-use warp_core::ui::{
+use galaxy_core::ui::{
     color::{contrast::MinimumAllowedContrast, ContrastingColor},
     theme::color::internal_colors,
 };
-use warpui::{
+use galaxyui::{
     elements::{
         Border, Clipped, ConstrainedBox, Container, DispatchEventResult, DropTarget, Element,
         EventHandler, Flex, Hoverable, ParentElement, SavePosition, Stack,

app/src/terminal/input/cloud_mode_v2_history_menu.rs

@@ -1,13 +1,13 @@
 use std::collections::HashSet;
 
 use pathfinder_color::ColorU;
-use warp_core::ui::appearance::Appearance;
-use warp_core::ui::theme::color::internal_colors;
-use warp_core::ui::theme::Fill;
-use warpui::elements::{
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::theme::color::internal_colors;
+use galaxy_core::ui::theme::Fill;
+use galaxyui::elements::{
     Align, Border, ConstrainedBox, Container, CornerRadius, DropShadow, Radius, Text,
 };
-use warpui::{
+use galaxyui::{
     AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity, View, ViewContext,
     ViewHandle,
 };

app/src/terminal/input/common.rs

@@ -18,9 +18,9 @@ use crate::{
 };
 use pathfinder_geometry::vector::vec2f;
 use vim::vim::{VimMode, VimState};
-use warp_completer::completer::Description;
-use warp_core::features::FeatureFlag;
-use warpui::{
+use galaxy_completer::completer::Description;
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{
     elements::{
         AnchorPair, Border, ChildAnchor, ConstrainedBox, Container, CornerRadius,
         CrossAxisAlignment, DispatchEventResult, Element, EventHandler, Flex, OffsetPositioning,
@@ -54,17 +54,17 @@ pub(super) fn render_vim_status(vim_state: &VimState, appearance: &Appearance) -
     let theme = appearance.theme();
     let ansi_colors = theme.terminal_colors().bright;
     let icon = match vim_state.mode {
-        VimMode::Normal => Icon::VimNormalMode.to_warpui_icon(ansi_colors.green.into()),
+        VimMode::Normal => Icon::VimNormalMode.to_galaxyui_icon(ansi_colors.green.into()),
         VimMode::Insert => {
             use crate::themes::theme::Blend;
-            Icon::VimInsertMode.to_warpui_icon(
+            Icon::VimInsertMode.to_galaxyui_icon(
                 theme
                     .background()
                     .blend(&theme.foreground().with_opacity(50)),
             )
         }
-        VimMode::Visual(_) => Icon::VimVisualMode.to_warpui_icon(ansi_colors.blue.into()),
-        VimMode::Replace => Icon::VimReplaceMode.to_warpui_icon(ansi_colors.red.into()),
+        VimMode::Visual(_) => Icon::VimVisualMode.to_galaxyui_icon(ansi_colors.blue.into()),
+        VimMode::Replace => Icon::VimReplaceMode.to_galaxyui_icon(ansi_colors.red.into()),
     };
     Container::new(
         Flex::row()

app/src/terminal/input/conversations/data_source.rs

@@ -2,7 +2,7 @@
 
 use itertools::Itertools;
 use ordered_float::OrderedFloat;
-use warpui::{AppContext, Entity, ModelHandle};
+use galaxyui::{AppContext, Entity, ModelHandle};
 
 use crate::ai::blocklist::agent_view::AgentViewController;
 use crate::ai::conversation_navigation::ConversationNavigationData;

app/src/terminal/input/conversations/mod.rs

@@ -7,8 +7,8 @@ mod view;
 pub use view::{InlineConversationMenuEvent, InlineConversationMenuView};
 
 use pathfinder_color::ColorU;
-use warp_core::ui::appearance::Appearance;
-use warpui::{keymap::Keystroke, SingletonEntity};
+use galaxy_core::ui::appearance::Appearance;
+use galaxyui::{keymap::Keystroke, SingletonEntity};
 
 use crate::ai::active_agent_views_model::{ActiveAgentViewsModel, ConversationOrTaskId};
 use crate::ai::conversation_navigation::ConversationNavigationData;

app/src/terminal/input/conversations/search_item.rs

@@ -2,15 +2,15 @@
 
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::color::coloru_with_opacity;
-use warp_core::ui::theme::Fill;
-use warp_core::ui::Icon;
-use warpui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
-use warpui::fonts::{Properties, Style, Weight};
-use warpui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
-use warpui::scene::{CornerRadius, Radius};
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, SingletonEntity};
+use galaxy_core::ui::color::coloru_with_opacity;
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::Icon;
+use galaxyui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
+use galaxyui::fonts::{Properties, Style, Weight};
+use galaxyui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
+use galaxyui::scene::{CornerRadius, Radius};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, SingletonEntity};
 
 use crate::ai::active_agent_views_model::{ActiveAgentViewsModel, ConversationOrTaskId};
 use crate::ai::agent::conversation::ConversationStatus;
@@ -76,7 +76,7 @@ impl SearchItem for ConversationSearchItem {
                     .theme()
                     .sub_text_color(appearance.theme().background());
                 Container::new(
-                    ConstrainedBox::new(Icon::History.to_warpui_icon(icon_color).finish())
+                    ConstrainedBox::new(Icon::History.to_galaxyui_icon(icon_color).finish())
                         .with_width(icon_size)
                         .with_height(icon_size)
                         .finish(),

app/src/terminal/input/conversations/view.rs

@@ -3,8 +3,8 @@
 use std::collections::HashSet;
 use std::sync::LazyLock;
 
-use warpui::elements::ChildView;
-use warpui::{Element, Entity, ModelHandle, SingletonEntity, View, ViewContext, ViewHandle};
+use galaxyui::elements::ChildView;
+use galaxyui::{Element, Entity, ModelHandle, SingletonEntity, View, ViewContext, ViewHandle};
 
 use crate::ai::active_agent_views_model::ActiveAgentViewsModel;
 use crate::ai::blocklist::agent_view::AgentViewController;
@@ -200,7 +200,7 @@ impl View for InlineConversationMenuView {
         "InlineConversationMenuView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/decorations.rs

@@ -5,8 +5,8 @@ use std::{collections::HashMap, ops::Range};
 
 use settings::Setting as _;
 use string_offset::{ByteOffset, CharOffset};
-use warp_core::features::FeatureFlag;
-use warpui::{AppContext, SingletonEntity, ViewContext};
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{AppContext, SingletonEntity, ViewContext};
 
 use crate::{
     appearance::Appearance,
@@ -18,7 +18,7 @@ use crate::{
 
 use super::Input;
 
-pub use warp_completer::{
+pub use galaxy_completer::{
     completer::SuggestionTypeName, util::parse_current_commands_and_tokens, ParsedTokenData,
     ParsedTokensSnapshot,
 };

app/src/terminal/input/decorations_tests.rs

@@ -1,4 +1,4 @@
-use warpui::{text_layout::TextStyle, App};
+use galaxyui::{text_layout::TextStyle, App};
 
 use crate::{
     appearance::Appearance,
@@ -14,7 +14,7 @@ use crate::{
     },
     themes::theme::AnsiColorIdentifier,
 };
-use warp_completer::completer::SuggestionTypeName;
+use galaxy_completer::completer::SuggestionTypeName;
 
 #[test]
 fn test_decorations_with_multibyte_chars() {
@@ -45,7 +45,7 @@ fn test_decorations_with_multibyte_chars() {
                 .update(ctx, |sessions, _ctx| {
                     // Wait until external commands have been loaded.
                     let session = sessions.get(session_id).expect("session should exist");
-                    warpui::r#async::block_on(session.load_external_commands());
+                    galaxyui::r#async::block_on(session.load_external_commands());
                 });
             session_id
         });

app/src/terminal/input/inline_history/data_source.rs

@@ -24,7 +24,7 @@ use crate::terminal::model::session::SessionId;
 use chrono::{DateTime, Local};
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warpui::{AppContext, Entity, EntityId, ModelHandle, SingletonEntity};
+use galaxyui::{AppContext, Entity, EntityId, ModelHandle, SingletonEntity};
 
 #[derive(Clone, Debug)]
 pub enum AcceptHistoryItem {

app/src/terminal/input/inline_history/search_item.rs

@@ -9,15 +9,15 @@ use crate::util::time_format::format_approx_duration_from_now_utc;
 use chrono::{DateTime, Local};
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::color::coloru_with_opacity;
-use warp_core::ui::theme::Fill;
-use warp_core::ui::Icon;
-use warpui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
-use warpui::fonts::{Properties, Weight};
-use warpui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
-use warpui::scene::{CornerRadius, Radius};
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, SingletonEntity};
+use galaxy_core::ui::color::coloru_with_opacity;
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::Icon;
+use galaxyui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
+use galaxyui::scene::{CornerRadius, Radius};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, SingletonEntity};
 
 #[derive(Debug, Clone)]
 pub struct InlineHistoryItem {
@@ -123,7 +123,7 @@ impl SearchItem for InlineHistoryItem {
             HistoryItemType::Command { .. } => {
                 let icon_color = inline_styles::icon_color(appearance);
                 Container::new(
-                    ConstrainedBox::new(Icon::Terminal.to_warpui_icon(icon_color).finish())
+                    ConstrainedBox::new(Icon::Terminal.to_galaxyui_icon(icon_color).finish())
                         .with_width(icon_size)
                         .with_height(icon_size)
                         .finish(),
@@ -138,7 +138,7 @@ impl SearchItem for InlineHistoryItem {
             HistoryItemType::AIPrompt { .. } => {
                 let icon_color = inline_styles::icon_color(appearance);
                 Container::new(
-                    ConstrainedBox::new(Icon::Prompt.to_warpui_icon(icon_color).finish())
+                    ConstrainedBox::new(Icon::Prompt.to_galaxyui_icon(icon_color).finish())
                         .with_width(icon_size)
                         .with_height(icon_size)
                         .finish(),

app/src/terminal/input/inline_history/view.rs

@@ -2,11 +2,11 @@
 use std::collections::HashSet;
 
 use pathfinder_color::ColorU;
-use warp_core::ui::appearance::Appearance;
-use warp_core::ui::theme::color::internal_colors;
-use warp_core::ui::theme::Fill;
-use warpui::elements::ChildView;
-use warpui::{AppContext, Element, Entity, EntityId, ModelHandle, View, ViewContext, ViewHandle};
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::theme::color::internal_colors;
+use galaxy_core::ui::theme::Fill;
+use galaxyui::elements::ChildView;
+use galaxyui::{AppContext, Element, Entity, EntityId, ModelHandle, View, ViewContext, ViewHandle};
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::blocklist::agent_view::{AgentViewController, AgentViewControllerEvent};
@@ -518,7 +518,7 @@ impl View for InlineHistoryMenuView {
         "InlineHistoryMenuView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/inline_menu/message_bar.rs

@@ -1,8 +1,8 @@
-use warp_core::ui::appearance::Appearance;
-use warpui::elements::Element;
-use warpui::prelude::Container;
-use warpui::scene::Border;
-use warpui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
+use galaxy_core::ui::appearance::Appearance;
+use galaxyui::elements::Element;
+use galaxyui::prelude::Container;
+use galaxyui::scene::Border;
+use galaxyui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
 
 use crate::ai::blocklist::agent_view::{AgentViewController, AgentViewControllerEvent};
 use crate::terminal::input::inline_menu::model::InlineMenuModel;

app/src/terminal/input/inline_menu/message_provider.rs

@@ -1,7 +1,7 @@
 use std::marker::PhantomData;
 use std::sync::LazyLock;
 
-use warpui::{keymap::Keystroke, AppContext};
+use galaxyui::{keymap::Keystroke, AppContext};
 
 use crate::editor::{SELECT_DOWN_ACTION_NAME, SELECT_UP_ACTION_NAME};
 use crate::terminal::input::inline_menu::{

app/src/terminal/input/inline_menu/model.rs

@@ -1,7 +1,7 @@
 //! Generic model for tracking the selected item in an inline menu.
 use std::collections::HashSet;
-use warpui::elements::MouseStateHandle;
-use warpui::{Entity, ModelContext};
+use galaxyui::elements::MouseStateHandle;
+use galaxyui::{Entity, ModelContext};
 
 use crate::search::data_source::QueryFilter;
 use crate::terminal::input::inline_menu::view::InlineMenuAction;

app/src/terminal/input/inline_menu/positioning.rs

@@ -1,8 +1,8 @@
 use super::styles::{HEADER_BORDER, HEADER_ROW_HEIGHT};
 use settings::Setting as _;
 use std::collections::HashMap;
-use warp_core::features::FeatureFlag;
-use warpui::{
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{
     units::{IntoPixels, Pixels},
     AppContext, Entity, ModelContext, ModelHandle, SingletonEntity, WindowId,
 };

app/src/terminal/input/inline_menu/styles.rs

@@ -3,11 +3,11 @@
 //! This module provides common styling functions used across all inline menu
 //! implementations (models, slash commands, conversations) to ensure consistent
 //! visual design matching the Figma specifications.
-use warp_core::ui::appearance::Appearance;
-use warp_core::ui::color::blend::Blend;
-use warp_core::ui::theme::{Fill, WarpTheme};
-use warpui::color::ColorU;
-use warpui::{AppContext, SingletonEntity};
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::color::blend::Blend;
+use galaxy_core::ui::theme::{Fill, WarpTheme};
+use galaxyui::color::ColorU;
+use galaxyui::{AppContext, SingletonEntity};
 
 use crate::ai::blocklist::agent_view::agent_view_bg_fill;
 use crate::search::result_renderer::ItemHighlightState;

app/src/terminal/input/inline_menu/view.rs

@@ -3,30 +3,30 @@ use std::sync::LazyLock;
 
 use itertools::Itertools;
 use pathfinder_geometry::vector::vec2f;
-use warp_core::features::FeatureFlag;
-use warp_core::ui::appearance::Appearance;
-use warp_core::ui::color::blend::Blend;
-use warp_core::ui::theme::Fill;
-use warp_core::ui::Icon;
-use warpui::color::ColorU;
-use warpui::elements::{
+use galaxy_core::features::FeatureFlag;
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::color::blend::Blend;
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::Icon;
+use galaxyui::color::ColorU;
+use galaxyui::elements::{
     drag_resize::drag_resize_handle, ChildAnchor, Clipped, DispatchEventResult, DragResizeElement,
     DragResizeHandle, EventHandler, Expanded, Hoverable, MainAxisAlignment, MainAxisSize,
     MouseInBehavior, MouseStateHandle, OffsetPositioning, ParentAnchor, ParentElement,
     ParentOffsetBounds, ResizeEndFn, Scrollable, ScrollableElement, ScrollbarWidth,
     SizeConstraintCondition, SizeConstraintSwitch, Stack, UniformList, UniformListState,
 };
-use warpui::fonts::Weight;
-use warpui::platform::Cursor;
-use warpui::prelude::{
+use galaxyui::fonts::Weight;
+use galaxyui::platform::Cursor;
+use galaxyui::prelude::{
     Align, ChildView, ConstrainedBox, Container, CrossAxisAlignment, Empty, Flex, SavePosition,
     Text,
 };
-use warpui::scene::{Border, CornerRadius, Radius};
-use warpui::ui_components::button::ButtonVariant;
-use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use warpui::{elements::ScrollStateHandle, ModelHandle, View};
-use warpui::{
+use galaxyui::scene::{Border, CornerRadius, Radius};
+use galaxyui::ui_components::button::ButtonVariant;
+use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
+use galaxyui::{elements::ScrollStateHandle, ModelHandle, View};
+use galaxyui::{
     Action, AppContext, Element, Entity, SingletonEntity, TypedActionView, ViewContext, ViewHandle,
     WeakViewHandle,
 };
@@ -117,8 +117,8 @@ impl<A: InlineMenuAction> QueryResultRenderer<A> {
         is_selected: bool,
         app: &AppContext,
     ) -> Box<dyn Element> {
-        use warpui::elements::{DispatchEventResult, EventHandler, Hoverable};
-        use warpui::platform::Cursor;
+        use galaxyui::elements::{DispatchEventResult, EventHandler, Hoverable};
+        use galaxyui::platform::Cursor;
 
         if self.search_result.is_static_separator() {
             return self.render_inline_with_highlight_state(ItemHighlightState::Default, true, app);
@@ -175,7 +175,7 @@ impl<A: InlineMenuAction> QueryResultRenderer<A> {
         is_static_separator: bool,
         app: &AppContext,
     ) -> Box<dyn Element> {
-        use warpui::elements::{MainAxisSize, Shrinkable};
+        use galaxyui::elements::{MainAxisSize, Shrinkable};
 
         let appearance = Appearance::as_ref(app);
         let icon = self.search_result.render_icon(highlight_state, appearance);
@@ -811,7 +811,7 @@ impl<A: InlineMenuAction, T: 'static + Send + Sync> InlineMenuView<A, T> {
         let drag_indicator = Hoverable::new(self.drag_indicator_mouse_state.clone(), |_| {
             ConstrainedBox::new(
                 Icon::DragIndicator
-                    .to_warpui_icon(Fill::Solid(
+                    .to_galaxyui_icon(Fill::Solid(
                         theme.disabled_text_color(header_bg.into()).into_solid(),
                     ))
                     .finish(),
@@ -914,7 +914,7 @@ impl<A: InlineMenuAction, T: 'static + Send + Sync> InlineMenuView<A, T> {
             ScrollbarWidth::Auto,
             theme.nonactive_ui_detail().into(),
             theme.active_ui_detail().into(),
-            warpui::elements::Fill::None,
+            galaxyui::elements::Fill::None,
         )
         .with_overlayed_scrollbar()
         .finish();

app/src/terminal/input/message_bar/attached_context.rs

@@ -1,7 +1,7 @@
 //! Shared message producers for displaying attached blocks/text context.
 
-use warp_core::features::FeatureFlag;
-use warpui::keymap::Keystroke;
+use galaxy_core::features::FeatureFlag;
+use galaxyui::keymap::Keystroke;
 
 use crate::ai::blocklist::agent_view::{AgentMessageBarMouseStates, AgentViewController};
 use crate::ai::blocklist::{BlocklistAIContextModel, BlocklistAIInputModel};

app/src/terminal/input/message_bar/common.rs

@@ -1,16 +1,16 @@
 use crate::ai::blocklist::agent_view::agent_view_bg_color;
 use pathfinder_color::ColorU;
-use warp_core::ui::appearance::Appearance;
-use warp_core::ui::theme::Fill;
-use warp_core::ui::Icon;
-use warpui::elements::{
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::Icon;
+use galaxyui::elements::{
     Border, CacheOption, Clipped, Container, CornerRadius, Element, Hoverable, Image,
     ParentElement, Radius,
 };
-use warpui::platform::Cursor;
-use warpui::prelude::{Align, ConstrainedBox, CrossAxisAlignment, Flex, Text};
-use warpui::ui_components::keyboard_shortcut::keystroke_to_keys;
-use warpui::{AppContext, SingletonEntity};
+use galaxyui::platform::Cursor;
+use galaxyui::prelude::{Align, ConstrainedBox, CrossAxisAlignment, Flex, Text};
+use galaxyui::ui_components::keyboard_shortcut::keystroke_to_keys;
+use galaxyui::{AppContext, SingletonEntity};
 
 use crate::ai::blocklist::agent_view::shortcuts::render_keystroke_with_color_overrides;
 use crate::terminal;
@@ -29,7 +29,7 @@ pub fn render_standard_message_bar(
     right_element: Option<Box<dyn Element>>,
     app: &AppContext,
 ) -> Box<dyn Element> {
-    use warpui::prelude::{MainAxisAlignment, MainAxisSize};
+    use galaxyui::prelude::{MainAxisAlignment, MainAxisSize};
 
     let (left_items, right_chips): (Vec<_>, Vec<_>) = message.items.into_iter().partition(|item| {
         !matches!(
@@ -145,7 +145,7 @@ fn render_message_bar_items(items: &[MessageItem], app: &AppContext) -> Box<dyn
             }
             MessageItem::Icon { icon, color } => {
                 let icon_color = color.unwrap_or(default_font_color);
-                ConstrainedBox::new(icon.to_warpui_icon(Fill::Solid(icon_color)).finish())
+                ConstrainedBox::new(icon.to_galaxyui_icon(Fill::Solid(icon_color)).finish())
                     .with_height(styles::font_size(app))
                     .with_width(styles::font_size(app))
                     .finish()
@@ -284,7 +284,7 @@ fn render_terminal_message_items(items: &[MessageItem], app: &AppContext) -> Box
                     let rendered_key = if key_text == "⏎" {
                         ConstrainedBox::new(
                             Icon::CornerDownLeft
-                                .to_warpui_icon(Fill::Solid(keystroke_color))
+                                .to_galaxyui_icon(Fill::Solid(keystroke_color))
                                 .finish(),
                         )
                         .with_height(icon_size)
@@ -293,7 +293,7 @@ fn render_terminal_message_items(items: &[MessageItem], app: &AppContext) -> Box
                     } else if key_text == "⇧" {
                         ConstrainedBox::new(
                             Icon::ArrowBlockUp
-                                .to_warpui_icon(Fill::Solid(keystroke_color))
+                                .to_galaxyui_icon(Fill::Solid(keystroke_color))
                                 .finish(),
                         )
                         .with_height(icon_size)
@@ -349,7 +349,7 @@ fn render_terminal_message_items(items: &[MessageItem], app: &AppContext) -> Box
             }
             MessageItem::Icon { icon, color } => {
                 let icon_color = color.unwrap_or(default_text_color);
-                ConstrainedBox::new(icon.to_warpui_icon(Fill::Solid(icon_color)).finish())
+                ConstrainedBox::new(icon.to_galaxyui_icon(Fill::Solid(icon_color)).finish())
                     .with_height(icon_size)
                     .with_width(icon_size)
                     .finish()
@@ -469,8 +469,8 @@ pub fn disableable_message_item_color_overrides(
 
 pub mod styles {
     use pathfinder_color::ColorU;
-    use warp_core::ui::appearance::Appearance;
-    use warpui::{AppContext, SingletonEntity};
+    use galaxy_core::ui::appearance::Appearance;
+    use galaxyui::{AppContext, SingletonEntity};
 
     use crate::ui_components::blended_colors;
 

app/src/terminal/input/message_bar/mod.rs

@@ -6,11 +6,11 @@ use std::borrow::Cow;
 use std::sync::Arc;
 
 use pathfinder_color::ColorU;
-use warp_core::ui::Icon;
-use warpui::assets::asset_cache::AssetSource;
-use warpui::elements::MouseStateHandle;
-use warpui::keymap::Keystroke;
-use warpui::EventContext;
+use galaxy_core::ui::Icon;
+use galaxyui::assets::asset_cache::AssetSource;
+use galaxyui::elements::MouseStateHandle;
+use galaxyui::keymap::Keystroke;
+use galaxyui::EventContext;
 /// A trait for types that can produce a message based on some contextual arguments.
 ///
 /// The generic `Args` parameter allows each call site to define its own

app/src/terminal/input/message_bar/mod_tests.rs

@@ -1,6 +1,6 @@
-use warp_core::ui::Icon;
-use warpui::assets::asset_cache::AssetSource;
-use warpui::elements::MouseStateHandle;
+use galaxy_core::ui::Icon;
+use galaxyui::assets::asset_cache::AssetSource;
+use galaxyui::elements::MouseStateHandle;
 
 use super::{ChipHorizontalAlignment, MessageItem};
 

app/src/terminal/input/models/data_source.rs

@@ -2,20 +2,20 @@ use fuzzy_match::{match_indices_case_insensitive, FuzzyMatchResult};
 use itertools::Itertools;
 use markdown_parser::{FormattedText, FormattedTextFragment, FormattedTextLine};
 use ordered_float::OrderedFloat;
-use warp_core::ui::appearance::Appearance;
-use warp_core::ui::icons::Icon;
-use warp_core::ui::theme::color::internal_colors;
-use warp_core::ui::theme::Fill;
-use warpui::elements::{
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::icons::Icon;
+use galaxy_core::ui::theme::color::internal_colors;
+use galaxy_core::ui::theme::Fill;
+use galaxyui::elements::{
     ConstrainedBox, Container, CornerRadius, FormattedTextElement, Highlight, HighlightedHyperlink,
     MouseStateHandle, Radius, Text,
 };
-use warpui::fonts::{Properties, Style, Weight};
-use warpui::platform::Cursor;
-use warpui::text_layout::ClipConfig;
-use warpui::ui_components::button::ButtonVariant;
-use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
-use warpui::{AppContext, Element, Entity, EntityId, SingletonEntity as _};
+use galaxyui::fonts::{Properties, Style, Weight};
+use galaxyui::platform::Cursor;
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::ui_components::button::ButtonVariant;
+use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
+use galaxyui::{AppContext, Element, Entity, EntityId, SingletonEntity as _};
 
 use crate::ai::llms::{
     is_using_api_key_for_provider, DisableReason, LLMId, LLMInfo, LLMPreferences, LLMProvider,
@@ -35,8 +35,8 @@ use crate::terminal::input::inline_menu::{styles as inline_styles, DetailsRender
 use crate::terminal::input::message_bar::{Message, MessageItem};
 use crate::workspace::WorkspaceAction;
 use crate::workspaces::user_workspaces::UserWorkspaces;
-use warpui::keymap::Keystroke;
-use warpui::platform::OperatingSystem;
+use galaxyui::keymap::Keystroke;
+use galaxyui::platform::OperatingSystem;
 
 use super::model_spec_scores::{
     render_model_spec_header, render_model_spec_scores, CostRow, ModelSpecScoresLayout,
@@ -273,7 +273,7 @@ impl SearchItem for ModelSearchItem {
         let icon = self
             .provider_icon
             .unwrap_or(Icon::Oz)
-            .to_warpui_icon(icon_color)
+            .to_galaxyui_icon(icon_color)
             .finish();
 
         Container::new(
@@ -291,8 +291,8 @@ impl SearchItem for ModelSearchItem {
         _highlight_state: ItemHighlightState,
         app: &AppContext,
     ) -> Box<dyn Element> {
-        use warpui::elements::{Flex, ParentElement as _};
-        use warpui::prelude::CrossAxisAlignment;
+        use galaxyui::elements::{Flex, ParentElement as _};
+        use galaxyui::prelude::CrossAxisAlignment;
 
         let appearance = crate::appearance::Appearance::as_ref(app);
         let theme = appearance.theme();
@@ -332,7 +332,7 @@ impl SearchItem for ModelSearchItem {
 
         if is_using_api_key_for_provider(&self.provider, app) {
             let key_icon =
-                ConstrainedBox::new(Icon::Key.to_warpui_icon(secondary_text_color).finish())
+                ConstrainedBox::new(Icon::Key.to_galaxyui_icon(secondary_text_color).finish())
                     .with_width(font_size)
                     .with_height(font_size)
                     .finish();
@@ -412,7 +412,7 @@ impl SearchItem for ModelSearchItem {
     }
 
     fn render_details(&self, app: &AppContext) -> Option<Box<dyn Element>> {
-        use warpui::elements::{Flex, ParentElement as _};
+        use galaxyui::elements::{Flex, ParentElement as _};
 
         let appearance = crate::appearance::Appearance::as_ref(app);
         let theme = appearance.theme();
@@ -528,10 +528,10 @@ impl SearchItem for ModelSearchItem {
             .with_hyperlink_font_color(theme.accent().into_solid())
             .register_default_click_handlers_with_action_support(|hyperlink_lens, event, ctx| {
                 match hyperlink_lens {
-                    warpui::elements::HyperlinkLens::Url(url) => {
+                    galaxyui::elements::HyperlinkLens::Url(url) => {
                         ctx.open_url(url);
                     }
-                    warpui::elements::HyperlinkLens::Action(action_ref) => {
+                    galaxyui::elements::HyperlinkLens::Action(action_ref) => {
                         if let Some(action) = action_ref.as_any().downcast_ref::<WorkspaceAction>()
                         {
                             event.dispatch_typed_action(action.clone());

app/src/terminal/input/models/model_spec_scores.rs

@@ -1,12 +1,12 @@
 use pathfinder_color::ColorU;
-use warp_core::ui::theme::color::internal_colors;
-use warpui::elements::{
+use galaxy_core::ui::theme::color::internal_colors;
+use galaxyui::elements::{
     Border, ConstrainedBox, Container, CornerRadius, Expanded, Flex, MainAxisAlignment,
     MainAxisSize, ParentElement as _, Percentage, Radius, Rect, Stack, Text,
 };
-use warpui::prelude::{Align, CrossAxisAlignment};
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, SingletonEntity as _};
+use galaxyui::prelude::{Align, CrossAxisAlignment};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, SingletonEntity as _};
 
 use crate::ai::llms::LLMSpec;
 use crate::appearance::Appearance;

app/src/terminal/input/models/view.rs

@@ -2,11 +2,11 @@ use std::collections::HashSet;
 use std::sync::LazyLock;
 
 use pathfinder_color::ColorU;
-use warp_core::ui::appearance::Appearance;
-use warp_core::ui::theme::color::internal_colors;
-use warp_core::ui::theme::Fill;
-use warpui::elements::{ChildView, MainAxisSize};
-use warpui::{
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::theme::color::internal_colors;
+use galaxy_core::ui::theme::Fill;
+use galaxyui::elements::{ChildView, MainAxisSize};
+use galaxyui::{
     AppContext, Element, Entity, EntityId, ModelHandle, SingletonEntity as _, View, ViewContext,
     ViewHandle,
 };
@@ -488,7 +488,7 @@ impl View for InlineModelSelectorView {
         "InlineModelSelectorView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/plans/data_source.rs

@@ -3,7 +3,7 @@
 use fuzzy_match::match_indices_case_insensitive;
 use itertools::Itertools;
 use ordered_float::OrderedFloat;
-use warpui::{AppContext, Entity, SingletonEntity};
+use galaxyui::{AppContext, Entity, SingletonEntity};
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::document::ai_document_model::AIDocumentModel;

app/src/terminal/input/plans/mod.rs

@@ -6,7 +6,7 @@ mod view;
 pub use view::{InlinePlanMenuEvent, InlinePlanMenuView};
 
 use ai::document::AIDocumentId;
-use warpui::keymap::Keystroke;
+use galaxyui::keymap::Keystroke;
 
 use crate::ai::document::ai_document_model::AIDocumentVersion;
 use crate::terminal::input::inline_menu::{

app/src/terminal/input/plans/search_item.rs

@@ -3,13 +3,13 @@
 use ai::document::AIDocumentId;
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::theme::Fill;
-use warp_core::ui::Icon;
-use warpui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
-use warpui::fonts::{Properties, Weight};
-use warpui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, SingletonEntity};
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::Icon;
+use galaxyui::elements::{ConstrainedBox, Container, Highlight, ParentElement, Shrinkable, Text};
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::prelude::{Align, CrossAxisAlignment, Flex, MainAxisAlignment, MainAxisSize};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, SingletonEntity};
 
 use crate::ai::document::ai_document_model::{AIDocument, AIDocumentVersion};
 use crate::appearance::Appearance;
@@ -68,7 +68,7 @@ impl SearchItem for PlanSearchItem {
             .sub_text_color(appearance.theme().background());
 
         let icon = Container::new(
-            ConstrainedBox::new(Icon::Compass.to_warpui_icon(icon_color).finish())
+            ConstrainedBox::new(Icon::Compass.to_galaxyui_icon(icon_color).finish())
                 .with_width(ICON_SIZE)
                 .with_height(ICON_SIZE)
                 .finish(),

app/src/terminal/input/plans/view.rs

@@ -1,8 +1,8 @@
 //! Inline plan menu view for selecting among multiple AI document plans.
 
 use ai::document::AIDocumentId;
-use warpui::elements::ChildView;
-use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
+use galaxyui::elements::ChildView;
+use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::blocklist::agent_view::AgentViewController;
@@ -141,7 +141,7 @@ impl View for InlinePlanMenuView {
         "InlinePlanMenuView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/profiles/data_source.rs

@@ -1,6 +1,6 @@
 use fuzzy_match::match_indices_case_insensitive;
 use ordered_float::OrderedFloat;
-use warpui::{AppContext, Entity, EntityId, SingletonEntity};
+use galaxyui::{AppContext, Entity, EntityId, SingletonEntity};
 
 use crate::ai::execution_profiles::profiles::{AIExecutionProfilesModel, ClientProfileId};
 use crate::cloud_object::model::generic_string_model::StringModel;

app/src/terminal/input/profiles/search_item.rs

@@ -1,12 +1,12 @@
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::theme::Fill;
-use warp_core::ui::Icon;
-use warpui::elements::{ConstrainedBox, Container, Flex, Highlight, ParentElement as _, Text};
-use warpui::fonts::{Properties, Style, Weight};
-use warpui::prelude::CrossAxisAlignment;
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, SingletonEntity as _};
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::Icon;
+use galaxyui::elements::{ConstrainedBox, Container, Flex, Highlight, ParentElement as _, Text};
+use galaxyui::fonts::{Properties, Style, Weight};
+use galaxyui::prelude::CrossAxisAlignment;
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, SingletonEntity as _};
 
 use crate::ai::execution_profiles::profiles::ClientProfileId;
 use crate::appearance::Appearance;
@@ -81,7 +81,7 @@ impl SearchItem for ProfileSearchItem {
             ProfileSearchItemKind::Profile { .. } => Icon::Psychology,
             ProfileSearchItemKind::ManageProfiles => Icon::Gear,
         }
-        .to_warpui_icon(inline_styles::icon_color(appearance));
+        .to_galaxyui_icon(inline_styles::icon_color(appearance));
 
         Container::new(
             ConstrainedBox::new(icon.finish())

app/src/terminal/input/profiles/view.rs

@@ -1,5 +1,5 @@
-use warpui::elements::ChildView;
-use warpui::{
+use galaxyui::elements::ChildView;
+use galaxyui::{
     Element, Entity, EntityId, ModelHandle, SingletonEntity as _, View, ViewContext, ViewHandle,
 };
 
@@ -210,7 +210,7 @@ impl View for InlineProfileSelectorView {
         "InlineProfileSelectorView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/prompts/data_source.rs

@@ -1,10 +1,10 @@
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::icons::Icon;
-use warpui::elements::{ConstrainedBox, Container, Highlight, Text};
-use warpui::fonts::{Properties, Weight};
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, Entity, ModelContext, ModelHandle, SingletonEntity as _};
+use galaxy_core::ui::icons::Icon;
+use galaxyui::elements::{ConstrainedBox, Container, Highlight, Text};
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, Entity, ModelContext, ModelHandle, SingletonEntity as _};
 
 use crate::appearance::Appearance;
 use crate::cloud_object::model::persistence::CloudModel;
@@ -164,7 +164,7 @@ impl SearchItem for PromptSearchItem {
         let icon_color = inline_styles::icon_color(appearance);
         let icon_size = inline_styles::font_size(appearance);
 
-        let icon = Icon::Prompt.to_warpui_icon(icon_color).finish();
+        let icon = Icon::Prompt.to_galaxyui_icon(icon_color).finish();
 
         Container::new(
             ConstrainedBox::new(icon)
@@ -209,7 +209,7 @@ impl SearchItem for PromptSearchItem {
         &self,
         highlight_state: ItemHighlightState,
         appearance: &Appearance,
-    ) -> Option<warp_core::ui::theme::Fill> {
+    ) -> Option<galaxy_core::ui::theme::Fill> {
         inline_styles::item_background(highlight_state, appearance)
     }
 

app/src/terminal/input/prompts/view.rs

@@ -1,5 +1,5 @@
-use warpui::elements::ChildView;
-use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
+use galaxyui::elements::ChildView;
+use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
 
 use crate::ai::blocklist::agent_view::AgentViewController;
 use crate::search::data_source::Query;
@@ -119,7 +119,7 @@ impl View for InlinePromptsMenuView {
         "InlinePromptsMenuView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/repos/data_source.rs

@@ -2,7 +2,7 @@
 
 use std::path::PathBuf;
 
-use warpui::{AppContext, Entity, SingletonEntity};
+use galaxyui::{AppContext, Entity, SingletonEntity};
 
 use crate::ai::persisted_workspace::PersistedWorkspace;
 use crate::search::data_source::{Query, QueryResult};

app/src/terminal/input/repos/mod.rs

@@ -8,7 +8,7 @@ pub use view::{InlineReposMenuEvent, InlineReposMenuView};
 
 use std::path::PathBuf;
 
-use warpui::keymap::Keystroke;
+use galaxyui::keymap::Keystroke;
 
 use crate::terminal::input::inline_menu::{
     default_navigation_message_items, InlineMenuAction, InlineMenuMessageArgs, InlineMenuRowAction,

app/src/terminal/input/repos/search_item.rs

@@ -4,12 +4,12 @@ use std::path::{Path, PathBuf};
 
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::theme::{AnsiColorIdentifier, Fill};
-use warp_core::ui::Icon;
-use warpui::elements::{ConstrainedBox, Container, Highlight, Text};
-use warpui::fonts::{Properties, Weight};
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, SingletonEntity};
+use galaxy_core::ui::theme::{AnsiColorIdentifier, Fill};
+use galaxy_core::ui::Icon;
+use galaxyui::elements::{ConstrainedBox, Container, Highlight, Text};
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, SingletonEntity};
 
 use crate::appearance::Appearance;
 use crate::search::result_renderer::ItemHighlightState;
@@ -62,7 +62,7 @@ impl SearchItem for RepoSearchItem {
         let icon_size = inline_styles::font_size(appearance);
         let icon_color = inline_styles::icon_color(appearance);
 
-        let icon = ConstrainedBox::new(Icon::Folder.to_warpui_icon(icon_color).finish())
+        let icon = ConstrainedBox::new(Icon::Folder.to_galaxyui_icon(icon_color).finish())
             .with_width(icon_size)
             .with_height(icon_size)
             .finish();

app/src/terminal/input/repos/view.rs

@@ -3,8 +3,8 @@
 use std::collections::HashSet;
 use std::path::PathBuf;
 
-use warpui::elements::ChildView;
-use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
+use galaxyui::elements::ChildView;
+use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
 
 use crate::ai::blocklist::agent_view::AgentViewController;
 use crate::search::data_source::{Query, QueryFilter};
@@ -145,7 +145,7 @@ impl View for InlineReposMenuView {
         "InlineReposMenuView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/rewind/data_source.rs

@@ -5,7 +5,7 @@ use std::collections::HashSet;
 use ai::agent::action_result::RequestFileEditsResult;
 use itertools::Itertools;
 use ordered_float::OrderedFloat;
-use warpui::{AppContext, Entity, SingletonEntity};
+use galaxyui::{AppContext, Entity, SingletonEntity};
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::agent::{AIAgentActionResultType, AIAgentExchangeId, AIAgentInput};

app/src/terminal/input/rewind/mod.rs

@@ -8,7 +8,7 @@ mod view;
 pub use data_source::SelectRewindPoint;
 pub use view::{RewindMenuEvent, RewindMenuView};
 
-use warpui::keymap::Keystroke;
+use galaxyui::keymap::Keystroke;
 
 use crate::terminal::input::inline_menu::{
     default_navigation_message_items, InlineMenuAction, InlineMenuMessageArgs, InlineMenuType,

app/src/terminal/input/rewind/search_item.rs

@@ -3,16 +3,16 @@
 
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::color::coloru_with_opacity;
-use warp_core::ui::theme::Fill;
-use warp_core::ui::Icon;
-use warpui::elements::{
+use galaxy_core::ui::color::coloru_with_opacity;
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::Icon;
+use galaxyui::elements::{
     ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, ParentElement, Text,
 };
-use warpui::fonts::{Properties, Weight};
-use warpui::scene::{CornerRadius, Radius};
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, SingletonEntity};
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::scene::{CornerRadius, Radius};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, SingletonEntity};
 
 use crate::ai::agent::AIAgentExchangeId;
 use crate::appearance::Appearance;
@@ -93,7 +93,7 @@ impl SearchItem for RewindSearchItem {
         let color = icon_color(appearance);
 
         let icon = Container::new(
-            ConstrainedBox::new(Icon::ClockRewind.to_warpui_icon(color).finish())
+            ConstrainedBox::new(Icon::ClockRewind.to_galaxyui_icon(color).finish())
                 .with_width(appearance.monospace_font_size())
                 .with_height(appearance.monospace_font_size())
                 .finish(),
@@ -135,7 +135,7 @@ impl SearchItem for RewindSearchItem {
         }
 
         // Line 2: Code changes summary
-        let secondary_text_color: warpui::color::ColorU =
+        let secondary_text_color: galaxyui::color::ColorU =
             theme.sub_text_color(theme.surface_1()).into();
 
         let changes_element: Box<dyn Element> = if self.is_current {

app/src/terminal/input/rewind/view.rs

@@ -1,7 +1,7 @@
 //! View for the rewind menu.
 
-use warpui::elements::ChildView;
-use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
+use galaxyui::elements::ChildView;
+use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::agent::AIAgentExchangeId;
@@ -138,7 +138,7 @@ impl View for RewindMenuView {
         "RewindMenuView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/skills/data_source.rs

@@ -3,16 +3,16 @@ use std::path::PathBuf;
 use ai::skills::{SkillProvider, SkillReference, SkillScope};
 use fuzzy_match::{match_indices_case_insensitive, FuzzyMatchResult};
 use ordered_float::OrderedFloat;
-use warp_core::ui::icons::Icon;
-use warp_core::ui::theme::Fill;
-use warpui::elements::{
+use galaxy_core::ui::icons::Icon;
+use galaxy_core::ui::theme::Fill;
+use galaxyui::elements::{
     ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, ParentElement, Shrinkable, Text,
 };
-use warpui::fonts::{Properties, Weight};
-use warpui::keymap::Keystroke;
-use warpui::scene::{CornerRadius, Radius};
-use warpui::text_layout::ClipConfig;
-use warpui::{
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::keymap::Keystroke;
+use galaxyui::scene::{CornerRadius, Radius};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{
     AppContext, Element, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity as _,
 };
 
@@ -266,11 +266,11 @@ impl SearchItem for SkillSearchItem {
 
         // Use icon_override if set (e.g. Figma skills), otherwise derive from provider.
         let icon = if let Some(override_icon) = self.icon_override {
-            override_icon.to_warpui_icon(icon_color).finish()
+            override_icon.to_galaxyui_icon(icon_color).finish()
         } else {
             self.provider
                 .icon()
-                .to_warpui_icon(self.provider.icon_fill(icon_color))
+                .to_galaxyui_icon(self.provider.icon_fill(icon_color))
                 .finish()
         };
 

app/src/terminal/input/skills/view.rs

@@ -1,6 +1,6 @@
 use ai::skills::SkillReference;
-use warpui::elements::ChildView;
-use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
+use galaxyui::elements::ChildView;
+use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
 
 use crate::ai::blocklist::agent_view::AgentViewController;
 use crate::search::data_source::Query;
@@ -14,7 +14,7 @@ use crate::terminal::input::suggestions_mode_model::{
     InputSuggestionsModeEvent, InputSuggestionsModeModel,
 };
 use crate::terminal::model::session::active_session::ActiveSession;
-use warpui::EntityId;
+use galaxyui::EntityId;
 
 #[derive(Debug, Clone)]
 pub enum InlineSkillSelectorEvent {
@@ -156,7 +156,7 @@ impl View for InlineSkillSelectorView {
         "InlineSkillSelectorView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/slash_command_model.rs

@@ -1,7 +1,7 @@
 use ai::skills::SkillReference;
 use input_classifier::InputType;
-use warp_core::features::FeatureFlag;
-use warpui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
+use galaxy_core::features::FeatureFlag;
+use galaxyui::{AppContext, Entity, ModelContext, ModelHandle, SingletonEntity};
 
 use crate::ai::blocklist::{BlocklistAIInputEvent, BlocklistAIInputModel};
 use crate::ai::skills::SkillManager;

app/src/terminal/input/slash_command_model_tests.rs

@@ -4,7 +4,7 @@ use crate::search::slash_command_menu::static_commands::commands;
 use crate::settings::AISettings;
 use crate::terminal::input::tests::{add_window_with_bootstrapped_terminal, initialize_app};
 use settings::Setting as _;
-use warpui::{App, SingletonEntity as _};
+use galaxyui::{App, SingletonEntity as _};
 
 #[test]
 fn test_parse_slash_command_handles_argument_rules() {

app/src/terminal/input/slash_commands/data_source/mod.rs

@@ -3,7 +3,7 @@ mod zero_state;
 
 use ai::skills::SkillProvider;
 pub(crate) use saved_prompts::*;
-use warp_core::features::FeatureFlag;
+use galaxy_core::features::FeatureFlag;
 pub use zero_state::*;
 
 use std::collections::HashMap;
@@ -11,9 +11,9 @@ use std::path::PathBuf;
 
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::appearance::Appearance;
-use warpui::fonts::FamilyId;
-use warpui::{AppContext, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
+use galaxy_core::ui::appearance::Appearance;
+use galaxyui::fonts::FamilyId;
+use galaxyui::{AppContext, Entity, EntityId, ModelContext, ModelHandle, SingletonEntity};
 
 use crate::ai::blocklist::BlocklistAIHistoryModel;
 use crate::ai::skills::{SkillDescriptor, SkillManager};
@@ -25,7 +25,7 @@ use crate::terminal::cli_agent_sessions::{
     CLIAgentInputState, CLIAgentSessionsModel, CLIAgentSessionsModelEvent,
 };
 use crate::terminal::model::session::SessionType;
-use warp_core::ui::Icon as WarpIcon;
+use galaxy_core::ui::Icon as WarpIcon;
 
 use super::AcceptSlashCommandOrSavedPrompt;
 use crate::{
@@ -279,7 +279,7 @@ impl SyncDataSource for SlashCommandDataSource {
     fn run_query(
         &self,
         query: &Query,
-        app: &warpui::AppContext,
+        app: &galaxyui::AppContext,
     ) -> Result<Vec<QueryResult<Self::Action>>, DataSourceRunErrorWrapper> {
         if query.text.is_empty() {
             return Ok(vec![]);

app/src/terminal/input/slash_commands/data_source/saved_prompts.rs

@@ -2,9 +2,9 @@ use std::sync::Arc;
 
 use futures_lite::future::yield_now;
 use ordered_float::OrderedFloat;
-use warp_core::ui::appearance::Appearance;
-use warpui::fonts::FamilyId;
-use warpui::{AppContext, SingletonEntity};
+use galaxy_core::ui::appearance::Appearance;
+use galaxyui::fonts::FamilyId;
+use galaxyui::{AppContext, SingletonEntity};
 
 use crate::cloud_object::model::persistence::CloudModel;
 use crate::cloud_object::CloudObject;

app/src/terminal/input/slash_commands/data_source/saved_prompts_tests.rs

@@ -7,7 +7,7 @@ use ordered_float::OrderedFloat;
 
 use super::{fuzzy_match_saved_prompts, SavedPromptCandidate, SavedPromptsSnapshot};
 
-const TEST_FONT_FAMILY: warpui::fonts::FamilyId = warpui::fonts::FamilyId(0);
+const TEST_FONT_FAMILY: galaxyui::fonts::FamilyId = galaxyui::fonts::FamilyId(0);
 
 fn test_candidate(name: &str, query: &str) -> SavedPromptCandidate {
     SavedPromptCandidate {

app/src/terminal/input/slash_commands/data_source/zero_state.rs

@@ -1,5 +1,5 @@
 use itertools::Itertools;
-use warpui::{Entity, ModelHandle};
+use galaxyui::{Entity, ModelHandle};
 
 use crate::search::data_source::{Query, QueryResult};
 use crate::search::mixer::DataSourceRunErrorWrapper;
@@ -31,7 +31,7 @@ impl SyncDataSource for ZeroStateDataSource {
     fn run_query(
         &self,
         query: &Query,
-        app: &warpui::AppContext,
+        app: &galaxyui::AppContext,
     ) -> Result<Vec<QueryResult<Self::Action>>, DataSourceRunErrorWrapper> {
         if !query.text.is_empty() {
             return Ok(vec![]);

app/src/terminal/input/slash_commands/mod.rs

@@ -6,11 +6,11 @@ pub use data_source::*;
 pub use view::*;
 
 use ai::skills::SkillReference;
-use warp_core::features::FeatureFlag;
-use warp_core::send_telemetry_from_ctx;
-use warp_core::ui::appearance::Appearance;
-use warpui::clipboard::ClipboardContent;
-use warpui::{SingletonEntity, ViewContext};
+use galaxy_core::features::FeatureFlag;
+use galaxy_core::send_telemetry_from_ctx;
+use galaxy_core::ui::appearance::Appearance;
+use galaxyui::clipboard::ClipboardContent;
+use galaxyui::{SingletonEntity, ViewContext};
 
 use crate::ai::blocklist::agent_view::{
     AgentViewEntryOrigin, DismissalStrategy, EphemeralMessage, ENTER_OR_EXIT_CONFIRMATION_WINDOW,
@@ -451,7 +451,7 @@ impl Input {
                 match argument {
                     Some(args) if !args.is_empty() => {
                         use shellexpand::tilde;
-                        use warp_util::path::CleanPathResult;
+                        use galaxy_util::path::CleanPathResult;
 
                         let Some(session_id) = self.active_block_session_id() else {
                             return false;

app/src/terminal/input/slash_commands/search_item.rs

@@ -1,10 +1,10 @@
 use ordered_float::OrderedFloat;
-use warp_core::ui::appearance::Appearance;
-use warp_core::ui::theme::Fill;
-use warpui::elements::{Expanded, Highlight, Icon, ParentElement, Shrinkable};
-use warpui::fonts::{Properties, Weight};
-use warpui::prelude::{ConstrainedBox, Container, CrossAxisAlignment, Empty, Flex, Text};
-use warpui::{AppContext, Element, SingletonEntity};
+use galaxy_core::ui::appearance::Appearance;
+use galaxy_core::ui::theme::Fill;
+use galaxyui::elements::{Expanded, Highlight, Icon, ParentElement, Shrinkable};
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::prelude::{ConstrainedBox, Container, CrossAxisAlignment, Empty, Flex, Text};
+use galaxyui::{AppContext, Element, SingletonEntity};
 
 use crate::ai::blocklist::agent_view::shortcuts::render_keystroke_with_color_overrides;
 use crate::search::slash_command_menu::static_commands::commands::COMMAND_REGISTRY;

app/src/terminal/input/slash_commands/view.rs

@@ -2,9 +2,9 @@ use std::collections::HashSet;
 
 use ai::skills::SkillReference;
 use lazy_static::lazy_static;
-use warpui::elements::ChildView;
-use warpui::{AppContext, Element, ViewContext};
-use warpui::{Entity, ModelHandle, View, ViewHandle};
+use galaxyui::elements::ChildView;
+use galaxyui::{AppContext, Element, ViewContext};
+use galaxyui::{Entity, ModelHandle, View, ViewHandle};
 
 use crate::ai::blocklist::agent_view::AgentViewController;
 use crate::search::data_source::{Query, QueryFilter};
@@ -268,7 +268,7 @@ impl View for InlineSlashCommandView {
         "InlineSlashCommandView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }

app/src/terminal/input/suggestions_mode_menu.rs

@@ -19,13 +19,13 @@ use crate::input_suggestions::{
     LABEL_PADDING as InputSuggestionsLabelPadding,
 };
 use crate::themes::theme::WarpTheme;
-use warpui::elements::{
+use galaxyui::elements::{
     Align, Border, ConstrainedBox, Container, CornerRadius, CrossAxisAlignment, DragBarSide,
     DropShadow, Element, Empty, Flex, ParentElement, Radius, Resizable, Shrinkable,
     SizeConstraintCondition, SizeConstraintSwitch, Text,
 };
-use warpui::presenter::ChildView;
-use warpui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
+use galaxyui::presenter::ChildView;
+use galaxyui::ui_components::components::{Coords, UiComponent, UiComponentStyles};
 
 enum SuggestionsResizeConfig {
     WidthAndHeight,

app/src/terminal/input/suggestions_mode_model.rs

@@ -1,4 +1,4 @@
-use warpui::{Entity, ModelContext, ModelHandle};
+use galaxyui::{Entity, ModelContext, ModelHandle};
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::terminal::input::buffer_model::InputBufferModel;

app/src/terminal/input/terminal.rs

@@ -17,8 +17,8 @@ use crate::{
         settings::TerminalSettings, view::TerminalAction,
     },
 };
-use warp_core::settings::Setting;
-use warpui::{
+use galaxy_core::settings::Setting;
+use galaxyui::{
     elements::{
         Border, Clipped, Container, DropTarget, Element, Flex, Hoverable, ParentElement,
         SavePosition, Stack,
@@ -299,7 +299,7 @@ impl Input {
 
 pub mod styles {
     use pathfinder_color::ColorU;
-    use warp_core::ui::theme::WarpTheme;
+    use galaxy_core::ui::theme::WarpTheme;
 
     pub fn default_border_color(theme: &WarpTheme) -> ColorU {
         theme.outline().into()

app/src/terminal/input/terminal_message_bar.rs

@@ -2,10 +2,10 @@ use std::sync::Arc;
 
 use parking_lot::FairMutex;
 use pathfinder_color::ColorU;
-use warp_core::ui::theme::WarpTheme;
-use warpui::elements::{Container, Element};
-use warpui::keymap::Keystroke;
-use warpui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
+use galaxy_core::ui::theme::WarpTheme;
+use galaxyui::elements::{Container, Element};
+use galaxyui::keymap::Keystroke;
+use galaxyui::{AppContext, Entity, ModelHandle, SingletonEntity, View, ViewContext};
 
 use super::buffer_model::InputBufferModel;
 use super::message_bar::{

app/src/terminal/input/universal.rs

@@ -13,7 +13,7 @@ use crate::{
     themes::theme::color::internal_colors,
 };
 use settings::Setting;
-use warpui::{
+use galaxyui::{
     elements::{
         Border, ChildView, Container, CornerRadius, DropTarget, Element, Flex, Hoverable,
         ParentElement, Radius, SavePosition, Stack,

app/src/terminal/input/user_query/data_source.rs

@@ -2,7 +2,7 @@
 
 use itertools::Itertools;
 use ordered_float::OrderedFloat;
-use warpui::{AppContext, Entity, SingletonEntity};
+use galaxyui::{AppContext, Entity, SingletonEntity};
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::agent::AIAgentExchangeId;

app/src/terminal/input/user_query/mod.rs

@@ -8,8 +8,8 @@ mod view;
 pub use data_source::SelectUserQuery;
 pub use view::{UserQueryMenuEvent, UserQueryMenuView};
 
-use warpui::keymap::Keystroke;
-use warpui::platform::OperatingSystem;
+use galaxyui::keymap::Keystroke;
+use galaxyui::platform::OperatingSystem;
 
 use crate::terminal::input::inline_menu::{
     default_navigation_message_items, InlineMenuAction, InlineMenuMessageArgs, InlineMenuRowAction,

app/src/terminal/input/user_query/search_item.rs

@@ -2,14 +2,14 @@
 
 use fuzzy_match::FuzzyMatchResult;
 use ordered_float::OrderedFloat;
-use warp_core::ui::color::coloru_with_opacity;
-use warp_core::ui::theme::Fill;
-use warp_core::ui::Icon;
-use warpui::elements::{ConstrainedBox, Container, Highlight, Shrinkable, Text};
-use warpui::fonts::{Properties, Weight};
-use warpui::scene::{CornerRadius, Radius};
-use warpui::text_layout::ClipConfig;
-use warpui::{AppContext, Element, SingletonEntity};
+use galaxy_core::ui::color::coloru_with_opacity;
+use galaxy_core::ui::theme::Fill;
+use galaxy_core::ui::Icon;
+use galaxyui::elements::{ConstrainedBox, Container, Highlight, Shrinkable, Text};
+use galaxyui::fonts::{Properties, Weight};
+use galaxyui::scene::{CornerRadius, Radius};
+use galaxyui::text_layout::ClipConfig;
+use galaxyui::{AppContext, Element, SingletonEntity};
 
 use crate::ai::agent::AIAgentExchangeId;
 use crate::appearance::Appearance;
@@ -65,7 +65,7 @@ impl SearchItem for UserQuerySearchItem {
         // Once this search item is used by multiple sources,
         // we'll want to set this icon based on which source is generating this item.
         let icon = Container::new(
-            ConstrainedBox::new(Icon::ArrowSplit.to_warpui_icon(color).finish())
+            ConstrainedBox::new(Icon::ArrowSplit.to_galaxyui_icon(color).finish())
                 .with_width(appearance.monospace_font_size())
                 .with_height(appearance.monospace_font_size())
                 .finish(),

app/src/terminal/input/user_query/view.rs

@@ -1,7 +1,7 @@
 //! View for the user query menu.
 
-use warpui::elements::ChildView;
-use warpui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
+use galaxyui::elements::ChildView;
+use galaxyui::{Element, Entity, ModelHandle, View, ViewContext, ViewHandle};
 
 use crate::ai::agent::conversation::AIConversationId;
 use crate::ai::agent::AIAgentExchangeId;
@@ -148,7 +148,7 @@ impl View for UserQueryMenuView {
         "UserQueryMenuView"
     }
 
-    fn render(&self, _app: &warpui::AppContext) -> Box<dyn Element> {
+    fn render(&self, _app: &galaxyui::AppContext) -> Box<dyn Element> {
         ChildView::new(&self.menu_view).finish()
     }
 }