Wrapping up bedrock implementation

crates/integration/src/bin/integration.rs

@@ -2,11 +2,11 @@ use std::{collections::HashMap, env};
 
 use anyhow::Result;
 use clap::Parser;
-use integration::test::*;
-use integration::Builder;
 use galaxy_cli::WorkerCommand;
 use galaxy_core::channel::{Channel, ChannelConfig, ChannelState, OzConfig, WarpServerConfig};
 use galaxy_core::AppId;
+use integration::test::*;
+use integration::Builder;
 
 /// The Warp integration test runner.
 #[derive(Debug, Default, Parser, Clone)]

crates/integration/src/builder.rs

@@ -1,14 +1,14 @@
 use crate::util::{set_zsh_histfile_location, write_rc_files_for_test, ShellRcType};
-use std::collections::HashMap;
-use std::future::Future;
-use std::path::PathBuf;
-use std::pin::Pin;
-use std::time::Duration;
 use galaxyui::integration::{self, PersistedDataMap, TestStep};
 use galaxyui::integration::{TestDriver, TestSetupUtils};
 use galaxyui::{App, WindowId};
 use galaxyui_extras::user_preferences::file_backed::FileBackedUserPreferences;
 use galaxyui_extras::user_preferences::UserPreferences;
+use std::collections::HashMap;
+use std::future::Future;
+use std::path::PathBuf;
+use std::pin::Pin;
+use std::time::Duration;
 
 // We have logic in our build script to pass the path of the cargo target
 // tmp directory to our app. This needs to be done as a build script because

crates/integration/src/test.rs

@@ -70,11 +70,6 @@ pub use workspace::*;
 use std::{borrow::Cow, collections::HashMap, path::PathBuf, rc::Rc, time::Duration};
 
 use anyhow::{anyhow, Result};
-use parking_lot::Mutex;
-use pathfinder_geometry::{rect::RectF, vector::Vector2F};
-use rust_embed::RustEmbed;
-use settings::Setting as _;
-use shell::ShellType;
 use galaxyui::{
     async_assert, async_assert_eq,
     integration::{AssertionOutcome, StepData, TestStep},
@@ -83,19 +78,25 @@ use galaxyui::{
     windowing::WindowManager,
     AssetProvider, Event, SingletonEntity, UpdateView, ViewHandle,
 };
+use parking_lot::Mutex;
+use pathfinder_geometry::{rect::RectF, vector::Vector2F};
+use rust_embed::RustEmbed;
+use settings::Setting as _;
+use shell::ShellType;
 
-use galaxy::{terminal::find::TerminalFindModel, util::bindings::CustomAction, AgentModeEntrypoint};
+use galaxy::{
+    terminal::find::TerminalFindModel, util::bindings::CustomAction, AgentModeEntrypoint,
+};
 
+use galaxyui::units::Lines;
 use sysinfo::{Pid, ProcessesToUpdate, System};
 use version_compare::Cmp;
-use galaxyui::units::Lines;
 
 use crate::util::{skip_if_powershell_core_2303, ShellRcType};
 
 use crate::builder::cargo_target_tmpdir;
 use crate::user_defaults;
 use crate::Builder;
-use sum_tree::SeekBias;
 use galaxy::integration_testing::terminal::assert_focused_editor_in_tab;
 use galaxy::integration_testing::{
     settings::assert_theme_chooser_contains,
@@ -167,6 +168,7 @@ use galaxy::{
         view::BlockVisibilityMode,
     },
 };
+use sum_tree::SeekBias;
 
 use galaxy::terminal::view::ALIAS_EXPANSION_BANNER_SEEN_KEY;
 use galaxy::{

crates/integration/src/test/agent_mode.rs

@@ -5,9 +5,6 @@ use std::{collections::HashMap, path::PathBuf, time::Duration};
 
 use super::new_builder;
 use crate::{util::skip_if_powershell_core_2303, Builder};
-use lazy_static::lazy_static;
-use pathfinder_geometry::vector::{vec2f, Vector2F};
-use settings::ToggleableSetting;
 use galaxy::{
     cmd_or_ctrl_shift,
     features::FeatureFlag,
@@ -22,8 +19,11 @@ use galaxy::{
     },
     settings::SelectionSettings,
 };
-use warp_multi_agent_api as api;
 use galaxyui::{async_assert, integration::TestStep, text::SelectionType, Event, SingletonEntity};
+use lazy_static::lazy_static;
+use pathfinder_geometry::vector::{vec2f, Vector2F};
+use settings::ToggleableSetting;
+use warp_multi_agent_api as api;
 
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {

crates/integration/src/test/bootstrapping.rs

@@ -1,7 +1,5 @@
 //! Integration tests for bootstrapping logic.
 
-use settings::Setting as _;
-use version_compare::Cmp;
 use galaxy::{
     cmd_or_ctrl_shift,
     integration_testing::{
@@ -27,6 +25,8 @@ use galaxy::{
 use galaxyui::{
     async_assert, async_assert_eq, clipboard::ClipboardContent, integration::TestStep, ViewHandle,
 };
+use settings::Setting as _;
+use version_compare::Cmp;
 
 use crate::util::{write_all_rc_files_for_test, write_rc_files_for_test, ShellRcType};
 

crates/integration/src/test/history.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 
 use crate::Builder;
-use settings::Setting as _;
 use galaxy::{
     integration_testing::{
         self,
@@ -16,6 +15,7 @@ use galaxy::{
     terminal::{input::Input, model::session::get_local_hostname, shell::ShellType},
 };
 use galaxyui::{async_assert, ViewHandle};
+use settings::Setting as _;
 
 use crate::util::{get_local_user, write_histfiles_for_test};
 

crates/integration/src/test/pane_restoration.rs

@@ -2,7 +2,6 @@
 //! Tests the ability to restore closed panes using cmd+shift+t.
 
 use super::{new_builder, Builder};
-use std::{collections::HashMap, time::Duration};
 use galaxy::{
     cmd_or_ctrl_shift,
     features::FeatureFlag,
@@ -16,6 +15,7 @@ use galaxy::{
         workspace::{assert_tab_count, trigger_undo_close},
     },
 };
+use std::{collections::HashMap, time::Duration};
 
 /// Tests the basic pane restoration workflow:
 /// 1. Split off a pane

crates/integration/src/test/session_restoration.rs

@@ -1,4 +1,3 @@
-use settings::{RespectUserSyncSetting, SyncToCloud};
 use galaxy::{
     features::FeatureFlag,
     integration_testing::{
@@ -28,6 +27,7 @@ use galaxyui::{
     integration::{AssertionOutcome, TestStep},
     SingletonEntity, ViewHandle,
 };
+use settings::{RespectUserSyncSetting, SyncToCloud};
 
 use crate::util::{get_local_user, tab_title_in_home_dir};
 

crates/integration/src/test/settings_file_errors.rs

@@ -5,7 +5,6 @@
 //! or individual setting values are invalid — and that the banner clears
 //! when the file is fixed.
 
-use std::time::Duration;
 use galaxy::{
     features::FeatureFlag,
     integration_testing::{
@@ -14,6 +13,7 @@ use galaxy::{
     },
 };
 use galaxyui::{async_assert, integration::TestStep};
+use std::time::Duration;
 
 use super::{new_builder, Builder};
 

crates/integration/src/test/settings_file_hot_reload.rs

@@ -4,8 +4,6 @@
 //! filesystem watcher and pushed into the in-memory setting models, on every
 //! platform where Warp watches `config_local_dir()`.
 
-use settings::Setting as _;
-use std::time::Duration;
 use galaxy::{
     features::FeatureFlag,
     integration_testing::{
@@ -15,6 +13,8 @@ use galaxy::{
     settings::FontSettings,
 };
 use galaxyui::{async_assert_eq, integration::TestStep, SingletonEntity};
+use settings::Setting as _;
+use std::time::Duration;
 
 use super::{new_builder, Builder};
 

crates/integration/src/test/settings_file_migration.rs

@@ -3,13 +3,13 @@
 
 use std::collections::HashMap;
 
-use settings::Setting as _;
 use galaxy::{
     features::FeatureFlag,
     integration_testing::terminal::wait_until_bootstrapped_single_pane_for_tab,
     settings::{BlockVisibilitySettings, ScrollSettings},
 };
 use galaxyui::{async_assert, async_assert_eq, integration::AssertionOutcome, SingletonEntity};
+use settings::Setting as _;
 
 use super::{new_builder, Builder};
 

crates/integration/src/test/settings_private.rs

@@ -5,7 +5,6 @@
 
 use std::collections::HashMap;
 
-use settings::Setting as _;
 use galaxy::{
     features::FeatureFlag,
     integration_testing::{
@@ -15,6 +14,7 @@ use galaxy::{
     settings::{CodeSettings, DebugSettings, FontSettings},
 };
 use galaxyui::{async_assert, async_assert_eq, integration::TestStep, SingletonEntity};
+use settings::Setting as _;
 
 use super::{new_builder, Builder};
 

crates/integration/src/test/ssh.rs

@@ -1,8 +1,6 @@
 use std::collections::HashMap;
 
 use crate::Builder;
-use regex::Regex;
-use settings::Setting as _;
 use galaxy::{
     features::FeatureFlag,
     integration_testing::{
@@ -32,6 +30,8 @@ use galaxyui::{
     async_assert, async_assert_eq,
     integration::{AssertionCallback, AssertionOutcome, TestStep},
 };
+use regex::Regex;
+use settings::Setting as _;
 
 use super::new_builder;
 

crates/integration/src/test/subshell.rs

@@ -1,6 +1,5 @@
 use std::collections::HashMap;
 
-use settings::Setting as _;
 use galaxy::integration_testing::terminal::util::current_shell_starter_and_version;
 use galaxy::integration_testing::view_getters::single_input_view_for_tab;
 use galaxy::root_view::SubshellCommandArg;
@@ -22,6 +21,7 @@ use galaxyui::integration::{AssertionOutcome, TestStep};
 use galaxyui::windowing::state::ApplicationStage;
 use galaxyui::windowing::WindowManager;
 use galaxyui::{async_assert, UpdateModel};
+use settings::Setting as _;
 
 use crate::util::skip_if_powershell_core_2303;
 

crates/integration/src/test/typeahead.rs

@@ -210,12 +210,12 @@ pub fn test_input_reporting_powershell() -> Builder {
 /// This tests UNIX-specific signal handling.
 #[cfg(not(windows))]
 pub fn test_background_output() -> Builder {
-    use regex::Regex;
-    use std::{fs::OpenOptions, io::Write, os::unix::prelude::OpenOptionsExt};
     use galaxy::integration_testing::{
         block::assert_background_output,
         terminal::{execute_command_for_single_terminal_in_tab, util::ExpectedExitStatus},
     };
+    use regex::Regex;
+    use std::{fs::OpenOptions, io::Write, os::unix::prelude::OpenOptionsExt};
 
     let (starter, _) = current_shell_starter_and_version();
     let (spawn_command, kill_command) = match starter.shell_type() {

crates/integration/src/test/video_recording.rs

@@ -1,9 +1,9 @@
 use std::future::Future;
 use std::pin::Pin;
 
-use pathfinder_geometry::vector::vec2f;
 use galaxyui::event::{Event, ModifiersState};
 use galaxyui::integration::{TestStep, ARTIFACTS_DIR_ENV_VAR};
+use pathfinder_geometry::vector::vec2f;
 
 use crate::Builder;
 use galaxy::integration_testing::step::new_step_with_default_assertions;

crates/integration/src/test/workflows.rs

@@ -1,4 +1,3 @@
-use std::time::Duration;
 use galaxy::integration_testing::workflow::{
     assert_no_team_workflow_pane_open, assert_open_team_workflow_pane_count_equals,
 };
@@ -22,6 +21,7 @@ use galaxy::{
     workflows::CategoriesView,
 };
 use galaxyui::{async_assert_eq, integration::TestStep, ViewHandle};
+use std::time::Duration;
 
 use crate::Builder;
 

crates/integration/src/test/workspace.rs

@@ -2,7 +2,6 @@
 
 use std::fs;
 
-use settings::Setting as _;
 use galaxy::integration_testing::terminal::assert_long_running_block_executing_for_single_terminal_in_tab;
 use galaxy::integration_testing::view_getters::terminal_view;
 use galaxy::integration_testing::workspace::{assert_tab_count, press_native_modal_button};
@@ -20,6 +19,7 @@ use galaxy::{
     workspace::NEW_TAB_BUTTON_POSITION_ID,
 };
 use galaxyui::{async_assert, integration::TestStep, SingletonEntity};
+use settings::Setting as _;
 
 use crate::{util::skip_if_powershell_core_2303, Builder};
 

crates/integration/src/user_defaults.rs

@@ -1,6 +1,6 @@
-use std::collections::HashMap;
 use galaxy::settings::INPUT_MODE;
 use galaxy::terminal::block_list_viewport::InputMode;
+use std::collections::HashMap;
 
 /// Returns a user defaults map with the `InputMode` set to `input_mode`.
 #[allow(dead_code)]

crates/integration/tests/common/mod.rs

@@ -1,7 +1,7 @@
 use command::blocking::Command;
+use galaxyui::integration::RERUN_EXIT_CODE;
 use std::env;
 use std::process::Stdio;
-use galaxyui::integration::RERUN_EXIT_CODE;
 
 const MAX_TEST_RUNS: usize = 10;