6 files changed, 13 insertions, 14 deletions
diff --git a/crates/turtle/src/command/client/store/pull.rs b/crates/turtle/src/command/client/store/pull.rs
index f2e628d6..3a0865be 100644
--- a/crates/turtle/src/command/client/store/pull.rs
+++ b/crates/turtle/src/command/client/store/pull.rs
@@ -2,7 +2,13 @@ use clap::Args;
 use eyre::Result;
 
 use crate::atuin_client::{
-    database::ClientSqlite, encryption::load_key, record::{sqlite_store::SqliteStore, store::Store, sync::{self, Operation}}, settings::Settings
+    database::ClientSqlite,
+    encryption::load_key,
+    record::{
+        sqlite_store::SqliteStore,
+        sync::{self, Operation},
+    },
+    settings::Settings,
 };
 
 #[derive(Args, Debug)]
@@ -42,7 +48,7 @@ impl Pull {
         // 3. Filter operations by
         //  a) are they a download op?
         //  b) are they for the host/tag we are pushing here?
-        let client = sync::build_client(settings).await?;
+        let client = sync::build_client(settings)?;
         let (diff, remote_index) = sync::diff(&client, &store).await?;
 
         // Skip on --force: local was already wiped above, mismatch is the user's call.
@@ -53,7 +59,7 @@ impl Pull {
                 .map_err(crate::print_error::format_sync_error)?;
         }
 
-        let operations = sync::operations(diff, &store).await?;
+        let operations = sync::operations(diff, &store)?;
 
         let operations = operations
             .into_iter()
diff --git a/crates/turtle/src/command/client/store/purge.rs b/crates/turtle/src/command/client/store/purge.rs
index 3ed55787..a23f1886 100644
--- a/crates/turtle/src/command/client/store/purge.rs
+++ b/crates/turtle/src/command/client/store/purge.rs
@@ -2,9 +2,7 @@ use clap::Args;
 use eyre::Result;
 
 use crate::atuin_client::{
-    encryption::load_key,
-    record::{sqlite_store::SqliteStore, store::Store},
-    settings::Settings,
+    encryption::load_key, record::sqlite_store::SqliteStore, settings::Settings,
 };
 
 #[derive(Args, Debug)]
diff --git a/crates/turtle/src/command/client/store/push.rs b/crates/turtle/src/command/client/store/push.rs
index beec613c..9d66b5b2 100644
--- a/crates/turtle/src/command/client/store/push.rs
+++ b/crates/turtle/src/command/client/store/push.rs
@@ -60,7 +60,7 @@ impl Push {
         // 3. Filter operations by
         //  a) are they an upload op?
         //  b) are they for the host/tag we are pushing here?
-        let client = sync::build_client(settings).await?;
+        let client = sync::build_client(settings)?;
         let (diff, remote_index) = sync::diff(&client, &store).await?;
 
         // Skip on --force: that path intentionally replaces remote with local.
@@ -71,7 +71,7 @@ impl Push {
                 .map_err(crate::print_error::format_sync_error)?;
         }
 
-        let operations = sync::operations(diff, &store).await?;
+        let operations = sync::operations(diff, &store)?;
 
         let operations = operations
             .into_iter()
diff --git a/crates/turtle/src/command/client/store/rebuild.rs b/crates/turtle/src/command/client/store/rebuild.rs
index bee1aa05..6be67cd0 100644
--- a/crates/turtle/src/command/client/store/rebuild.rs
+++ b/crates/turtle/src/command/client/store/rebuild.rs
@@ -1,7 +1,6 @@
 use clap::Args;
 use eyre::{Result, bail};
 
-#[cfg(feature = "daemon")]
 use crate::command::client::daemon as daemon_cmd;
 
 use crate::atuin_client::{
@@ -50,7 +49,6 @@ impl Rebuild {
 
         history_store.build(database).await?;
 
-        #[cfg(feature = "daemon")]
         daemon_cmd::emit_event(settings, crate::atuin_daemon::DaemonEvent::HistoryRebuilt).await;
 
         Ok(())
diff --git a/crates/turtle/src/command/client/store/rekey.rs b/crates/turtle/src/command/client/store/rekey.rs
index b99fb16a..e89d83c2 100644
--- a/crates/turtle/src/command/client/store/rekey.rs
+++ b/crates/turtle/src/command/client/store/rekey.rs
@@ -5,7 +5,6 @@ use tokio::{fs::File, io::AsyncWriteExt};
 use crate::atuin_client::{
     encryption::{decode_key, generate_encoded_key, load_key},
     record::sqlite_store::SqliteStore,
-    record::store::Store,
     settings::Settings,
 };
 
diff --git a/crates/turtle/src/command/client/store/verify.rs b/crates/turtle/src/command/client/store/verify.rs
index e91addcf..a39227f9 100644
--- a/crates/turtle/src/command/client/store/verify.rs
+++ b/crates/turtle/src/command/client/store/verify.rs
@@ -2,9 +2,7 @@ use clap::Args;
 use eyre::Result;
 
 use crate::atuin_client::{
-    encryption::load_key,
-    record::{sqlite_store::SqliteStore, store::Store},
-    settings::Settings,
+    encryption::load_key, record::sqlite_store::SqliteStore, settings::Settings,
 };
 
 #[derive(Args, Debug)]