public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ryan Ward
2026-05-07 11:29:34 -05:00
parent f4e2475c60
commit a41cbd8cc7
2433 changed files with 14208 additions and 9409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/terminal/model/alt_screen.rs
+4 -4
View File
@@ -32,10 +32,10 @@ use parking_lot::Mutex;
use pathfinder_color::ColorU;
use std::sync::Arc;
use vec1::Vec1;
use warp_core::semantic_selection::SemanticSelection;
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use warpui::text::SelectionType;
use warpui::units::Lines;
use galaxy_core::semantic_selection::SemanticSelection;
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxyui::text::SelectionType;
use galaxyui::units::Lines;
pub struct AltScreen {
grid_handler: GridHandler,
app/src/terminal/model/alt_screen_test.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warpui::units::IntoLines as _;
use galaxyui::units::IntoLines as _;
use super::*;
use crate::terminal::SizeUpdateReason;
app/src/terminal/model/ansi/dcs_hooks.rs
+1 -1
View File
@@ -6,7 +6,7 @@ use ordered_float::OrderedFloat;
use serde::{Deserialize, Deserializer, Serialize};
use std::collections::HashSet;
use std::path::PathBuf;
use warp_core::command::ExitCode;
use galaxy_core::command::ExitCode;
/// Indicates that the following JSON-encoded message is hex-encoded for Warp's lifecycle hooks.
/// In DCS, it is used as the final char in the DCS start sequence.
app/src/terminal/model/ansi/handler.rs
+3 -3
View File
@@ -1,9 +1,9 @@
use std::collections::HashMap;
use std::io;
use warp_terminal::model::ansi::control_sequence_parameters::*;
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use warpui::color::ColorU;
use galaxy_terminal::model::ansi::control_sequence_parameters::*;
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxyui::color::ColorU;
use super::dcs_hooks::*;
use super::ProcessorInput;
app/src/terminal/model/ansi/mod.rs
+3 -3
View File
@@ -18,8 +18,8 @@ pub use dcs_hooks::*;
pub use handler::*;
use instant::Instant;
use itertools::Itertools;
pub use warp_terminal::model::ansi::control_sequence_parameters::*;
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
pub use galaxy_terminal::model::ansi::control_sequence_parameters::*;
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use crate::features::FeatureFlag;
use crate::terminal::model::completions::{
@@ -49,7 +49,7 @@ use std::str::FromStr as _;
use std::time::Duration;
use std::{io, str};
use vte::{Params, Parser as VteParser, Perform as VtePerform};
use warpui::color::ColorU;
use galaxyui::color::ColorU;
use super::kitty::parse_kitty_chunk;
use super::terminal_model::TmuxInstallationState;
app/src/terminal/model/ansi/mod_test.rs
+2 -2
View File
@@ -1,6 +1,6 @@
use hex;
use warp_core::command::ExitCode;
use warpui::color::ColorU;
use galaxy_core::command::ExitCode;
use galaxyui::color::ColorU;
use super::*;
use crate::terminal::model::index::VisibleRow;
app/src/terminal/model/block.rs
+11 -11
View File
@@ -3,7 +3,7 @@ mod serialized_block;
pub use interaction_mode::*;
pub use serialized_block::*;
use warp_core::features::FeatureFlag;
use galaxy_core::features::FeatureFlag;
use super::grid::grid_handler::{GridHandler, PerformResetGridChecks};
use super::grid::{Cursor, RespectDisplayedOutput};
@@ -16,7 +16,7 @@ use super::selection::ScrollDelta;
use super::session::{command_executor, Sessions};
pub use super::BlockId;
use super::{bootstrap::BootstrapStage, find::RegexDFAs};
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use crate::ai::agent::conversation::AIConversationId;
use crate::ai::blocklist::agent_view::{AgentViewDisplayMode, AgentViewState};
@@ -54,11 +54,11 @@ use hex;
use instant::Instant;
use pathfinder_color::ColorU;
use pathfinder_geometry::vector::Vector2F;
use warp_core::command::ExitCode;
use warp_terminal::model::grid::Dimensions as _;
use warp_util::path::user_friendly_path;
use warpui::units::{IntoLines, Lines};
use warpui::{r#async::executor::Background, record_trace_event};
use galaxy_core::command::ExitCode;
use galaxy_terminal::model::grid::Dimensions as _;
use galaxy_util::path::user_friendly_path;
use galaxyui::units::{IntoLines, Lines};
use galaxyui::{r#async::executor::Background, record_trace_event};
use enum_iterator::all;
use lazy_static::lazy_static;
@@ -2175,7 +2175,7 @@ impl Block {
let escape_char = session.shell_family().escape_char();
// Parse the raw command string to get the top-level command.
let command = warp_completer::parsers::simple::top_level_command(
let command = galaxy_completer::parsers::simple::top_level_command(
self.command_to_string(),
escape_char,
)?;
@@ -2185,7 +2185,7 @@ impl Block {
.alias_value(command.as_str())
.map(|s| s.to_owned())
// An alias can technically expand into an entire command (e.g. "gl" => "PAGER=0 git log").
.and_then(|s| warp_completer::parsers::simple::top_level_command(s, escape_char))
.and_then(|s| galaxy_completer::parsers::simple::top_level_command(s, escape_char))
// If alias expansion didn't work, then just return the original top-level command.
.or(Some(command))
}
@@ -2503,7 +2503,7 @@ impl Block {
self.background_executor
.spawn(async move {
warpui::r#async::Timer::after(std::time::Duration::from_millis(delay_ms)).await;
galaxyui::r#async::Timer::after(std::time::Duration::from_millis(delay_ms)).await;
ready_to_render.store(true, Ordering::Relaxed);
event_proxy.send_wakeup_event();
})
@@ -2824,7 +2824,7 @@ impl Block {
}
pub fn grid_storage_lines(&self) -> usize {
use warp_terminal::model::grid::Dimensions as _;
use galaxy_terminal::model::grid::Dimensions as _;
self.all_grids_iter()
.map(|grid| grid.grid_storage().total_rows())
app/src/terminal/model/block/interaction_mode.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use anyhow::anyhow;
use warp_terminal::model::{grid::Dimensions, Point};
use galaxy_terminal::model::{grid::Dimensions, Point};
use crate::{
ai::{
app/src/terminal/model/block/serialized_block.rs
+1 -1
View File
@@ -15,7 +15,7 @@ use crate::util::extensions::TrimStringExt;
use chrono::{DateTime, Local, TimeZone as _};
use serde::{Deserialize, Serialize};
use serde_bytes_repr::{ByteFmtDeserializer, ByteFmtSerializer};
use warp_core::command::ExitCode;
use galaxy_core::command::ExitCode;
use super::AgentInteractionMetadata;
app/src/terminal/model/block_test.rs
+4 -4
View File
@@ -260,7 +260,7 @@ pub fn test_find() {
#[test]
pub fn test_long_running_block_bottom_padding() {
warpui::r#async::block_on(async {
galaxyui::r#async::block_on(async {
let mut block = TestBlockBuilder::new().build();
block.precmd(Default::default());
@@ -279,7 +279,7 @@ pub fn test_long_running_block_bottom_padding() {
// After the long running duration, the block should switch
let duration = LONG_RUNNING_COMMAND_DURATION_MS + 1;
warpui::r#async::Timer::after(Duration::from_millis(duration)).await;
galaxyui::r#async::Timer::after(Duration::from_millis(duration)).await;
assert!(block.is_active_and_long_running());
assert!(block.padding_bottom() == LONG_RUNNING_BOTTOM_PADDING_LINES.into_lines());
@@ -508,7 +508,7 @@ pub fn test_block_emits_block_completed_event_for_in_band_command() {
events_rx.close();
let block_completed_event =
warpui::r#async::block_on(pin!(events_rx).find(|event| match event {
galaxyui::r#async::block_on(pin!(events_rx).find(|event| match event {
Event::BlockCompleted(event) => matches!(event.block_type, BlockType::InBandCommand),
_ => false,
}));
@@ -1306,7 +1306,7 @@ fn test_top_level_command_with_aliases() {
#[test]
fn test_mark_end_of_prompt_with_some_rows_in_flat_storage() {
use warp_terminal::model::grid::Dimensions as _;
use galaxy_terminal::model::grid::Dimensions as _;
let mut block = TestBlockBuilder::new()
// Set the number of visible rows to 1, so that the first row of the
app/src/terminal/model/blockgrid.rs
+1 -1
View File
@@ -27,7 +27,7 @@ use super::image_map::StoredImageMetadata;
use super::kitty::{KittyAction, KittyResponse};
use super::secrets::RespectObfuscatedSecrets;
use super::selection::ScrollDelta;
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
#[derive(Clone)]
pub struct BlockGrid {
app/src/terminal/model/blocks.rs
+6 -6
View File
@@ -35,13 +35,13 @@ use std::ops::{AddAssign, Range, RangeInclusive};
use std::sync::Arc;
use std::time::Duration;
use sum_tree::{Dimension, Item, SeekBias, SumTree};
use warp_core::features::FeatureFlag;
use warpui::color::ColorU;
use warpui::r#async::executor::Background;
use warpui::record_trace_event;
use galaxy_core::features::FeatureFlag;
use galaxyui::color::ColorU;
use galaxyui::r#async::executor::Background;
use galaxyui::record_trace_event;
use std::collections::{HashMap, HashSet};
use warpui::{
use galaxyui::{
units::{IntoLines, IntoPixels, Lines},
AppContext, EntityId, ViewHandle,
};
@@ -65,7 +65,7 @@ use crate::terminal::model::blockgrid::BlockGrid;
use crate::terminal::model::grid::Dimensions;
use crate::terminal::model::secrets::ObfuscateSecrets;
use crate::terminal::model::terminal_model::{BlockIndex, WithinBlock};
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use selection::BlockListSelection;
pub use selection::SelectionRange;
app/src/terminal/model/blocks/selection.rs
+3 -3
View File
@@ -2,9 +2,9 @@ use std::{cmp::max, fmt::Debug, mem, ops::RangeInclusive};
use sum_tree::SeekBias;
use vec1::{vec1, Vec1};
use warp_core::semantic_selection::SemanticSelection;
use warp_terminal::model::grid::CellType;
use warpui::{
use galaxy_core::semantic_selection::SemanticSelection;
use galaxy_terminal::model::grid::CellType;
use galaxyui::{
text::{IsRect, SelectionType},
units::{IntoLines as _, Lines},
AppContext, EntityId, ViewAsRef as _,
app/src/terminal/model/blocks/selection_tests.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use float_cmp::assert_approx_eq;
use warpui::App;
use galaxyui::App;
use crate::{
ai::blocklist::agent_view::AgentViewState,
app/src/terminal/model/blocks_test.rs
+3 -3
View File
@@ -1,7 +1,7 @@
use float_cmp::{approx_eq, assert_approx_eq};
use warp_core::features::FeatureFlag;
use warpui::units::IntoLines;
use warpui::{elements::DEFAULT_UI_LINE_HEIGHT_RATIO, App};
use galaxy_core::features::FeatureFlag;
use galaxyui::units::IntoLines;
use galaxyui::{elements::DEFAULT_UI_LINE_HEIGHT_RATIO, App};
use super::*;
use crate::ai::agent::AIAgentActionId;
app/src/terminal/model/completions.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warp_completer::completer::{Match, MatchedSuggestion, Suggestion, SuggestionType};
use galaxy_completer::completer::{Match, MatchedSuggestion, Suggestion, SuggestionType};
/// The completions data coming from the shell.
///
app/src/terminal/model/early_output.rs
+9 -9
View File
@@ -13,7 +13,7 @@ use super::block::Block;
use super::blocks::BlockList;
use super::selection::ScrollDelta;
use super::session::SessionInfo;
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
#[cfg(test)]
#[path = "early_output_tests.rs"]
@@ -148,8 +148,8 @@ impl EarlyOutput {
full: ("Matched {ch:?} as typeahead")
);
if warp_core::channel::ChannelState::channel()
== warp_core::channel::Channel::Integration
if galaxy_core::channel::ChannelState::channel()
== galaxy_core::channel::Channel::Integration
{
log::info!(
"Sending input-matched typeahead event for {:?}",
@@ -168,8 +168,8 @@ impl EarlyOutput {
/// internal count is then updated to match the new typeahead length.
pub fn advance_typeahead(&mut self) -> Option<(&str, CharOffset)> {
if self.typeahead.is_empty() {
if warp_core::channel::ChannelState::channel()
== warp_core::channel::Channel::Integration
if galaxy_core::channel::ChannelState::channel()
== galaxy_core::channel::Channel::Integration
{
log::warn!("Tried to advance typeahead, but it was empty");
}
@@ -316,8 +316,8 @@ impl ansi::Handler for EarlyOutputHandler<'_> {
/// information, such as when the shell reports its input buffer.
fn input_buffer(&mut self, data: ansi::InputBufferValue) {
if data.buffer.is_empty() {
if warp_core::channel::ChannelState::channel()
== warp_core::channel::Channel::Integration
if galaxy_core::channel::ChannelState::channel()
== galaxy_core::channel::Channel::Integration
{
log::info!("Ignoring empty input buffer");
}
@@ -338,8 +338,8 @@ impl ansi::Handler for EarlyOutputHandler<'_> {
let me = self.inner();
if me.mode == TypeaheadMode::ShellReported {
me.typeahead = data.buffer;
if warp_core::channel::ChannelState::channel()
== warp_core::channel::Channel::Integration
if galaxy_core::channel::ChannelState::channel()
== galaxy_core::channel::Channel::Integration
{
log::info!(
"Sending shell-reported typeahead event for {:?}",
app/src/terminal/model/find.rs
+1 -1
View File
@@ -7,7 +7,7 @@ use regex_automata::nfa::thompson;
use regex_automata::util::pool::Pool;
use regex_automata::util::syntax::Config;
use regex_automata::{Anchored, Input};
use warp_terminal::model::grid::CellType;
use galaxy_terminal::model::grid::CellType;
use crate::terminal::model::index::Direction;
use crate::terminal::model::index::Point;
app/src/terminal/model/grid/ansi_handler.rs
+7 -7
View File
@@ -14,12 +14,12 @@ use bounded_vec_deque::BoundedVecDeque;
use pathfinder_geometry::vector::Vector2F;
use rand::Rng;
use unicode_width::{UnicodeWidthChar, UnicodeWidthStr};
use warp_core::channel::ChannelState;
use warp_core::features::FeatureFlag;
use warp_terminal::model::ansi::CharsetIndex;
use warp_terminal::model::grid::cell;
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use warpui::image_cache::{resize_dimensions, FitType};
use galaxy_core::channel::ChannelState;
use galaxy_core::features::FeatureFlag;
use galaxy_terminal::model::ansi::CharsetIndex;
use galaxy_terminal::model::grid::cell;
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxyui::image_cache::{resize_dimensions, FitType};
use crate::server::telemetry::ImageProtocol;
use crate::terminal::event::Event;
@@ -1133,7 +1133,7 @@ impl ansi::Handler for GridHandler {
self.grid.cursor.charsets[index] = charset;
}
fn set_color(&mut self, _: usize, _: warpui::color::ColorU) {
fn set_color(&mut self, _: usize, _: galaxyui::color::ColorU) {
log::error!("Handler method GridHandler::set_color should never be called. This should be handled by TerminalModel.");
}
app/src/terminal/model/grid/filtering_tests.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warp_terminal::model::grid::cell::Flags;
use galaxy_terminal::model::grid::cell::Flags;
use crate::{
terminal::model::{
app/src/terminal/model/grid/grapheme_cursor.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use std::borrow::Cow;
use warp_terminal::model::grid::{
use galaxy_terminal::model::grid::{
cell::{self, Cell},
row::Row,
CellType,
app/src/terminal/model/grid/grid_handler.rs
+10 -10
View File
@@ -24,15 +24,15 @@ use itertools::Itertools;
use lazy_static::lazy_static;
use unicode_width::UnicodeWidthChar;
use urlocator::{UrlLocation, UrlLocator};
use warp_core::features::FeatureFlag;
use warp_core::semantic_selection::{SemanticSelection, SMART_SELECT_MATCH_WINDOW_LIMIT};
use warp_core::{safe_assert, safe_assert_eq};
use warp_terminal::model::grid::CellType;
use warp_terminal::model::grid::FlatStorage;
pub use warp_terminal::model::TermMode;
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use warp_util::path::CleanPathResult;
use warpui::color::ColorU;
use galaxy_core::features::FeatureFlag;
use galaxy_core::semantic_selection::{SemanticSelection, SMART_SELECT_MATCH_WINDOW_LIMIT};
use galaxy_core::{safe_assert, safe_assert_eq};
use galaxy_terminal::model::grid::CellType;
use galaxy_terminal::model::grid::FlatStorage;
pub use galaxy_terminal::model::TermMode;
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxy_util::path::CleanPathResult;
use galaxyui::color::ColorU;
use crate::terminal::event_listener::ChannelEventListener;
use crate::terminal::model::ansi::{self, Color, CursorStyle, Handler, NamedColor};
@@ -2475,7 +2475,7 @@ impl GridHandler {
/// appropriately.
#[cfg(test)]
pub(super) fn input_at_cursor(&mut self, text: &str) {
use warp_terminal::model::VisiblePoint;
use galaxy_terminal::model::VisiblePoint;
let columns = self.columns();
let mut last_row = self.grid.cursor.point.row;
app/src/terminal/model/grid/grid_handler_test.rs
+3 -3
View File
@@ -1,8 +1,8 @@
use std::ops::BitOrAssign;
use warp_terminal::model::char_or_str::CharOrStr;
use warp_util::path::LineAndColumnArg;
use warpui::text::words::is_default_word_boundary;
use galaxy_terminal::model::char_or_str::CharOrStr;
use galaxy_util::path::LineAndColumnArg;
use galaxyui::text::words::is_default_word_boundary;
use crate::terminal::model::secrets::{ObfuscateSecrets, SecretLevel};
use crate::terminal::model::{blockgrid::BlockGrid, secrets::IsObfuscated};
app/src/terminal/model/grid/grid_storage.rs
+1 -1
View File
@@ -6,7 +6,7 @@ use std::cmp::min;
use std::ops::{Index, IndexMut, Range};
use serde::{Deserialize, Serialize};
pub use warp_terminal::model::grid::Dimensions;
pub use galaxy_terminal::model::grid::Dimensions;
use crate::features::FeatureFlag;
use crate::terminal::model::ansi::{CharsetIndex, StandardCharset};
app/src/terminal/model/grid/image.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use crate::terminal::model::image_map::ImagePlacementData;
use super::{AbsolutePoint, AbsoluteRectangle, GridHandler};
use warp_terminal::model::Point;
use galaxy_terminal::model::Point;
impl GridHandler {
pub fn get_image_ids_in_range(
app/src/terminal/model/grid/indexing.rs
+2 -2
View File
@@ -1,7 +1,7 @@
use std::ops::{Index, IndexMut, Range, RangeFrom, RangeFull, RangeTo};
use warp_terminal::model::grid::cell::Cell;
use warp_terminal::model::grid::row::Row;
use galaxy_terminal::model::grid::cell::Cell;
use galaxy_terminal::model::grid::row::Row;
use crate::terminal::model::{
grid::Dimensions as _,
app/src/terminal/model/grid/mod.rs
+1 -1
View File
@@ -9,7 +9,7 @@ pub(super) mod grapheme_cursor;
#[cfg(test)]
mod tests;
pub use warp_terminal::model::grid::row;
pub use galaxy_terminal::model::grid::row;
pub use displayed_output::RespectDisplayedOutput;
pub use grid_storage::*;
app/src/terminal/model/grid/resize.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use string_offset::ByteOffset;
use warp_terminal::model::{
use galaxy_terminal::model::{
grid::{
cell::{self, LineLength as _},
Dimensions as _,
app/src/terminal/model/grid/selection_cursor.rs
+1 -1
View File
@@ -1,4 +1,4 @@
use warp_terminal::model::grid::CellType;
use galaxy_terminal::model::grid::CellType;
use crate::terminal::model::index::Point;
app/src/terminal/model/grid/tests.rs
+1 -1
View File
@@ -1,7 +1,7 @@
//! Tests for the Grid.
use grid_handler::GridHandler;
use warp_terminal::model::grid::cell;
use galaxy_terminal::model::grid::cell;
use crate::features::FeatureFlag;
use crate::terminal::model::ansi::Handler;
app/src/terminal/model/header_grid.rs
+2 -2
View File
@@ -9,7 +9,7 @@ use super::{
};
use instant::Instant;
use pathfinder_color::ColorU;
use warpui::units::{IntoLines as _, Lines};
use galaxyui::units::{IntoLines as _, Lines};
use crate::terminal::event::Event;
@@ -25,7 +25,7 @@ use super::{
ObfuscateSecrets, RespectObfuscatedSecrets,
};
use crate::terminal::{event_listener::ChannelEventListener, SizeInfo};
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
macro_rules! delegate {
($self:ident.$method:ident( $( $arg:expr ),* )) => {
app/src/terminal/model/index.rs
+1 -1
View File
@@ -1,6 +1,6 @@
//! Indexing-related newtypes for strongly typed tty/grid/terminal APIs.
pub use warp_terminal::model::{Index, IndexRange, Point, VisiblePoint, VisibleRow};
pub use galaxy_terminal::model::{Index, IndexRange, Point, VisiblePoint, VisibleRow};
/// The side of a cell.
pub type Side = Direction;
app/src/terminal/model/iterm_image.rs
+1 -1
View File
@@ -3,7 +3,7 @@ use std::path::Path;
use base64::Engine;
use pathfinder_geometry::vector::Vector2F;
use rand::Rng;
use warpui::util::parse_u32;
use galaxyui::util::parse_u32;
#[derive(Debug, Default, Clone)]
pub struct ITermImage {
app/src/terminal/model/kitty.rs
+2 -2
View File
@@ -7,8 +7,8 @@ use std::cmp::min;
use std::io::Read;
#[cfg(feature = "local_fs")]
use std::{env, fs, str};
use warpui::image_cache::{resize_dimensions, FitType};
use warpui::{
use galaxyui::image_cache::{resize_dimensions, FitType};
use galaxyui::{
assets::asset_cache::Asset,
image_cache::{CustomHeaderCreationError, CustomImageFormat, CustomImageHeader, ImageType},
util::{parse_i32, parse_u32},
app/src/terminal/model/mod.rs
+3 -3
View File
@@ -6,9 +6,9 @@ pub use terminal_model::TerminalModel;
macro_rules! assert_lines_approx_eq {
($actual:expr, $expected:expr) => {{
float_cmp::assert_approx_eq!(
warpui::units::Lines,
galaxyui::units::Lines,
$actual,
warpui::units::IntoLines::into_lines($expected)
galaxyui::units::IntoLines::into_lines($expected)
)
}};
}
@@ -42,4 +42,4 @@ pub use secrets::{
set_user_and_enterprise_secret_regexes, ObfuscateSecrets, RespectObfuscatedSecrets, Secret,
SecretHandle,
};
pub use warp_terminal::model::{char_or_str, escape_sequences, grid::cell, mouse, BlockId};
pub use galaxy_terminal::model::{char_or_str, escape_sequences, grid::cell, mouse, BlockId};
app/src/terminal/model/secrets.rs
+2 -2
View File
@@ -10,8 +10,8 @@ use rangemap::{RangeInclusiveMap, StepLite};
use std::collections::HashMap;
use std::ops::{Not, RangeInclusive};
use std::sync::atomic::{AtomicUsize, Ordering};
use warpui::elements::SecretRange;
use warpui::EntityId;
use galaxyui::elements::SecretRange;
use galaxyui::EntityId;
use super::grid::grid_handler::GridHandler;
use super::grid::{Dimensions as _, RespectDisplayedOutput};
app/src/terminal/model/selection.rs
+4 -4
View File
@@ -6,7 +6,7 @@
//! also be cleared if the user clicks off of the selection.
use std::fmt::Debug;
use vec1::Vec1;
use warp_terminal::model::grid::cell;
use galaxy_terminal::model::grid::cell;
use crate::terminal::model::ansi::CursorShape;
use crate::terminal::model::cell::Flags;
@@ -19,9 +19,9 @@ use std::cmp::{max, min};
use std::mem;
use std::ops::RangeInclusive;
pub use std::ops::{Range, RangeBounds};
use warp_core::semantic_selection::SemanticSelection;
use warpui::text::SelectionType;
use warpui::units::Lines;
use galaxy_core::semantic_selection::SemanticSelection;
use galaxyui::text::SelectionType;
use galaxyui::units::Lines;
use super::index::{Direction, VisibleRow};
app/src/terminal/model/session.rs
+10 -10
View File
@@ -17,16 +17,16 @@ use std::ops::Deref;
use std::path::{Path, PathBuf};
use std::sync::Arc;
use typed_path::{TypedPath, TypedPathBuf, WindowsPath};
use warp_util::path::{
use galaxy_util::path::{
convert_msys2_to_windows_native_path, convert_wsl_to_windows_host_path, msys2_exe_to_root,
ShellFamily,
};
use version_compare::Version;
use warp_completer::completer::{
use galaxy_completer::completer::{
CommandExitStatus, CommandOutput, PathSeparators, TopLevelCommandCaseSensitivity,
};
use warpui::{platform::OperatingSystem, Entity, ModelContext, SingletonEntity};
use galaxyui::{platform::OperatingSystem, Entity, ModelContext, SingletonEntity};
#[cfg(feature = "local_tty")]
use crate::features::FeatureFlag;
@@ -69,8 +69,8 @@ pub enum ReadHistoryContentsError {
AsyncFsError(std::io::Error),
}
// SessionId is defined in warp_core and re-exported here for backward compatibility.
pub use warp_core::SessionId;
// SessionId is defined in galaxy_core and re-exported here for backward compatibility.
pub use galaxy_core::SessionId;
/// Information about the sessions within a given terminal pane/top-level
/// shell.
@@ -842,7 +842,7 @@ pub enum SessionType {
/// `RemoteServerManager` has completed the connection handshake. It is
/// `None` when the feature flag is off or the connection hasn't been
/// established yet.
WarpifiedRemote { host_id: Option<warp_core::HostId> },
WarpifiedRemote { host_id: Option<galaxy_core::HostId> },
}
impl From<BootstrapSessionType> for SessionType {
@@ -918,7 +918,7 @@ impl Session {
/// Updates the `host_id` on a `WarpifiedRemote` session type after the
/// remote server handshake completes (or clears it on disconnect).
pub fn set_remote_host_id(&self, host_id: Option<warp_core::HostId>) {
pub fn set_remote_host_id(&self, host_id: Option<galaxy_core::HostId>) {
let mut st = self.session_type.lock();
if let SessionType::WarpifiedRemote { host_id: ref mut h } = *st {
*h = host_id;
@@ -946,7 +946,7 @@ impl Session {
pub fn home_dir(&self) -> Option<&str> {
if cfg!(test) {
return warp_util::path::TEST_SESSION_HOME_DIR.as_deref();
return galaxy_util::path::TEST_SESSION_HOME_DIR.as_deref();
}
self.info.home_dir.as_deref()
@@ -989,9 +989,9 @@ impl Session {
/// representation, or `None` when no conversion is appropriate.
pub fn windows_path_converter(&self) -> Option<fn(&str) -> String> {
if self.is_wsl() {
Some(warp_util::path::convert_windows_path_to_wsl)
Some(galaxy_util::path::convert_windows_path_to_wsl)
} else if self.is_msys2() {
Some(warp_util::path::convert_windows_path_to_msys2)
Some(galaxy_util::path::convert_windows_path_to_msys2)
} else {
None
}
app/src/terminal/model/session/active_session.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use std::sync::Arc;
use warpui::{AppContext, Entity, ModelContext, ModelHandle};
use galaxyui::{AppContext, Entity, ModelContext, ModelHandle};
use crate::{
ai_assistant::execution_context::WarpAiExecutionContext,
app/src/terminal/model/session/command_executor.rs
+4 -4
View File
@@ -19,8 +19,8 @@ use std::{any::Any, fmt::Debug, sync::Arc};
use anyhow::Result;
use async_channel::{Receiver, Sender};
use async_trait::async_trait;
use warp_completer::completer::CommandOutput;
use warpui::ModelContext;
use galaxy_completer::completer::CommandOutput;
use galaxyui::ModelContext;
use crate::terminal::{
event::ExecutedExecutorCommandEvent, model::session::Sessions, shell::Shell,
@@ -151,7 +151,7 @@ fn new_command_executor_for_local_tty_session(
use remote_server_executor::RemoteServerCommandExecutor;
use settings::Setting as _;
use tmux_executor::TmuxCommandExecutor;
use warpui::SingletonEntity as _;
use galaxyui::SingletonEntity as _;
use wsl_command_executor::WslCommandExecutor;
use crate::{
@@ -373,7 +373,7 @@ pub mod testing {
use anyhow::anyhow;
use command::r#async::Command;
use warp_completer::completer::CommandOutput;
use galaxy_completer::completer::CommandOutput;
use super::*;
app/src/terminal/model/session/command_executor/in_band_command_executor.rs
+5 -5
View File
@@ -9,21 +9,21 @@ use async_channel::{self, Receiver, Sender};
use async_trait::async_trait;
use chrono::DateTime;
use parking_lot::{Mutex, MutexGuard};
use warp_core::command::ExitCode;
use warp_terminal::model::Point;
use warpui::r#async::block_on;
use galaxy_core::command::ExitCode;
use galaxy_terminal::model::Point;
use galaxyui::r#async::block_on;
use crate::safe_info;
use crate::server::datetime_ext::DateTimeExt;
use crate::terminal::event::ExecutedExecutorCommandEvent;
use crate::terminal::shell::{Shell, ShellType};
use warp_util::on_cancel::OnCancelFutureExt;
use galaxy_util::on_cancel::OnCancelFutureExt;
use crate::terminal::model::session::command_executor::{
shared, CommandExecutor, ExecutorCommandEvent,
};
use crate::terminal::SizeInfo;
use warp_completer::completer::{CommandExitStatus, CommandOutput};
use galaxy_completer::completer::{CommandExitStatus, CommandOutput};
use super::ExecuteCommandOptions;
app/src/terminal/model/session/command_executor/in_band_command_executor_tests.rs
+1 -1
View File
@@ -1,5 +1,5 @@
use futures_util::future::{AbortHandle, Abortable, Aborted};
use warpui::App;
use galaxyui::App;
use crate::terminal::model::session::ExecuteCommandOptions;
app/src/terminal/model/session/command_executor/msys2_command_executor.rs
+2 -2
View File
@@ -9,8 +9,8 @@ use command::r#async::Command;
use itertools::Itertools;
use std::{any::Any, collections::HashMap, ffi::OsString, path::PathBuf};
use typed_path::{TypedPath, WindowsPath};
use warp_completer::completer::CommandOutput;
use warp_util::path::{convert_msys2_to_windows_native_path, msys2_exe_to_root};
use galaxy_completer::completer::CommandOutput;
use galaxy_util::path::{convert_msys2_to_windows_native_path, msys2_exe_to_root};
const BASH_CONFIG_FLAG: &str = "--norc";
const POWERSHELL_CONFIG_FLAG: &str = "-NoProfile";
app/src/terminal/model/session/command_executor/remote_server_executor.rs
+3 -3
View File
@@ -5,9 +5,9 @@ use std::sync::Arc;
use crate::remote_server::client::RemoteServerClient;
use anyhow::{anyhow, Result};
use async_trait::async_trait;
use warp_completer::completer::{CommandExitStatus, CommandOutput};
use warp_core::command::ExitCode;
use warp_core::SessionId;
use galaxy_completer::completer::{CommandExitStatus, CommandOutput};
use galaxy_core::command::ExitCode;
use galaxy_core::SessionId;
use crate::remote_server::proto::run_command_response;
use crate::terminal::model::session::command_executor::{CommandExecutor, ExecuteCommandOptions};
app/src/terminal/model/session/command_executor/tmux_executor.rs
+2 -2
View File
@@ -16,8 +16,8 @@ use crate::terminal::model::tmux::commands::TmuxCommand;
use crate::terminal::shell::Shell;
use super::CommandExecutor;
use warp_completer::completer::{CommandExitStatus, CommandOutput};
use warp_core::command::ExitCode;
use galaxy_completer::completer::{CommandExitStatus, CommandOutput};
use galaxy_core::command::ExitCode;
/// A `Session`-scoped executor for commands via tmux.
pub struct TmuxCommandExecutor {
app/src/terminal/model/session/command_executor/tmux_executor_tests.rs
+1 -1
View File
@@ -1,7 +1,7 @@
use crate::terminal::{model::session::ExecuteCommandOptions, shell::ShellType};
use super::*;
use warpui::App;
use galaxyui::App;
async fn execute_test_command<F>(
executor: Arc<TmuxCommandExecutor>,
app/src/terminal/model/session_test.rs
+1 -1
View File
@@ -1,6 +1,6 @@
use std::collections::HashMap;
use warpui::{
use galaxyui::{
elements::Empty, platform::WindowStyle, App, AppContext, Element, Entity, ModelHandle,
TypedActionView, View, ViewContext,
};
app/src/terminal/model/terminal_model.rs
+11 -11
View File
@@ -62,9 +62,9 @@ use crate::terminal::shell::{ShellName, ShellType};
use crate::terminal::model::secrets::ObfuscateSecrets;
use session_sharing_protocol::sharer::SessionSourceType;
use warp_core::report_error;
use galaxy_core::report_error;
#[cfg(not(target_family = "wasm"))]
use warpui::util::save_as_file;
use galaxyui::util::save_as_file;
use async_channel::Sender;
use base64::Engine;
@@ -82,14 +82,14 @@ use std::ops::{Range, RangeInclusive};
use std::path::PathBuf;
use std::str::FromStr;
use std::sync::Arc;
use warp_core::features::FeatureFlag;
use warp_core::semantic_selection::SemanticSelection;
pub use warp_terminal::model::BlockIndex;
use warp_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use warpui::assets::asset_cache::Asset;
use warpui::image_cache::ImageType;
use warpui::r#async::executor::Background;
use warpui::AppContext;
use galaxy_core::features::FeatureFlag;
use galaxy_core::semantic_selection::SemanticSelection;
pub use galaxy_terminal::model::BlockIndex;
use galaxy_terminal::model::{KeyboardModes, KeyboardModesApplyBehavior};
use galaxyui::assets::asset_cache::Asset;
use galaxyui::image_cache::ImageType;
use galaxyui::r#async::executor::Background;
use galaxyui::AppContext;
/// Max size of the window title stack.
const TITLE_STACK_MAX_DEPTH: usize = 4096;
@@ -2694,7 +2694,7 @@ impl ansi::Handler for TerminalModel {
delegate!(self.configure_charset(index, charset));
}
fn set_color(&mut self, index: usize, color: warpui::color::ColorU) {
fn set_color(&mut self, index: usize, color: galaxyui::color::ColorU) {
self.override_colors[index] = Some(color);
}
app/src/terminal/model/terminal_model_test.rs
+4 -4
View File
@@ -7,10 +7,10 @@ use crate::terminal::model::index::Side;
use crate::terminal::model::selection::ExpandedSelectionRange;
use chrono::{DateTime, Local};
use vec1::vec1;
use warp_core::command::ExitCode;
use warp_terminal::model::ansi::ClearMode;
use warpui::text::str_to_byte_vec;
use warpui::text::SelectionType;
use galaxy_core::command::ExitCode;
use galaxy_terminal::model::ansi::ClearMode;
use galaxyui::text::str_to_byte_vec;
use galaxyui::text::SelectionType;
/// Helper function to create a SerializedBlock with default values,
/// including the new is_local field.
app/src/terminal/model/test_utils.rs
+8 -8
View File
@@ -8,8 +8,8 @@
use std::{io::sink, sync::Arc};
use warp_core::command::ExitCode;
use warpui::r#async::executor::Background;
use galaxy_core::command::ExitCode;
use galaxyui::r#async::executor::Background;
use crate::ai::blocklist::SerializedBlockListItem;
use crate::terminal::{
@@ -51,7 +51,7 @@ fn block_padding() -> BlockPadding {
/// prompt:
///
/// ```no_run
/// # use warp::terminal::model::test_utils::TestBlockListBuilder;
/// # use galaxy::terminal::model::test_utils::TestBlockListBuilder;
/// let block_list = TestBlockListBuilder::new()
/// .with_honor_ps1(true)
/// .build();
@@ -63,10 +63,10 @@ fn block_padding() -> BlockPadding {
/// the channel event proxy:
///
/// ```no_run
/// # use warp::terminal::event::{BlockType, Event};
/// # use warp::terminal::event_listener::ChannelEventListener;
/// # use warp::terminal::model::block::SerializedBlock;
/// # use warp::terminal::model::test_utils::TestBlockListBuilder;
/// # use galaxy::terminal::event::{BlockType, Event};
/// # use galaxy::terminal::event_listener::ChannelEventListener;
/// # use galaxy::terminal::model::block::SerializedBlock;
/// # use galaxy::terminal::model::test_utils::TestBlockListBuilder;
///
/// let (events_tx, events_rx) = async_channel::unbounded();
/// let channel_event_proxy = ChannelEventListener::builder_for_test()
@@ -157,7 +157,7 @@ impl Default for TestBlockListBuilder<'_> {
/// For example, to create a [`Block`] that respects the user's custom prompt:
///
/// ```no_run
/// # use warp::terminal::model::test_utils::TestBlockBuilder;
/// # use galaxy::terminal::model::test_utils::TestBlockBuilder;
/// let block = TestBlockBuilder::new()
/// .with_honor_ps1(true)
/// .build();