refactor(humd): fold thrumd crate into humd::thrumd module

Cargo.toml

@@ -13,7 +13,6 @@ exclude = [
 ]
 members = [
     "thrum-core",
-    "thrumd",
     "hum-paths",
     "hum-identity",
     "hum-thrum",

ensemble/src/lib.rs

@@ -80,7 +80,7 @@ const HANDSHAKE_DOMAIN: &str = "hum-ensemble-handshake-v1";
 /// Tolerance window for `signed_at` skew, both directions.
 const HANDSHAKE_SKEW_MS: i64 = 60_000;
 
-/// Tones flow through the ensemble as loose JSON — same shape thrumd
+/// Tones flow through the ensemble as loose JSON — same shape humd's thrum module
 /// uses on the wire. Strict typing lives in `thrum_core::Tone` for
 /// callers that need it; here we stay loose so any new chi flows
 /// through without a type bump.

ensemble/src/tcp.rs

@@ -2,7 +2,7 @@
 //!
 //! NDJSON over `tokio::net::TcpStream`. One framing rule: each tone is
 //! a single JSON value followed by `\n`. Mirrors the unix-socket shape
-//! thrumd uses (`thrumd/src/conn.rs`) — same parser, different socket.
+//! humd's thrum module uses (`humd/src/thrumd/conn.rs`) — same parser, different socket.
 //!
 //! Auth lives one layer up: the ensemble's signed `chi:"hello"` exchange
 //! authenticates the peer once a connection is installed. This module

humd/Cargo.toml

@@ -22,7 +22,6 @@ anyhow = { workspace = true }
 
 # Path deps on every workspace crate.
 thrum-core = { path = "../thrum-core" }
-thrumd = { path = "../thrumd" }
 hum-mcp = { path = "../hum-mcp" }
 hum-identity = { path = "../hum-identity" }
 thehum = { path = "../thehum" }
@@ -37,6 +36,7 @@ ed25519-dalek = { version = "2", features = ["rand_core"] }
 metrics = "0.23"
 metrics-exporter-prometheus = { version = "0.15", default-features = false, features = ["http-listener"] }
 chrono = { workspace = true }
+governor = "0.6"
 
 [dev-dependencies]
 tokio = { workspace = true }

humd/README.md

@@ -130,7 +130,7 @@ binary runs.
 
 - [`hum-paths`](../hum-paths): the XDG layout humd's filesystem state hangs from.
 - [`ensemble`](../ensemble): the mesh humd plugs into. Transports, signed hello, peer registry, gossip, kad.
-- [`thrumd`](../thrumd): the unix socket server humd hosts for local bees.
+- `thrumd` (in `src/thrumd.rs`): the unix socket server humd hosts for local bees.
 - [`thehum`](../thehum): the signed append-only chi log humd writes every tone into.
 - [`sim`](../sim): the in-process multi-humd simulator, calls `humd::run` with overrides.
 - [`hum`](../hum): the user-facing CLI that inspects and configures humd.

humd/src/lib.rs

@@ -27,6 +27,7 @@ mod identity;
 mod peer_transport;
 mod peers;
 mod penny;
+pub mod thrumd;
 pub use identity::{key_path, load_or_mint_key, read_key};
 pub use peers::{peers_path, PeerConfig};
 

thrumd/src/conn.rs → humd/src/thrumd/conn.rs

@@ -10,8 +10,8 @@ use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::UnixStream;
 use tokio::sync::mpsc;
 use tracing::{info, trace, warn};
-use crate::registry::Reach;
-use crate::{
+use super::registry::Reach;
+use super::{
     breath_tone, chi_of, echo_tone, rid_of, short, tone_is_dusk, validate_envelope, Thrum,
 };
 
@@ -193,11 +193,11 @@ async fn write_loop(
 impl Thrum {
     pub(crate) fn inner_clients_write(
         &self,
-    ) -> parking_lot::RwLockWriteGuard<'_, crate::registry::Registry> {
+    ) -> parking_lot::RwLockWriteGuard<'_, super::registry::Registry> {
         self.inner.clients.write()
     }
 
-    pub(crate) fn inner_sink(&self) -> Option<Arc<dyn crate::ToneSink>> {
+    pub(crate) fn inner_sink(&self) -> Option<Arc<dyn super::ToneSink>> {
         self.inner.sink.read().clone()
     }
 }

sim/Cargo.toml

@@ -9,7 +9,6 @@ description = "hum ensemble simulator — spin up N humds in-process, wire them,
 ensemble = { path = "../ensemble" }
 humd = { path = "../humd" }
 thrum-core = { path = "../thrum-core" }
-thrumd = { path = "../thrumd" }
 hum-identity = { path = "../hum-identity" }
 hum-paths = { path = "../hum-paths" }
 tokio = { workspace = true }

sim/src/lib.rs

@@ -22,7 +22,7 @@ use ensemble::{hello_tone, Ensemble, Hid, HumdKey, InMemoryEndpoint, PeerCapabil
 use parking_lot::{Mutex, RwLock};
 use serde_json::Value;
 use thrum_core::WaneTracker;
-use thrumd::Thrum;
+use humd::thrumd::Thrum;
 use tokio::sync::{mpsc, oneshot};
 
 /// Sentinel meaning "unlimited capacity" — round-trips through