1 files changed, 13 insertions, 19 deletions
diff --git a/crates/daemon/src/lib.rs b/crates/daemon/src/lib.rs
index 1abf0314..a5d233c6 100644
--- a/crates/daemon/src/lib.rs
+++ b/crates/daemon/src/lib.rs
@@ -1,27 +1,25 @@
-use crate::atuin_client::database::ClientSqlite as HistoryDatabase;
-use crate::atuin_client::record::sqlite_store::SqliteStore;
-use crate::atuin_client::settings::{Settings, watcher::global_settings_watcher};
+use crate::aclient::database::ClientSqlite as HistoryDatabase;
+use crate::aclient::record::sqlite_store::SqliteStore;
+use crate::aclient::settings::{Settings, watcher::global_settings_watcher};
 use eyre::Result;
 
+pub mod aclient;
 pub mod client;
-pub mod components;
-pub mod control;
-pub mod daemon;
-pub mod events;
-pub mod search;
-pub mod server;
 
-pub mod generated;
+pub(crate) mod components;
+pub(crate) mod control;
+pub(crate) mod daemon;
+pub(crate) mod events;
+pub(crate) mod server;
+
+pub(crate) mod generated;
 
 // Re-export core daemon types for convenience
-pub use daemon::Daemon;
+pub(crate) use daemon::Daemon;
 pub use events::DaemonEvent;
 
 // Re-export components
-pub use components::{HistoryComponent, SearchComponent, SemanticComponent, SyncComponent};
-
-// Re-export client helpers
-pub use client::SemanticClient;
+pub(crate) use components::{HistoryComponent, SemanticComponent, SyncComponent};
 
 /// Boot the daemon using the new component-based architecture.
 ///
@@ -34,14 +32,12 @@ pub async fn boot(
 ) -> Result<()> {
     // Create the components
     let history_component = HistoryComponent::new();
-    let search_component = SearchComponent::new();
     let semantic_component = SemanticComponent::new();
     let sync_component = SyncComponent::new();
 
     // Get the gRPC services before moving components into the daemon
     // (The services share state with the components via Arc)
     let history_service = history_component.grpc_service();
-    let search_service = search_component.grpc_service();
     let semantic_service = semantic_component.grpc_service();
 
     // Build the daemon
@@ -49,7 +45,6 @@ pub async fn boot(
         .store(store)
         .history_db(history_db)
         .component(history_component)
-        .component(search_component)
         .component(semantic_component)
         .component(sync_component)
         .build()?;
@@ -94,7 +89,6 @@ pub async fn boot(
     server::run_grpc_server(
         &settings,
         history_service,
-        search_service,
         semantic_service,
         control_service.into_server(),
         handle,