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

first pass of merging in warp (doesn't build)

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/terminal/prompt_render_helper.rs
+34 -32
View File
@@ -1,45 +1,40 @@
use crate::ai::blocklist::BlocklistAIInputModel;
use crate::context_chips::display::PromptDisplay;
use crate::context_chips::spacing;
use crate::features::FeatureFlag;
use crate::settings::InputSettings;
use crate::terminal::grid_size_util::grid_compute_baseline_position_fn;
use crate::terminal::ligature_settings::should_use_ligature_rendering;
use crate::terminal::view::TerminalAction;
use crate::themes::theme::PromptColors;
use crate::{appearance::Appearance, terminal::model::blockgrid::BlockGrid};
use settings::Setting as _;
use galaxy_core::semantic_selection::SemanticSelection;
use galaxyui::elements::{DispatchEventResult, SelectionHandle};
use galaxyui::ModelAsRef;
use galaxyui::{
elements::{Container, Element, EventHandler, SavePosition, SelectableArea, Text},
fonts::{Properties, Weight},
presenter::ChildView,
AppContext, EntityId, ModelHandle, SingletonEntity, ViewHandle,
};
use std::fmt;
use std::num::NonZeroUsize;
use settings::Setting as _;
use galaxy_core::semantic_selection::SemanticSelection;
use galaxyui::elements::{
Container, DispatchEventResult, Element, EventHandler, SavePosition, SelectableArea,
SelectionHandle, Text,
};
use galaxyui::fonts::{Properties, Weight};
use galaxyui::presenter::ChildView;
use galaxyui::units::Pixels;
use galaxyui::{AppContext, EntityId, ModelAsRef, ModelHandle, SingletonEntity, ViewHandle};
use super::input::InputRenderStateModel;
use super::model::block::Block;
use super::shell::ShellType;
use crate::settings::FontSettings;
use crate::terminal::input::get_input_box_top_border_width;
use super::model::blocks::CachedPromptData;
use super::safe_mode_settings::get_secret_obfuscation_mode;
use super::session_settings::SessionSettings;
use super::settings::TerminalSettings;
use super::shell::ShellType;
use super::{prompt, SizeInfo, TerminalModel};
use crate::ai::blocklist::BlocklistAIInputModel;
use crate::appearance::Appearance;
use crate::context_chips::display::PromptDisplay;
use crate::context_chips::spacing;
use crate::features::FeatureFlag;
use crate::settings::{FontSettings, InputSettings};
use crate::terminal::blockgrid_element::BlockGridElement;
use crate::terminal::grid_size_util::grid_compute_baseline_position_fn;
use crate::terminal::input::get_input_box_top_border_width;
use crate::terminal::ligature_settings::should_use_ligature_rendering;
use crate::terminal::model::blockgrid::BlockGrid;
use crate::terminal::model::session::Sessions;
use crate::terminal::view::PADDING_LEFT as TERMINAL_VIEW_PADDING_LEFT;
use crate::terminal::model::ObfuscateSecrets;
use galaxyui::units::Pixels;
use crate::terminal::view::{TerminalAction, PADDING_LEFT as TERMINAL_VIEW_PADDING_LEFT};
use crate::themes::theme::PromptColors;
/// How long we're willing to wait after precmd for a marker-based prompt to appear before we
/// display an empty prompt grid in the input.
@@ -256,13 +251,20 @@ impl PromptRenderHelper {
RemoteServerSetupState::Checking => "Starting shell...".to_string(),
RemoteServerSetupState::Installing {
progress_percent: Some(p),
} => format!("Installing Galaxy SSH tools... ({p}%)"),
} => format!("Installing Warp SSH Extension... ({p}%)"),
RemoteServerSetupState::Installing {
progress_percent: None,
} => "Installing Galaxy SSH tools...".to_string(),
} => "Installing Warp SSH Extension...".to_string(),
RemoteServerSetupState::Updating => {
"Updating Warp SSH Extension...".to_string()
}
RemoteServerSetupState::Initializing => "Initializing...".to_string(),
RemoteServerSetupState::Ready => "Starting shell...".to_string(),
RemoteServerSetupState::Failed { .. } => "Starting shell...".to_string(),
// Failed and Unsupported both fall back to the wrapper-only SSH
// flow, so we render the same generic prompt as a normal
// SSH session that doesn't have the remote-server extension.
RemoteServerSetupState::Failed { .. }
| RemoteServerSetupState::Unsupported { .. } => "Starting shell...".to_string(),
};
}
}