Dev

CLAUDE.md

@@ -11,10 +11,12 @@ cargo build                          # Debug build
 cargo build --release                # Release build (LTO enabled)
 cargo test                           # Run all tests
 cargo test -p buttplug_server        # Run tests for specific crate
-cargo fmt --all -- --check           # Check formatting
-cargo fmt                            # Auto-format (2-space indent, edition 2024)
+cargo +nightly fmt --all -- --check  # Check formatting (MUST use nightly)
+cargo +nightly fmt                   # Auto-format (2-space indent, edition 2024)
 ```
 
+**Formatting gotcha**: rustfmt.toml uses nightly-only options (`imports_layout`, `empty_item_single_line`). Running `cargo fmt` on the STABLE toolchain silently ignores them and rewrites the entire workspace into the wrong style (~190 files of import-collapsing churn). Always use `cargo +nightly fmt`. CI checks formatting with nightly.
+
 **Linux dependencies**: `libudev-dev`, `libusb-1.0-0-dev` (for serial/HID support)
 
 **WASM build**:

CONTEXT.md

@@ -92,6 +92,10 @@ _Avoid_: "Discovery" as a distinct stage from identification — they're the sam
 An opt-in broadcast of every output command sent to a **Device** — device index, feature index, output type, and value. Used by frontends (e.g. Intiface Central) to visually display real-time device activity, verify hardware behaviour matches commands, and let developers see what *would* happen with simulated devices. Disabled by default to avoid overhead.
 _Avoid_: Treating as internal-only debugging; it's a user-facing observability feature.
 
+**Task Group**:
+An owner-local collection of spawned async tasks. A component that spawns long-running tasks (server device manager, individual devices) holds a Task Group, spawns named tasks through it, and on shutdown cancels then joins every task it accepted. Shutdown is single-flight and repeatable: concurrent callers share one completion. There is no global registry — ownership and join guarantees are purely local to the owning component.
+_Avoid_: "Task Scope" and "Task Registry" (a removed earlier design built around a process-global registry and hierarchical scope tree); inferring task cleanup from diagnostic state rather than joined completion.
+
 **Command**:
 A message from **Client** to **Server** requesting an action — controlling a device, starting a scan, requesting device lists. Always has a non-zero message ID; the server responds with an `Ok` or `Error` using the same ID.
 _Avoid_: Referring to server-initiated messages as commands.

crates/buttplug/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 11.0.0 (2026-07-28)
+
+## Other
+
+- Update buttplug crates to 11.0.0
+
 # 10.0.3 (2026-05-31)
 
 ## Features

crates/buttplug/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "buttplug"
-version = "10.0.3"
+version = "11.0.0"
 
 authors = ["Nonpolynomial Labs, LLC <kyle@nonpolynomial.com>"]
 description = "Buttplug Intimate Hardware Control Library - Client Library"
@@ -20,5 +20,5 @@ doctest = true
 doc = true
 
 [dependencies]
-buttplug_client = { version = "10.0.3", path = "../buttplug_client" }
-buttplug_transport_websocket_tungstenite = { version = "10.0.3", path = "../buttplug_transport_websocket_tungstenite"}
+buttplug_client = { version = "11.0.0", path = "../buttplug_client" }
+buttplug_transport_websocket_tungstenite = { version = "11.0.0", path = "../buttplug_transport_websocket_tungstenite"}

crates/buttplug_client/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 11.0.0 (2026-07-28)
+
+## Other
+
+- Update buttplug crates to 11.0.0
+
 # 10.0.3 (2026-05-31)
 
 ## Features

crates/buttplug_client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "buttplug_client"
-version = "10.0.3"
+version = "11.0.0"
 authors = ["Nonpolynomial Labs, LLC <kyle@nonpolynomial.com>"]
 description = "Buttplug Intimate Hardware Control Library - Core Library"
 license = "BSD-3-Clause"
@@ -24,16 +24,16 @@ tokio-runtime = ["buttplug_core/tokio-runtime"]
 wasm = ["buttplug_core/wasm"]
 
 [dependencies]
-buttplug_core = { version = "10.0.3", path = "../buttplug_core", default-features = false }
-futures = "0.3.32"
-thiserror = "2.0.18"
-log = "0.4.29"
-getset = "0.1.6"
-tokio = { version = "1.50.0", features = ["macros"] }
-dashmap = { version = "6.1.0" }
+buttplug_core = { version = "11.0.0", path = "../buttplug_core", default-features = false }
+futures = "0.3.33"
+thiserror = "2.0.19"
+log = "0.4.33"
+getset = "0.1.7"
+tokio = { version = "1.53.1", features = ["macros"] }
+dashmap = { version = "6.2.1" }
 tracing = "0.1.44"
-serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
-jsonschema = { version = "0.45.0", default-features = false }
+serde = { version = "1.0.229", features = ["derive"] }
+serde_json = "1.0.151"
+jsonschema = { version = "0.49.1", default-features = false }
 strum = "0.28.0"
 strum_macros = "0.28.0"

crates/buttplug_client_in_process/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 11.0.0 (2026-07-28)
+
+## Other
+
+- Update buttplug crates to 11.0.0
+
 # 10.0.4 (2026-06-01)
 
 ## Features

crates/buttplug_client_in_process/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "buttplug_client_in_process"
-version = "10.0.4"
+version = "11.0.0"
 authors = ["Nonpolynomial Labs, LLC <kyle@nonpolynomial.com>"]
 description = "Buttplug Intimate Hardware Control Library - Core Library"
 license = "BSD-3-Clause"
@@ -32,22 +32,22 @@ tokio-runtime = ["buttplug_core/tokio-runtime", "buttplug_client/tokio-runtime",
 wasm = ["buttplug_core/wasm", "buttplug_client/wasm", "buttplug_server/wasm"]
 
 [dependencies]
-buttplug_core = { version = "10.0.3", path = "../buttplug_core", default-features = false }
-buttplug_client = { version = "10.0.3", path = "../buttplug_client", default-features = false }
-buttplug_server = { version = "10.0.4", path = "../buttplug_server", default-features = false }
-buttplug_server_device_config = { version = "10.1.1", path = "../buttplug_server_device_config" }
-buttplug_server_hwmgr_btleplug = { version = "10.0.4", path = "../buttplug_server_hwmgr_btleplug", optional = true}
-buttplug_server_hwmgr_hid = { version = "10.0.4", path = "../buttplug_server_hwmgr_hid", optional = true}
-buttplug_server_hwmgr_lovense_connect = { version = "10.0.4", path = "../buttplug_server_hwmgr_lovense_connect", optional = true}
-buttplug_server_hwmgr_lovense_dongle = { version = "10.0.4", path = "../buttplug_server_hwmgr_lovense_dongle", optional = true}
-buttplug_server_hwmgr_serial = { version = "10.0.4", path = "../buttplug_server_hwmgr_serial", optional = true}
-buttplug_server_hwmgr_websocket = { version = "10.0.4", path = "../buttplug_server_hwmgr_websocket", optional = true}
-buttplug_server_hwmgr_xinput = { version = "10.0.4", path = "../buttplug_server_hwmgr_xinput", optional = true}
-futures = "0.3.32"
-futures-util = "0.3.32"
-thiserror = "2.0.18"
-log = "0.4.29"
-getset = "0.1.6"
-tokio = { version = "1.50.0", features = ["macros"] }
-dashmap = { version = "6.1.0" }
+buttplug_core = { version = "11.0.0", path = "../buttplug_core", default-features = false }
+buttplug_client = { version = "11.0.0", path = "../buttplug_client", default-features = false }
+buttplug_server = { version = "11.0.0", path = "../buttplug_server", default-features = false }
+buttplug_server_device_config = { version = "11.0.0", path = "../buttplug_server_device_config" }
+buttplug_server_hwmgr_btleplug = { version = "11.0.0", path = "../buttplug_server_hwmgr_btleplug", optional = true}
+buttplug_server_hwmgr_hid = { version = "11.0.0", path = "../buttplug_server_hwmgr_hid", optional = true}
+buttplug_server_hwmgr_lovense_connect = { version = "11.0.0", path = "../buttplug_server_hwmgr_lovense_connect", optional = true}
+buttplug_server_hwmgr_lovense_dongle = { version = "11.0.0", path = "../buttplug_server_hwmgr_lovense_dongle", optional = true}
+buttplug_server_hwmgr_serial = { version = "11.0.0", path = "../buttplug_server_hwmgr_serial", optional = true}
+buttplug_server_hwmgr_websocket = { version = "11.0.0", path = "../buttplug_server_hwmgr_websocket", optional = true}
+buttplug_server_hwmgr_xinput = { version = "11.0.0", path = "../buttplug_server_hwmgr_xinput", optional = true}
+futures = "0.3.33"
+futures-util = "0.3.33"
+thiserror = "2.0.19"
+log = "0.4.33"
+getset = "0.1.7"
+tokio = { version = "1.53.1", features = ["macros"] }
+dashmap = { version = "6.2.1" }
 tracing = "0.1.44"

crates/buttplug_core/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 11.0.0 (2026-07-28)
+
+## Breaking Changes
+
+- `AsyncManager::spawn` now returns a `TaskCompletion` handle instead of discarding the runtime join handle. Custom `AsyncManager` implementations must return a completion handle after accepting a task, and must not synchronously drive the submitted future during submission. The `spawn!` macro remains fire-and-forget by explicitly detaching its completion.
+
+## Features
+
+- Add owner-local named `TaskGroup`: atomic close/spawn reservation, coordinated cancellation, panic-safe join, and shared repeatable shutdown
+- Add the v4 `Disconnect` client message
+
 # 10.0.3 (2026-05-31)
 
 ## Features

crates/buttplug_core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "buttplug_core"
-version = "10.0.3"
+version = "11.0.0"
 authors = ["Nonpolynomial Labs, LLC <kyle@nonpolynomial.com>"]
 description = "Buttplug Intimate Hardware Control Library - Core Library"
 license = "BSD-3-Clause"
@@ -30,30 +30,32 @@ targets = []
 features = ["default", "unstable"]
 
 [build-dependencies]
-serde = "1.0.228"
-serde_json = "1.0.149"
-jsonschema = { version = "0.45.0", default-features = false }
+serde = "1.0.229"
+serde_json = "1.0.151"
+jsonschema = { version = "0.49.1", default-features = false }
 
 [dependencies]
-futures = "0.3.32"
-futures-util = "0.3.32"
-serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
-serde_repr = "0.1.20"
-thiserror = "2.0.18"
-displaydoc = "0.2.5"
-log = "0.4.29"
-getset = "0.1.6"
-jsonschema = { version = "0.45.0", default-features = false }
+futures = "0.3.33"
+futures-util = "0.3.33"
+serde = { version = "1.0.229", features = ["derive"] }
+serde_json = "1.0.151"
+serde_repr = "0.1.21"
+thiserror = "2.0.19"
+displaydoc = "0.2.6"
+log = "0.4.33"
+getset = "0.1.7"
+jsonschema = { version = "0.49.1", default-features = false }
 cfg-if = "1.0.4"
-tokio = { version = "1.50.0", features = ["sync", "macros"] }
+tokio = { version = "1.53.1", features = ["sync", "macros"] }
 async-stream = "0.3.6"
 strum_macros = "0.28.0"
 strum = "0.28.0"
 derive_builder = "0.20.2"
 enum_dispatch = "0.3"
 tracing = "0.1.44"
-wasm-bindgen-futures = { version = "0.4.64", optional = true }
+wasm-bindgen-futures = { version = "0.4.76", optional = true }
 wasmtimer = { version = "0.4.3", optional = true }
-smallvec = { version = "1.15.1", features = ["serde", "const_generics"] }
+smallvec = { version = "1.15.2", features = ["serde", "const_generics"] }
 enumflags2 = "0.7.12"
+tokio-util = "0.7.19"
+dashmap = "6.2.1"

crates/buttplug_core/src/connector/transport/mod.rs

@@ -8,7 +8,9 @@
 pub mod stream;
 
 use crate::connector::{
-  ButtplugConnectorError, ButtplugConnectorResultFuture, ButtplugSerializedMessage,
+  ButtplugConnectorError,
+  ButtplugConnectorResultFuture,
+  ButtplugSerializedMessage,
 };
 use displaydoc::Display;
 use futures::future::BoxFuture;

crates/buttplug_core/src/errors.rs

@@ -57,7 +57,9 @@ pub enum ButtplugHandshakeError {
   #[error("Expected either a ServerInfo or Error message, received {0}")]
   UnexpectedHandshakeMessageReceived(String),
   /// Expected a RequestServerInfo message to start connection.
-  #[error("Expected a RequestServerInfo message to start connection. Message either not received or wrong message received.")]
+  #[error(
+    "Expected a RequestServerInfo message to start connection. Message either not received or wrong message received."
+  )]
   RequestServerInfoExpected,
   /// Handshake already happened, cannot run handshake again.
   #[error("Handshake already happened, cannot run handshake again.")]

crates/buttplug_core/src/message/v4/disconnect.rs

@@ -0,0 +1,47 @@
+// Buttplug Rust Source Code File - See https://buttplug.io for more info.
+//
+// Copyright 2016-2026 Nonpolynomial Labs LLC. All rights reserved.
+//
+// Licensed under the BSD 3-Clause license. See LICENSE file in the project root
+// for full license information.
+
+use crate::message::simple_client_message;
+
+simple_client_message!(DisconnectV4);
+
+#[cfg(test)]
+mod test {
+  use super::DisconnectV4;
+  use crate::message::{ButtplugClientMessageV4, ButtplugMessage, ButtplugMessageValidator};
+
+  const DISCONNECT_STR: &str = "{\"Disconnect\":{\"Id\":42}}";
+
+  #[test]
+  fn test_disconnect_serialize() {
+    let mut msg = DisconnectV4::default();
+    msg.set_id(42);
+    let wrapped = ButtplugClientMessageV4::Disconnect(msg);
+    let js = serde_json::to_string(&wrapped).expect("Infallible serialization");
+    assert_eq!(DISCONNECT_STR, js);
+  }
+
+  #[test]
+  fn test_disconnect_deserialize() {
+    let wrapped: ButtplugClientMessageV4 =
+      serde_json::from_str(DISCONNECT_STR).expect("Valid JSON");
+    match wrapped {
+      ButtplugClientMessageV4::Disconnect(msg) => {
+        assert_eq!(msg.id(), 42);
+        assert!(msg.is_valid().is_ok());
+      }
+      _ => panic!("Expected Disconnect variant"),
+    }
+  }
+
+  #[test]
+  fn test_disconnect_rejects_system_id() {
+    let mut msg = DisconnectV4::default();
+    msg.set_id(0);
+    assert!(msg.is_valid().is_err());
+  }
+}

crates/buttplug_core/src/message/v4/mod.rs

@@ -7,6 +7,7 @@
 
 mod device_list;
 mod device_message_info;
+mod disconnect;
 mod input_cmd;
 mod input_reading;
 mod output_cmd;
@@ -18,6 +19,7 @@ mod stop_cmd;
 pub use {
   device_list::DeviceListV4,
   device_message_info::DeviceMessageInfoV4,
+  disconnect::DisconnectV4,
   input_cmd::{InputCmdV4, InputCommandType},
   input_reading::{InputReadingV4, InputTypeReading, InputValue},
   output_cmd::{OutputCmdV4, OutputCommand, OutputHwPositionWithDuration, OutputValue},

crates/buttplug_core/src/message/v4/spec_enums.rs

@@ -18,6 +18,7 @@ use crate::message::{
   StartScanningV0,
   StopCmdV4,
   StopScanningV0,
+  v4::disconnect::DisconnectV4,
   v4::input_cmd::InputCmdV4,
 };
 use enum_dispatch::enum_dispatch;
@@ -40,6 +41,8 @@ pub enum ButtplugClientMessageV4 {
   StopCmd(StopCmdV4),
   OutputCmd(OutputCmdV4),
   InputCmd(InputCmdV4),
+  // Connection lifecycle
+  Disconnect(DisconnectV4),
 }
 
 impl ButtplugMessageFinalizer for ButtplugClientMessageV4 {