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

app/src/integration_testing/rules/assertion.rs

@@ -1,15 +1,12 @@
-use galaxyui::{
-    async_assert, async_assert_eq,
-    integration::{AssertionCallback, AssertionWithDataCallback},
-    AppContext, SingletonEntity,
-};
+use galaxyui::integration::{AssertionCallback, AssertionWithDataCallback};
+use galaxyui::{async_assert, async_assert_eq, AppContext, SingletonEntity};
 
-use crate::{
-    ai::facts::{view::AIFactPage, CloudAIFactModel},
-    cloud_object::model::{generic_string_model::GenericStringObjectId, persistence::CloudModel},
-    integration_testing::view_getters::workspace_view,
-    server::ids::SyncId,
-};
+use crate::ai::facts::view::AIFactPage;
+use crate::ai::facts::CloudAIFactModel;
+use crate::cloud_object::model::generic_string_model::GenericStringObjectId;
+use crate::cloud_object::model::persistence::CloudModel;
+use crate::integration_testing::view_getters::workspace_view;
+use crate::server::ids::SyncId;
 
 /// Assert that a specific AI fact exists with the given content
 pub fn assert_rule_exists(

app/src/integration_testing/rules/step.rs

@@ -1,19 +1,17 @@
 use std::sync::Arc;
 
-use galaxyui::{
-    async_assert, integration::TestStep, windowing::WindowManager, SingletonEntity, WindowId,
-};
+use galaxyui::integration::TestStep;
+use galaxyui::windowing::WindowManager;
+use galaxyui::{async_assert, SingletonEntity, WindowId};
 
-use crate::{
-    ai::facts::{view::AIFactPage, AIMemory},
-    cloud_object::{model::persistence::CloudModel, Space},
-    integration_testing::view_getters::workspace_view,
-    server::{
-        cloud_objects::update_manager::UpdateManager,
-        ids::{ClientId, SyncId},
-    },
-    workspaces::user_workspaces::UserWorkspaces,
-};
+use crate::ai::facts::view::AIFactPage;
+use crate::ai::facts::AIMemory;
+use crate::cloud_object::model::persistence::CloudModel;
+use crate::cloud_object::Space;
+use crate::integration_testing::view_getters::workspace_view;
+use crate::server::cloud_objects::update_manager::UpdateManager;
+use crate::server::ids::{ClientId, SyncId};
+use crate::workspaces::user_workspaces::UserWorkspaces;
 
 /// Create a personal rule and save its sync ID into the step data.
 pub fn create_a_personal_rule(