18 files changed, 59 insertions, 66 deletions

diff --git a/crates/client/src/atuin_client/mod.rs b/crates/client/src/atuin_client/mod.rs
index 851dfbdb..0678d8b7 100644
--- a/crates/client/src/atuin_client/mod.rs
+++ b/crates/client/src/atuin_client/mod.rs
@@ -1,12 +1,2 @@
-pub(crate) mod api_client;
-pub(crate) mod database;
-pub(crate) mod encryption;
-pub(crate) mod history;
-pub(crate) mod meta;
-pub(crate) mod ordering;
-pub(crate) mod record;
-pub(crate) mod secrets;
 pub(crate) mod settings;
 pub(crate) mod theme;
-
-mod utils;
diff --git a/crates/client/src/atuin_client/settings/meta.rs b/crates/client/src/atuin_client/settings/meta.rs
index cc5afcf7..7993ef6d 100644
--- a/crates/client/src/atuin_client/settings/meta.rs
+++ b/crates/client/src/atuin_client/settings/meta.rs
@@ -7,7 +7,7 @@ pub(crate) struct Settings {
 
 impl Default for Settings {
     fn default() -> Self {
-        let dir = crate::atuin_common::utils::data_dir();
+        let dir = turtle_common::utils::data_dir();
         let path = dir.join("meta.db");
 
         Self {
diff --git a/crates/client/src/atuin_client/settings.rs b/crates/client/src/atuin_client/settings/mod.rs
index 9e14c4c8..0bddc09c 100644
--- a/crates/client/src/atuin_client/settings.rs
+++ b/crates/client/src/atuin_client/settings/mod.rs
@@ -6,8 +6,7 @@ use tokio::sync::OnceCell;
 use tracing::info;
 use uuid::Uuid;
 
-use crate::atuin_common::utils;
-use crate::{atuin_client::encryption::decode_key, atuin_common::record::HostId};
+use crate::aclient::encryption::decode_key;
 use clap::ValueEnum;
 use config::{
     Config, ConfigBuilder, Environment, File as ConfigFile, FileFormat, builder::DefaultState,
@@ -18,10 +17,12 @@ use regex::RegexSet;
 use serde::{Deserialize, Serialize};
 use serde_with::DeserializeFromStr;
 use time::{OffsetDateTime, UtcOffset, format_description::FormatItem, macros::format_description};
+use turtle_common::record::HostId;
+use turtle_common::utils;
 
 static DATA_DIR: OnceLock<PathBuf> = OnceLock::new();
 static META_CONFIG: OnceLock<(String, f64)> = OnceLock::new();
-static META_STORE: OnceCell<crate::atuin_client::meta::MetaStore> = OnceCell::const_new();
+static META_STORE: OnceCell<crate::aclient::meta::MetaStore> = OnceCell::const_new();
 
 pub(crate) mod meta;
 pub(crate) mod watcher;
@@ -852,7 +853,7 @@ impl Sync {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[expect(clippy::struct_excessive_bools)]
-pub(crate) struct Settings {
+pub struct Settings {
     pub(crate) data_dir: Option<String>,
     pub(crate) dialect: Dialect,
     pub(crate) timezone: Timezone,
@@ -938,13 +939,13 @@ pub(crate) struct Settings {
 impl Settings {
     // -- Meta store: lazily initialized on first access --
 
-    pub(crate) async fn meta_store() -> Result<&'static crate::atuin_client::meta::MetaStore> {
+    pub(crate) async fn meta_store() -> Result<&'static crate::aclient::meta::MetaStore> {
         META_STORE
             .get_or_try_init(|| async {
                 let (db_path, timeout) = META_CONFIG.get().ok_or_else(|| {
                     eyre!("meta store config not set — Settings::new() has not been called")
                 })?;
-                crate::atuin_client::meta::MetaStore::new(db_path, *timeout).await
+                crate::aclient::meta::MetaStore::new(db_path, *timeout).await
             })
             .await
     }
@@ -1464,7 +1465,7 @@ mod tests {
         assert_eq!(meta_db_path, custom_dir.join("meta.db").to_str().unwrap());
         assert_eq!(
             daemon_socket_path,
-            crate::atuin_common::utils::runtime_dir()
+            turtle_common::utils::runtime_dir()
                 .join("atuin.sock")
                 .to_str()
                 .unwrap()
diff --git a/crates/client/src/atuin_client/settings/watcher.rs b/crates/client/src/atuin_client/settings/watcher.rs
index 5eec3692..01d20855 100644
--- a/crates/client/src/atuin_client/settings/watcher.rs
+++ b/crates/client/src/atuin_client/settings/watcher.rs
@@ -6,7 +6,7 @@
 //! # Example
 //!
 //! ```no_run
-//! use crate::atuin_client::settings::watcher::global_settings_watcher;
+//! use crate::aclient::settings::watcher::global_settings_watcher;
 //!
 //! async fn example() -> eyre::Result<()> {
 //!     let watcher = global_settings_watcher()?;
@@ -96,7 +96,7 @@ impl SettingsWatcher {
     /// Get the config file path.
     fn config_path() -> PathBuf {
         let config_dir = std::env::var("ATUIN_CONFIG_DIR")
-            .map_or_else(|_| crate::atuin_common::utils::config_dir(), PathBuf::from);
+            .map_or_else(|_| turtle_common::utils::config_dir(), PathBuf::from);
         config_dir.join("config.toml")
     }
 
diff --git a/crates/client/src/atuin_client/api_client.rs b/crates/daemon/src/aclient/api_client.rs
index bd5bf59e..666e6dce 100644
--- a/crates/client/src/atuin_client/api_client.rs
+++ b/crates/daemon/src/aclient/api_client.rs
@@ -6,8 +6,8 @@ use reqwest::{Response, StatusCode, Url, header::HeaderMap};
 use tracing::debug;
 use uuid::Uuid;
 
-use crate::atuin_common::{api::ErrorResponse, record::RecordStatus};
-use crate::atuin_common::{
+use turtle_common::{api::ErrorResponse, record::RecordStatus};
+use turtle_common::{
     api::{ATUIN_CARGO_VERSION, ATUIN_HEADER_VERSION, ATUIN_VERSION},
     record::{EncryptedData, HostId, Record, RecordIdx},
     tls::ensure_crypto_provider,
diff --git a/crates/client/src/atuin_client/database.rs b/crates/daemon/src/aclient/database/mod.rs
index a9eb2058..36049f80 100644
--- a/crates/client/src/atuin_client/database.rs
+++ b/crates/daemon/src/aclient/database/mod.rs
@@ -4,7 +4,7 @@ use std::{
     str::FromStr,
 };
 
-use crate::{atuin_client::utils::setup_db, atuin_common::utils};
+use crate::aclient::utils::setup_db;
 use fs_err::{self as fs};
 use itertools::Itertools;
 use sql_builder::{SqlBuilder, SqlName, bind::Bind, esc, quote};
@@ -14,9 +14,10 @@ use sqlx::{
 };
 use time::OffsetDateTime;
 use tracing::debug;
+use turtle_common::utils;
 use uuid::Uuid;
 
-use crate::atuin_client::{
+use crate::aclient::{
     history::{HistoryId, HistoryStats},
     utils::get_host_user,
 };
@@ -93,12 +94,12 @@ fn get_session_start_time(session_id: &str) -> Option<i64> {
 // Intended for use on a developer machine and not a sync server.
 // TODO: implement IntoIterator
 #[derive(Debug, Clone)]
-pub(crate) struct ClientSqlite {
+pub struct ClientSqlite {
     pub(crate) pool: SqlitePool,
 }
 
 impl ClientSqlite {
-    pub(crate) async fn new(path: impl AsRef<Path>, timeout: f64) -> Result<Self> {
+    pub async fn new(path: impl AsRef<Path>, timeout: f64) -> Result<Self> {
         fn mk_opts(path: &str) -> Result<SqliteConnectOptions> {
             let opts = SqliteConnectOptions::from_str(path)?
                 .journal_mode(SqliteJournalMode::Wal)
@@ -800,7 +801,7 @@ impl SqlBuilderExt for SqlBuilder {
 
 #[cfg(test)]
 mod test {
-    use crate::atuin_client::settings::test_local_timeout;
+    use crate::aclient::settings::test_local_timeout;
 
     use super::{
         ClientSqlite, Context, FilterMode, History, OffsetDateTime, OptFilters, Result, SearchMode,
diff --git a/crates/client/src/atuin_client/encryption.rs b/crates/daemon/src/aclient/encryption.rs
index f1c921cb..220ac74e 100644
--- a/crates/client/src/atuin_client/encryption.rs
+++ b/crates/daemon/src/aclient/encryption.rs
@@ -17,7 +17,7 @@ use eyre::{Context, Result, bail, ensure, eyre};
 use fs_err as fs;
 use rmp::Marker;
 
-use crate::atuin_client::settings::Settings;
+use crate::aclient::settings::Settings;
 
 pub(crate) fn generate_encoded_key() -> Result<(Key, String)> {
     let key = XSalsa20Poly1305::generate_key(&mut OsRng);
diff --git a/crates/client/src/atuin_client/history/builder.rs b/crates/daemon/src/aclient/history/builder.rs
index daa4ef49..daa4ef49 100644
--- a/crates/client/src/atuin_client/history/builder.rs
+++ b/crates/daemon/src/aclient/history/builder.rs
diff --git a/crates/client/src/atuin_client/history.rs b/crates/daemon/src/aclient/history/mod.rs
index c38d8ccc..09d24169 100644
--- a/crates/client/src/atuin_client/history.rs
+++ b/crates/daemon/src/aclient/history/mod.rs
@@ -5,14 +5,14 @@ use rmp::{Marker, decode::Bytes};
 use std::env;
 use std::fmt::Display;
 
-use crate::atuin_common::record::DecryptedData;
-use crate::atuin_common::utils::uuid_v7;
+use turtle_common::record::DecryptedData;
+use turtle_common::utils::uuid_v7;
 
 use eyre::{Result, bail, eyre};
 
-use crate::atuin_client::secrets::SECRET_PATTERNS_RE;
-use crate::atuin_client::settings::Settings;
-use crate::atuin_client::utils::get_host_user;
+use crate::aclient::secrets::SECRET_PATTERNS_RE;
+use crate::aclient::settings::Settings;
+use crate::aclient::utils::get_host_user;
 use time::OffsetDateTime;
 
 mod builder;
@@ -28,7 +28,7 @@ const HISTORY_AUTHOR_ENV: &str = "ATUIN_HISTORY_AUTHOR";
 const HISTORY_INTENT_ENV: &str = "ATUIN_HISTORY_INTENT";
 
 #[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub(crate) struct HistoryId(pub(crate) String);
+pub struct HistoryId(pub(crate) String);
 
 impl Display for HistoryId {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
@@ -56,7 +56,7 @@ impl From<String> for HistoryId {
 // New fields must be added to `History::{serialize,deserialize}` in a backwards
 // compatible way (sensible defaults and careful `nfields` handling).
 #[derive(Debug, Clone, PartialEq, Eq, sqlx::FromRow)]
-pub(crate) struct History {
+pub struct History {
     /// A client-generated ID, used to identify the entry when syncing.
     ///
     /// Stored as `client_id` in the database.
@@ -375,7 +375,7 @@ impl History {
     ///
     /// ## Examples
     /// ```rust
-    /// use crate::atuin_client::history::History;
+    /// use crate::aclient::history::History;
     ///
     /// let history: History = History::capture()
     ///     .timestamp(time::OffsetDateTime::now_utc())
@@ -388,7 +388,7 @@ impl History {
     /// Command without any required info cannot be captured, which is forced at compile time:
     ///
     /// ```compile_fail
-    /// use crate::atuin_client::history::History;
+    /// use crate::aclient::history::History;
     ///
     /// // this will not compile because `cwd` is missing
     /// let history: History = History::capture()
@@ -413,7 +413,7 @@ impl History {
     ///
     /// ## Examples
     /// ```rust
-    /// use crate::atuin_client::history::History;
+    /// use crate::aclient::history::History;
     ///
     /// let history: History = History::daemon()
     ///     .timestamp(time::OffsetDateTime::now_utc())
@@ -428,7 +428,7 @@ impl History {
     /// Command without any required info cannot be captured, which is forced at compile time:
     ///
     /// ```compile_fail
-    /// use crate::atuin_client::history::History;
+    /// use crate::aclient::history::History;
     ///
     /// // this will not compile because `hostname` is missing
     /// let history: History = History::daemon()
@@ -448,7 +448,7 @@ impl History {
     /// All fields are required, as they are all present in the database.
     ///
     /// ```compile_fail
-    /// use crate::atuin_client::history::History;
+    /// use crate::aclient::history::History;
     ///
     /// // this will not compile because `id` field is missing
     /// let history: History = History::from_db()
@@ -486,7 +486,7 @@ mod tests {
     use regex::RegexSet;
     use time::macros::datetime;
 
-    use crate::atuin_client::{history::HISTORY_VERSION, settings::Settings};
+    use crate::aclient::{history::HISTORY_VERSION, settings::Settings};
 
     use super::History;
 
diff --git a/crates/client/src/atuin_client/history/store.rs b/crates/daemon/src/aclient/history/store.rs
index 9c7771cc..db692590 100644
--- a/crates/client/src/atuin_client/history/store.rs
+++ b/crates/daemon/src/aclient/history/store.rs
@@ -5,11 +5,11 @@ use indicatif::{ProgressBar, ProgressState, ProgressStyle};
 use rmp::decode::Bytes;
 use tracing::debug;
 
-use crate::atuin_client::{
+use crate::aclient::{
     database::{ClientSqlite, current_context},
     record::{encryption::PASETO_V4, sqlite_store::SqliteStore},
 };
-use crate::atuin_common::record::{DecryptedData, Host, HostId, Record, RecordId, RecordIdx};
+use turtle_common::record::{DecryptedData, Host, HostId, Record, RecordId, RecordIdx};
 
 use super::{HISTORY_TAG, HISTORY_VERSION, HISTORY_VERSION_V0, History, HistoryId};
 
@@ -364,10 +364,10 @@ impl HistoryStore {
 
 #[cfg(test)]
 mod tests {
-    use crate::atuin_common::record::DecryptedData;
+    use turtle_common::record::DecryptedData;
     use time::macros::datetime;
 
-    use crate::atuin_client::history::{HISTORY_VERSION, store::HistoryRecord};
+    use crate::aclient::history::{HISTORY_VERSION, store::HistoryRecord};
 
     use super::History;
 
diff --git a/crates/client/src/atuin_client/meta.rs b/crates/daemon/src/aclient/meta.rs
index 079c9926..00dabcce 100644
--- a/crates/client/src/atuin_client/meta.rs
+++ b/crates/daemon/src/aclient/meta.rs
@@ -2,7 +2,7 @@ use std::path::Path;
 use std::str::FromStr;
 use std::time::Duration;
 
-use crate::atuin_common::record::HostId;
+use turtle_common::record::HostId;
 use eyre::{Result, eyre};
 use sqlx::sqlite::{SqliteConnectOptions, SqliteJournalMode, SqlitePool, SqlitePoolOptions};
 use time::{OffsetDateTime, format_description::well_known::Rfc3339};
@@ -108,7 +108,7 @@ impl MetaStore {
                     return Ok(HostId(parsed));
                 }
 
-                let uuid = crate::atuin_common::utils::uuid_v7();
+                let uuid = turtle_common::utils::uuid_v7();
                 self.set(KEY_HOST_ID, uuid.as_simple().to_string().as_ref())
                     .await?;
 
diff --git a/crates/client/src/atuin_client/ordering.rs b/crates/daemon/src/aclient/ordering.rs
index 84001f52..84001f52 100644
--- a/crates/client/src/atuin_client/ordering.rs
+++ b/crates/daemon/src/aclient/ordering.rs
diff --git a/crates/client/src/atuin_client/record/encryption.rs b/crates/daemon/src/aclient/record/encryption.rs
index d8587cf6..6851a99f 100644
--- a/crates/client/src/atuin_client/record/encryption.rs
+++ b/crates/daemon/src/aclient/record/encryption.rs
@@ -1,4 +1,4 @@
-use crate::atuin_common::record::{
+use turtle_common::record::{
     AdditionalData, DecryptedData, EncryptedData, Encryption, HostId, RecordId, RecordIdx,
 };
 use base64::{Engine, engine::general_purpose};
@@ -201,7 +201,7 @@ impl Assertions<'_> {
 
 #[cfg(test)]
 mod tests {
-    use crate::atuin_common::{
+    use turtle_common::{
         record::{Host, Record},
         utils::uuid_v7,
     };
diff --git a/crates/client/src/atuin_client/record/mod.rs b/crates/daemon/src/aclient/record/mod.rs
index 4e5774ea..2ace26f5 100644
--- a/crates/client/src/atuin_client/record/mod.rs
+++ b/crates/daemon/src/aclient/record/mod.rs
@@ -1,3 +1,4 @@
 pub(crate) mod encryption;
-pub(crate) mod sqlite_store;
 pub(crate) mod sync;
+
+pub mod sqlite_store;
diff --git a/crates/client/src/atuin_client/record/sqlite_store.rs b/crates/daemon/src/aclient/record/sqlite_store.rs
index 18f5c869..f2fc9d84 100644
--- a/crates/client/src/atuin_client/record/sqlite_store.rs
+++ b/crates/daemon/src/aclient/record/sqlite_store.rs
@@ -14,22 +14,22 @@ use sqlx::{
 };
 use tracing::debug;
 
-use crate::atuin_client::utils::setup_db;
-use crate::atuin_common::record::{
+use crate::aclient::utils::setup_db;
+use turtle_common::record::{
     EncryptedData, Host, HostId, Record, RecordId, RecordIdx, RecordStatus,
 };
-use crate::atuin_common::utils;
+use turtle_common::utils;
 use uuid::Uuid;
 
 use super::encryption::PASETO_V4;
 
 #[derive(Debug, Clone)]
-pub(crate) struct SqliteStore {
+pub struct SqliteStore {
     pool: SqlitePool,
 }
 
 impl SqliteStore {
-    pub(crate) async fn new(path: impl AsRef<Path>, timeout: f64) -> Result<Self> {
+    pub async fn new(path: impl AsRef<Path>, timeout: f64) -> Result<Self> {
         fn mk_opts(path: &str) -> sqlx::Result<SqliteConnectOptions> {
             let opts = SqliteConnectOptions::from_str(path)?
                 .journal_mode(SqliteJournalMode::Wal)
diff --git a/crates/client/src/atuin_client/record/sync.rs b/crates/daemon/src/aclient/record/sync.rs
index da05533c..94764f67 100644
--- a/crates/client/src/atuin_client/record/sync.rs
+++ b/crates/daemon/src/aclient/record/sync.rs
@@ -6,10 +6,10 @@ use thiserror::Error;
 use tracing::error;
 
 use super::encryption::PASETO_V4;
-use crate::atuin_client::record::sqlite_store::SqliteStore;
-use crate::atuin_client::{api_client::Client, settings::Settings};
+use crate::aclient::record::sqlite_store::SqliteStore;
+use crate::aclient::{api_client::Client, settings::Settings};
 
-use crate::atuin_common::record::{Diff, HostId, RecordId, RecordIdx, RecordStatus};
+use turtle_common::record::{Diff, HostId, RecordId, RecordIdx, RecordStatus};
 use indicatif::{ProgressBar, ProgressState, ProgressStyle};
 
 #[derive(Error, Debug)]
@@ -374,10 +374,10 @@ pub(crate) async fn sync(
 
 #[cfg(test)]
 mod tests {
-    use crate::atuin_client::record::sync::Operation;
-    use crate::atuin_common::record::{Diff, EncryptedData, HostId, Record};
+    use crate::aclient::record::sync::Operation;
+    use turtle_common::record::{Diff, EncryptedData, HostId, Record};
 
-    use crate::atuin_client::{
+    use crate::aclient::{
         record::{
             sqlite_store::SqliteStore,
             sync::{self},
@@ -387,11 +387,11 @@ mod tests {
 
     fn test_record() -> Record<EncryptedData> {
         Record::builder()
-            .host(crate::atuin_common::record::Host::new(HostId(
-                crate::atuin_common::utils::uuid_v7(),
+            .host(turtle_common::record::Host::new(HostId(
+                turtle_common::utils::uuid_v7(),
             )))
             .version("v1".into())
-            .tag(crate::atuin_common::utils::uuid_v7().simple().to_string())
+            .tag(turtle_common::utils::uuid_v7().simple().to_string())
             .data(EncryptedData {
                 data: String::new(),
                 content_encryption_key: String::new(),
diff --git a/crates/client/src/atuin_client/secrets.rs b/crates/daemon/src/aclient/secrets.rs
index 74d47ea6..08d24339 100644
--- a/crates/client/src/atuin_client/secrets.rs
+++ b/crates/daemon/src/aclient/secrets.rs
@@ -173,7 +173,7 @@ pub(crate) static SECRET_PATTERNS_RE: LazyLock<RegexSet> = LazyLock::new(|| {
 mod tests {
     use regex::Regex;
 
-    use crate::atuin_client::secrets::{SECRET_PATTERNS, TestValue};
+    use crate::aclient::secrets::{SECRET_PATTERNS, TestValue};
 
     #[test]
     fn test_secrets() {
diff --git a/crates/client/src/atuin_client/utils.rs b/crates/daemon/src/aclient/utils.rs
index 989f9fc1..cf515183 100644
--- a/crates/client/src/atuin_client/utils.rs
+++ b/crates/daemon/src/aclient/utils.rs
@@ -28,7 +28,7 @@ macro_rules! setup_db {
             Ok(())
         }
 
-        crate::atuin_client::utils::setup_db_inner($db_path, $a_timeout, $opts, migrate)
+        crate::aclient::utils::setup_db_inner($db_path, $a_timeout, $opts, migrate)
     }};
 }
 pub(crate) use setup_db;