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

app/src/context_chips/logging.rs

@@ -1,4 +1,6 @@
 use std::sync::mpsc;
+#[cfg(test)]
+use std::sync::Arc;
 #[cfg(not(test))]
 use std::sync::OnceLock;
 #[cfg(not(target_family = "wasm"))]
@@ -13,12 +15,8 @@ use galaxy_completer::completer::{CommandExitStatus, CommandOutput};
 #[cfg(test)]
 use parking_lot::Mutex;
 
-#[cfg(test)]
-use std::sync::Arc;
-
-use crate::terminal::shell::ShellType;
-
 use super::ContextChipKind;
+use crate::terminal::shell::ShellType;
 
 const EMPTY_VALUE: &str = "<empty>";
 const MISSING_VALUE: &str = "<none>";