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

app/src/search/ai_context_menu/rules/data_source.rs

@@ -1,3 +1,6 @@
+use fuzzy_match::FuzzyMatchResult;
+use warpui::{AppContext, Entity, SingletonEntity};
+
 use super::search_item::RuleSearchItem;
 use crate::ai::facts::{AIFact, CloudAIFactModel};
 use crate::cloud_object::model::generic_string_model::GenericStringObjectId;
@@ -6,8 +9,6 @@ use crate::cloud_object::CloudObject;
 use crate::search::ai_context_menu::mixer::AIContextMenuSearchableAction;
 use crate::search::data_source::{Query, QueryResult};
 use crate::search::mixer::{DataSourceRunErrorWrapper, SyncDataSource};
-use fuzzy_match::FuzzyMatchResult;
-use galaxyui::{AppContext, Entity, SingletonEntity};
 
 const MAX_RESULTS: usize = 50;
 const ZERO_STATE_BASE_SCORE: i64 = 1000;

app/src/search/ai_context_menu/rules/data_source_tests.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use chrono::{Duration, Utc};
-use galaxyui::{App, SingletonEntity};
+use cloud_object_client::MockObjectClient;
 use settings::manager::SettingsManager;
 
 use crate::ai::facts::{AIFact, AIMemory, CloudAIFactModel};
@@ -18,6 +18,8 @@ use crate::search::data_source::Query;
 use crate::search::mixer::SyncDataSource;
 use crate::server::cloud_objects::update_manager::UpdateManager;
 use crate::server::ids::{ServerId, SyncId};
+use crate::server::server_api::team::MockTeamClient;
+use crate::server::server_api::workspace::MockWorkspaceClient;
 use crate::server::server_api::ServerApiProvider;
 use crate::server::sync_queue::SyncQueue;
 use crate::settings::AISettings;
@@ -27,19 +29,21 @@ use crate::workspaces::user_profiles::UserProfiles;
 use crate::workspaces::user_workspaces::UserWorkspaces;
 use crate::NetworkStatus;
 
-use crate::server::server_api::object::MockObjectClient;
-use crate::server::server_api::team::MockTeamClient;
-use crate::server::server_api::workspace::MockWorkspaceClient;
-
 type ServerAIFact = GenericServerObject<
     crate::cloud_object::model::generic_string_model::GenericStringObjectId,
     CloudAIFactModel,
 >;
 
 fn mock_server_ai_fact(id: i64, name: &str, content: &str, revision: Revision) -> ServerAIFact {
-    GenericServerObject {
-        id: SyncId::ServerId(id.into()),
-        metadata: ServerMetadata {
+    GenericServerObject::new(
+        SyncId::ServerId(id.into()),
+        GenericStringModel::new(AIFact::Memory(AIMemory {
+            name: Some(name.to_string()),
+            content: content.to_string(),
+            is_autogenerated: false,
+            suggested_logging_id: None,
+        })),
+        ServerMetadata {
             uid: ServerId::default(),
             revision,
             metadata_last_updated_ts: Utc::now().into(),
@@ -50,21 +54,13 @@ fn mock_server_ai_fact(id: i64, name: &str, content: &str, revision: Revision) -
             last_editor_uid: None,
             current_editor_uid: None,
         },
-        permissions: ServerPermissions {
+        ServerPermissions {
             space: Owner::mock_current_user(),
             guests: Vec::new(),
             anyone_link_sharing: None,
             permissions_last_updated_ts: Utc::now().into(),
         },
-        model: GenericStringModel {
-            string_model: AIFact::Memory(AIMemory {
-                name: Some(name.to_string()),
-                content: content.to_string(),
-                is_autogenerated: false,
-                suggested_logging_id: None,
-            }),
-        },
-    }
+    )
 }
 
 fn initialize_app(app: &mut App) {

app/src/search/ai_context_menu/rules/search_item.rs

@@ -1,19 +1,20 @@
-use fuzzy_match::FuzzyMatchResult;
-use ordered_float::OrderedFloat;
 use std::fmt::Debug;
 
-use crate::appearance::Appearance;
-use crate::cloud_object::{GenericStringObjectFormat, JsonObjectType, ObjectType};
-use crate::search::ai_context_menu::styles;
-use crate::search::ai_context_menu::{mixer::AIContextMenuSearchableAction, safe_truncate};
-use crate::search::item::SearchItem;
-use crate::search::result_renderer::ItemHighlightState;
+use fuzzy_match::FuzzyMatchResult;
+use ordered_float::OrderedFloat;
 use galaxyui::elements::{
     ConstrainedBox, Container, CrossAxisAlignment, Flex, Highlight, Icon, ParentElement, Text,
 };
 use galaxyui::fonts::{Properties, Weight};
 use galaxyui::{AppContext, Element, SingletonEntity};
 
+use crate::appearance::Appearance;
+use crate::cloud_object::{GenericStringObjectFormat, JsonObjectType, ObjectType};
+use crate::search::ai_context_menu::mixer::AIContextMenuSearchableAction;
+use crate::search::ai_context_menu::{safe_truncate, styles};
+use crate::search::item::SearchItem;
+use crate::search::result_renderer::ItemHighlightState;
+
 const MAX_COMBINED_LENGTH: usize = 55;
 
 #[derive(Debug)]