DeMLS

Cargo.toml

@@ -3,21 +3,45 @@
 resolver = "3"
 
 members = [
-    "core/sqlite",
+    "bin/chat-cli",
+    "core/account",
     "core/conversations",
+    "core/core_client",
     "core/crypto",
     "core/double-ratchets",
+    "core/integration_tests_core",
+    "core/sqlite",
     "core/storage",
+    "crates/client-ffi",
     "crates/client",
+    "extensions/components", 
+]
+
+default-members = [
+    "core/account",
+    "core/conversations",
+    "core/core_client",
+    "core/crypto",
+    "core/double-ratchets",
+    "core/integration_tests_core",
+    "core/sqlite",
+    "core/storage",
     "crates/client-ffi",
-    "bin/chat-cli",
+    "crates/client",
 ]
 
 [workspace.dependencies]
-blake2 = "0.10"
+# Internal Workspace dependency declarations (sorted)
+chat-sqlite = { path = "core/sqlite" }
+components = { path = "extensions/components" }
+crypto = { path = "core/crypto" }
 libchat = { path = "core/conversations" }
+logos-account = { path = "core/account" }
 storage = { path = "core/storage" }
 
+# External Workspace dependency declarations (sorted)
+blake2 = "0.10"
+
 # Panicking across FFI boundaries is UB; abort is the correct strategy for a
 # C FFI library.
 [profile.release]

bin/chat-cli/Cargo.toml

@@ -8,16 +8,17 @@ name = "chat-cli"
 path = "src/main.rs"
 
 [dependencies]
-client = { path = "../../crates/client" }
-
-ratatui = "0.29"
-crossterm = "0.29"
-clap = { version = "4", features = ["derive"] }
+# External dependencies (sorted)
 anyhow = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
 arboard = "3"
 base64 = "0.22"
+clap = { version = "4", features = ["derive"] }
+# Reference a specific commit so updates to the Core does not break examples
+client = { git = "https://github.com/logos-messaging/libchat", rev = "39bf26756448dd16ddff89a6c0054f79236494aa" }
+crossterm = "0.29"
+ratatui = "0.29"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 thiserror = "2"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

core/account/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "logos-account"
+version = "0.1.0"
+edition = "2024"
+
+[features]
+dev = []
+
+[dependencies]
+# Workspace dependencies (sorted)
+crypto = { workspace = true }
+libchat = { workspace = true }
+
+core_client = {path = "../core_client"}
+
+# External dependencies (sorted)