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

app/src/integration_testing/agent_mode/step.rs

@@ -1,18 +1,24 @@
-use std::{fs::read, io::Cursor, path::Path, time::Duration};
+use std::fs::read;
+use std::io::Cursor;
+use std::path::Path;
+use std::time::Duration;
 
 use galaxyui::{async_assert, integration::TestStep, SingletonEntity};
 use prost::Message;
+use galaxyui::integration::TestStep;
+use galaxyui::{async_assert, SingletonEntity};
 
 use crate::ai::execution_profiles::profiles::AIExecutionProfilesModel;
 use crate::ai::execution_profiles::ActionPermission;
 use crate::ai::llms::{LLMId, LLMPreferences};
-use crate::integration_testing::agent_mode::ConversationTarget;
-use crate::integration_testing::{
-    agent_mode::{assert_latest_task_succeeds_or_blocked, assert_task_is_blocked},
-    step::{new_step_with_default_assertions, new_step_with_default_assertions_for_pane},
-    terminal::assert_input_is_focused,
-    view_getters::terminal_view,
+use crate::integration_testing::agent_mode::{
+    assert_latest_task_succeeds_or_blocked, assert_task_is_blocked, ConversationTarget,
 };
+use crate::integration_testing::step::{
+    new_step_with_default_assertions, new_step_with_default_assertions_for_pane,
+};
+use crate::integration_testing::terminal::assert_input_is_focused;
+use crate::integration_testing::view_getters::terminal_view;
 
 pub const AGENT_MODE_RUNNING_STEP_GROUP_NAME: &str = "Agent mode running";
 
@@ -162,8 +168,9 @@ pub fn submit_ai_query(query: &str, timeout: Duration) -> TestStep {
 fn print_conversation_id_assertion(
 ) -> impl FnMut(&mut galaxyui::App, galaxyui::WindowId) -> galaxyui::integration::AssertionOutcome {
     |app, window_id| {
-        use crate::BlocklistAIHistoryModel;
         use galaxyui::integration::AssertionOutcome;
+
+        use crate::BlocklistAIHistoryModel;
         let terminal_view = terminal_view(app, window_id, 0, 0);
         BlocklistAIHistoryModel::handle(app).read(app, |history_model, _| {
             if let Some(conversation) = history_model.active_conversation(terminal_view.id()) {