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

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
+10 -10
View File
@@ -4,9 +4,9 @@ use std::path::PathBuf;
use anyhow::{bail, Context as _, Result};
use channel_versions::VersionInfo;
use instant::Duration;
use warp_core::channel::{Channel, ChannelState};
use warp_terminal::shell::ShellType;
use warpui::ViewContext;
use galaxy_core::channel::{Channel, ChannelState};
use galaxy_terminal::shell::ShellType;
use galaxyui::ViewContext;
use crate::workspace::Workspace;
@@ -146,7 +146,7 @@ mod appimage {
let mut command = command::blocking::Command::new(appimage_path);
// Pass a flag to the app to let it know it was restarted as part of the
// autoupdate process.
command.arg(warp_cli::finish_update_flag());
command.arg(galaxy_cli::finish_update_flag());
// If we're testing with a local copy of channel_versions.json, have the
// newly-started binary also reference that same file (so we can test
// displaying an updated changelog after an autoupdate).
@@ -164,7 +164,7 @@ mod package_manager {
use markdown_parser::{
FormattedText, FormattedTextFragment, FormattedTextHeader, FormattedTextLine,
};
use warpui::{
use galaxyui::{
elements::{Container, FormattedTextElement, HighlightedHyperlink},
Element, SingletonEntity as _,
};
@@ -187,16 +187,16 @@ mod package_manager {
}
}
impl warpui::Entity for AutoupdateContextBlock {
impl galaxyui::Entity for AutoupdateContextBlock {
type Event = ();
}
impl warpui::View for AutoupdateContextBlock {
impl galaxyui::View for AutoupdateContextBlock {
fn ui_name() -> &'static str {
"AutoupdateContextBlock"
}
fn render(&self, app: &warpui::AppContext) -> Box<dyn warpui::Element> {
fn render(&self, app: &galaxyui::AppContext) -> Box<dyn galaxyui::Element> {
let appearance = Appearance::as_ref(app);
let theme = appearance.theme();
let package_manager_name = self.package_manager.to_string();
@@ -289,7 +289,7 @@ mod package_manager {
// Add any arguments that were passed to warp, skipping the first
// argument (the name of the executable) and dropping the flag for
// finishing an update.
let finish_update_flag = warp_cli::finish_update_flag();
let finish_update_flag = galaxy_cli::finish_update_flag();
command.args(
std::env::args()
.skip(1)
@@ -393,7 +393,7 @@ impl PackageManager {
is_signing_key_configured,
} => {
let repo_prefix = if !is_repo_configured {
let cache_dir = warp_core::paths::cache_dir();
let cache_dir = galaxy_core::paths::cache_dir();
let cache_dir_str = cache_dir.display();
// Back up the existing pacman.conf file just in case
// anything goes wrong, then add the repository config.
+13 -13
View File
@@ -13,14 +13,14 @@ use std::{
str,
time::Duration,
};
use warp_core::safe_error;
use galaxy_core::safe_error;
use anyhow::{anyhow, bail, ensure, Context, Result};
use channel_versions::VersionInfo;
use nix::unistd::{fchown, getgid};
use nix::{errno::Errno, unistd::getuid};
use warp_core::macos::get_bundle_path;
use warpui::{AppContext, ModelContext, SingletonEntity};
use galaxy_core::macos::get_bundle_path;
use galaxyui::{AppContext, ModelContext, SingletonEntity};
use crate::{
appearance::AppearanceManager,
@@ -45,7 +45,7 @@ const OLD_EXECUTABLE_FILE_NAME: &str = "old";
const PERMISSIONS_TMP_FILE_NAME: &str = "permission_test";
fn old_executable_file_path() -> PathBuf {
warp_core::paths::state_dir().join(OLD_EXECUTABLE_FILE_NAME)
galaxy_core::paths::state_dir().join(OLD_EXECUTABLE_FILE_NAME)
}
/// Removes the old executable dir from the app bundle. This is necessary because after an
@@ -143,7 +143,7 @@ pub(super) fn relaunch() -> Result<()> {
launch_command.push(bundle_path.as_os_str());
// Pass a flag to the app to let it know it was restarted as part of the
// autoupdate process.
launch_command.push(format!(" --args {}", warp_cli::finish_update_flag()));
launch_command.push(format!(" --args {}", galaxy_cli::finish_update_flag()));
// If we're testing with a local copy of channel_versions.json, have the
// newly-started binary also reference that same file (so we can test
// displaying an updated changelog after an autoupdate).
@@ -190,7 +190,7 @@ pub async fn cleanup(update_id: &str) {
/// This helps prevent accumulation of old update directories from failed downloads,
/// race conditions, or incomplete cleanups.
pub async fn cleanup_all_except(preserve_update_id: Option<&str>) {
let mut autoupdate_dir = warp_core::paths::cache_dir();
let mut autoupdate_dir = galaxy_core::paths::cache_dir();
autoupdate_dir.push("autoupdate");
if !autoupdate_dir.exists() {
@@ -315,7 +315,7 @@ async fn verify_code_signature(component: &str, path: &Path) -> Result<()> {
.arg("-v")
.arg(format!(
"-R=certificate leaf[subject.OU] = \"{}\"",
warp_core::macos::APPLE_TEAM_ID
galaxy_core::macos::APPLE_TEAM_ID
))
.arg(path)
.output()
@@ -664,7 +664,7 @@ async fn download_dmg(
}
fn get_download_dir(update_id: &str) -> PathBuf {
let mut dir = warp_core::paths::cache_dir();
let mut dir = galaxy_core::paths::cache_dir();
dir.push("autoupdate");
dir.push(update_id);
dir
@@ -732,12 +732,12 @@ fn dmg_name(channel: Channel) -> String {
fn app_name_prefix(channel: Channel) -> &'static str {
match channel {
Channel::Stable => "Warp",
Channel::Preview => "WarpPreview",
Channel::Local => "warp",
Channel::Stable => "GalaxyAI",
Channel::Preview => "GalaxyAIPreview",
Channel::Local => "galaxy-ai",
Channel::Integration => "integration",
Channel::Dev => "WarpDev",
Channel::Oss => "warp-oss",
Channel::Dev => "GalaxyAIDev",
Channel::Oss => "galaxy-ai-oss",
}
}
+7 -7
View File
@@ -23,16 +23,16 @@ use rand::Rng as _;
use std::collections::VecDeque;
use std::sync::Arc;
use std::time::Duration;
use warp_core::execution_mode::AppExecutionMode;
use warpui::platform::TerminationMode;
use warpui::r#async::Timer;
use warpui::windowing::state::ApplicationStage;
use warpui::windowing::{self, WindowManager};
use warpui::{
use galaxy_core::execution_mode::AppExecutionMode;
use galaxyui::platform::TerminationMode;
use galaxyui::r#async::Timer;
use galaxyui::windowing::state::ApplicationStage;
use galaxyui::windowing::{self, WindowManager};
use galaxyui::{
accessibility::{AccessibilityContent, WarpA11yRole},
AppContext,
};
use warpui::{Entity, ModelContext, SingletonEntity, ViewContext};
use galaxyui::{Entity, ModelContext, SingletonEntity, ViewContext};
pub use self::changelog::get_current_changelog;
use self::channel_versions::fetch_channel_versions;
+2 -2
View File
@@ -1,5 +1,5 @@
use chrono::{Local, TimeZone};
use warpui::{App, ModelHandle, ReadModel, UpdateModel};
use galaxyui::{App, ModelHandle, ReadModel, UpdateModel};
use crate::{
auth::{AuthManager, AuthStateProvider},
@@ -8,7 +8,7 @@ use crate::{
},
};
use warp_core::execution_mode::{AppExecutionMode, ExecutionMode};
use galaxy_core::execution_mode::{AppExecutionMode, ExecutionMode};
use super::*;
+8 -8
View File
@@ -11,8 +11,8 @@ use std::sync::Arc;
use std::{fs, io};
use std::{io::Write as _, time::Duration};
use tempfile::TempPath;
use warp_core::channel::{Channel, ChannelState};
use warpui::AppContext;
use galaxy_core::channel::{Channel, ChannelState};
use galaxyui::AppContext;
use super::{release_assets_directory_url, DownloadReady};
use crate::util::windows::install_dir;
@@ -74,7 +74,7 @@ pub(super) async fn download_update_and_cleanup(
const UPDATE_LOG_FILENAME: &str = "warp_update.log";
fn autoupdate_log_file() -> Result<PathBuf> {
warp_logging::log_directory().map(|dir| dir.join(UPDATE_LOG_FILENAME))
galaxy_logging::log_directory().map(|dir| dir.join(UPDATE_LOG_FILENAME))
}
/// Checks the autoupdate log file from a previous update attempt.
@@ -254,11 +254,11 @@ fn installer_file_name() -> Result<String> {
fn app_name_prefix(channel: Channel) -> &'static str {
match channel {
Channel::Stable => "Warp",
Channel::Preview => "WarpPreview",
Channel::Local => "warp",
Channel::Stable => "GalaxyAI",
Channel::Preview => "GalaxyAIPreview",
Channel::Local => "galaxy-ai",
Channel::Integration => "integration",
Channel::Dev => "WarpDev",
Channel::Oss => "warp-oss",
Channel::Dev => "GalaxyAIDev",
Channel::Oss => "galaxy-ai-oss",
}
}