commit 5d94c8d769aca4d8b1e3a9c938b692f0fe8a8e58
parent ba9be8390c15fe99270e2f3d2b8d4c264829411f
Author: triesap <tyson@radroots.org>
Date: Fri, 23 Oct 2026 14:32:26 +0000
daemon: preserve command display and adopt complete data notices
- Handle declared help/version before configuration while keeping malformed arguments redacted.
- Align exact Cargo, Nix and source-lock inputs with the published provider.
- Install complete pinned data material in the Nix package documentation.
- Verify native sources, unchanged public API, SQLite ownership and actual platform artifacts.
Diffstat:
10 files changed, 96 insertions(+), 33 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -1846,7 +1846,7 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
[[package]]
name = "radroots_blossom"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"mediatype",
"serde",
@@ -1858,7 +1858,7 @@ dependencies = [
[[package]]
name = "radroots_core"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"rust_decimal",
"serde",
@@ -1867,7 +1867,7 @@ dependencies = [
[[package]]
name = "radroots_event"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"hex",
"jiff-tzdb",
@@ -1885,7 +1885,7 @@ dependencies = [
[[package]]
name = "radroots_event_codec"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"hex",
"radroots_blossom",
@@ -1902,7 +1902,7 @@ dependencies = [
[[package]]
name = "radroots_identity"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"k256",
"serde",
@@ -1912,7 +1912,7 @@ dependencies = [
[[package]]
name = "radroots_nostr"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"nostr 0.44.7",
"radroots_event",
@@ -1927,7 +1927,7 @@ dependencies = [
[[package]]
name = "radroots_protocol"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"radroots_identity",
"serde",
@@ -1938,7 +1938,7 @@ dependencies = [
[[package]]
name = "radroots_secrets"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"chacha20poly1305",
"sha2",
@@ -1949,7 +1949,7 @@ dependencies = [
[[package]]
name = "radroots_transport"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"radroots_event",
"radroots_identity",
@@ -1960,7 +1960,7 @@ dependencies = [
[[package]]
name = "radroots_transport_nostr"
version = "0.1.0-alpha"
-source = "git+https://github.com/radrootslabs/lib.git?rev=4b4aa8a7feaab08492c3f596df9182070ee8d814#4b4aa8a7feaab08492c3f596df9182070ee8d814"
+source = "git+https://github.com/radrootslabs/lib.git?rev=60ce9294ff271bc311b7d18af97dc78e48e75377#60ce9294ff271bc311b7d18af97dc78e48e75377"
dependencies = [
"async-utility 0.3.2",
"async-wsocket 0.17.0",
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,14 +13,14 @@ default-members = ["."]
resolver = "3"
[workspace.dependencies]
-radroots_event = { git = "https://github.com/radrootslabs/lib.git", rev = "4b4aa8a7feaab08492c3f596df9182070ee8d814", version = "=0.1.0-alpha" }
-radroots_event_codec = { git = "https://github.com/radrootslabs/lib.git", rev = "4b4aa8a7feaab08492c3f596df9182070ee8d814", version = "=0.1.0-alpha" }
-radroots_identity = { git = "https://github.com/radrootslabs/lib.git", rev = "4b4aa8a7feaab08492c3f596df9182070ee8d814", version = "=0.1.0-alpha" }
-radroots_nostr = { git = "https://github.com/radrootslabs/lib.git", rev = "4b4aa8a7feaab08492c3f596df9182070ee8d814", version = "=0.1.0-alpha" }
-radroots_protocol = { git = "https://github.com/radrootslabs/lib.git", rev = "4b4aa8a7feaab08492c3f596df9182070ee8d814", version = "=0.1.0-alpha", default-features = false }
-radroots_secrets = { git = "https://github.com/radrootslabs/lib.git", rev = "4b4aa8a7feaab08492c3f596df9182070ee8d814", version = "=0.1.0-alpha", default-features = false }
-radroots_transport_nostr = { git = "https://github.com/radrootslabs/lib.git", rev = "4b4aa8a7feaab08492c3f596df9182070ee8d814", version = "=0.1.0-alpha", default-features = false }
-radroots_transport = { git = "https://github.com/radrootslabs/lib.git", rev = "4b4aa8a7feaab08492c3f596df9182070ee8d814", version = "=0.1.0-alpha", default-features = false }
+radroots_event = { git = "https://github.com/radrootslabs/lib.git", rev = "60ce9294ff271bc311b7d18af97dc78e48e75377", version = "=0.1.0-alpha" }
+radroots_event_codec = { git = "https://github.com/radrootslabs/lib.git", rev = "60ce9294ff271bc311b7d18af97dc78e48e75377", version = "=0.1.0-alpha" }
+radroots_identity = { git = "https://github.com/radrootslabs/lib.git", rev = "60ce9294ff271bc311b7d18af97dc78e48e75377", version = "=0.1.0-alpha" }
+radroots_nostr = { git = "https://github.com/radrootslabs/lib.git", rev = "60ce9294ff271bc311b7d18af97dc78e48e75377", version = "=0.1.0-alpha" }
+radroots_protocol = { git = "https://github.com/radrootslabs/lib.git", rev = "60ce9294ff271bc311b7d18af97dc78e48e75377", version = "=0.1.0-alpha", default-features = false }
+radroots_secrets = { git = "https://github.com/radrootslabs/lib.git", rev = "60ce9294ff271bc311b7d18af97dc78e48e75377", version = "=0.1.0-alpha", default-features = false }
+radroots_transport_nostr = { git = "https://github.com/radrootslabs/lib.git", rev = "60ce9294ff271bc311b7d18af97dc78e48e75377", version = "=0.1.0-alpha", default-features = false }
+radroots_transport = { git = "https://github.com/radrootslabs/lib.git", rev = "60ce9294ff271bc311b7d18af97dc78e48e75377", version = "=0.1.0-alpha", default-features = false }
[lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = ['cfg(coverage_nightly)'] }
diff --git a/README b/README
@@ -11,6 +11,10 @@ event verifies.
## Verification
+`radrootsd --help`, `--version` and subcommand help exit successfully before
+loading configuration or creating logging, identity, database or network state.
+Malformed arguments retain the redacted nonzero failure boundary.
+
Run the native standalone checks with the declared Rust toolchain and committed
lockfile. In an extbuild-enabled checkout, first run `cargo extbuild doctor`
and route each command through `cargo extbuild run --`:
diff --git a/flake.lock b/flake.lock
@@ -45,17 +45,17 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1792626713,
- "narHash": "sha256-THmBCeJQwtKKZaQQyjTIMfk/qw0WtuXAbo29QkkpU3Q=",
+ "lastModified": 1792761552,
+ "narHash": "sha256-A891XMBUVVSBDPZOdMpI7y9RkF6lRj+nRpbPL9CQnOY=",
"owner": "radrootslabs",
"repo": "lib",
- "rev": "4b4aa8a7feaab08492c3f596df9182070ee8d814",
+ "rev": "60ce9294ff271bc311b7d18af97dc78e48e75377",
"type": "github"
},
"original": {
"owner": "radrootslabs",
"repo": "lib",
- "rev": "4b4aa8a7feaab08492c3f596df9182070ee8d814",
+ "rev": "60ce9294ff271bc311b7d18af97dc78e48e75377",
"type": "github"
}
},
diff --git a/flake.nix b/flake.nix
@@ -8,7 +8,7 @@
# that upstream fetch defect while preserving the same locked sources.
crane.url = "github:ipetkov/crane/01bc1d404a51a0a07e9d8759cd50a7903e218c82";
lib = {
- url = "github:radrootslabs/lib/4b4aa8a7feaab08492c3f596df9182070ee8d814";
+ url = "github:radrootslabs/lib/60ce9294ff271bc311b7d18af97dc78e48e75377";
inputs.crane.follows = "crane";
};
nixpkgs.follows = "lib/nixpkgs";
@@ -71,6 +71,9 @@
version = "0.1.0";
CARGO_PROFILE = "release";
cargoExtraArgs = "--locked --package radrootsd --bin radrootsd";
+ postInstall = ''
+ install -Dm444 ${lib.outPath}/crates/domain/NOTICE "$out/share/doc/radrootsd/NOTICE"
+ '';
}
);
check = craneLib.mkCargoDerivation (
diff --git a/radroots.lib.source-lock.v1.toml b/radroots.lib.source-lock.v1.toml
@@ -1,9 +1,9 @@
schema = "radroots.lib.source-lock.v1"
repository = "https://github.com/radrootslabs/lib"
-revision = "4b4aa8a7feaab08492c3f596df9182070ee8d814"
+revision = "60ce9294ff271bc311b7d18af97dc78e48e75377"
architecture = "radroots.crates.release.v2"
workspace_catalog_sha256 = "424909855b2af1ffc8fa6bbfd5aa0e6d17642662c18212fef4660e71700fbfc8"
version = "0.1.0-alpha"
-source_archive_sha256 = "d990ce9006daf05d1234b2bf374e0fd7e457b07cd942179a095872fc1f6996d2"
+source_archive_sha256 = "1ba2a9808b45676266bb3653cdb96bd3fe7f4dcb84454de228be1bca60fc7f7e"
lockfile = "Cargo.lock"
-lockfile_sha256 = "38ccc16b1a5f711bb2b20201b69e14b737202e5a4c7abe17d01e2681e7fcda77"
+lockfile_sha256 = "5e379d82ee495a78949ce22b7fb0e086ff8312ba7252750b44966dc5bc108cc9"
diff --git a/src/app/runtime.rs b/src/app/runtime.rs
@@ -174,18 +174,30 @@ fn take_start_rpc_hook_result() -> Option<Result<ServerHandle, String>> {
.take()
}
-fn load_args_and_settings() -> Result<(cli::Args, config::Settings)> {
+fn load_args_and_settings() -> Result<Option<(cli::Args, config::Settings)>> {
#[cfg(test)]
{
if let Some(result) = take_load_hook_result() {
- return result.map_err(anyhow::Error::msg);
+ return result.map(Some).map_err(anyhow::Error::msg);
}
Err(anyhow::anyhow!("run loader hook not set"))
}
#[cfg(not(test))]
{
- let args = cli::Args::try_parse()?;
+ let args = match cli::Args::try_parse() {
+ Ok(args) => args,
+ Err(display)
+ if matches!(
+ display.kind(),
+ clap::error::ErrorKind::DisplayHelp | clap::error::ErrorKind::DisplayVersion
+ ) =>
+ {
+ display.print()?;
+ return Ok(None);
+ }
+ Err(error) => return Err(error.into()),
+ };
let config_path = args
.service
.config
@@ -198,7 +210,7 @@ fn load_args_and_settings() -> Result<(cli::Args, config::Settings)> {
std::path::Path::new(settings.config.service.logs_dir.as_str()),
None,
)?;
- Ok((args, settings))
+ Ok(Some((args, settings)))
}
}
@@ -542,7 +554,9 @@ async fn handle_command(command: cli::Command, settings: &config::Settings) -> R
}
pub async fn run() -> Result<()> {
- let (args, settings): (cli::Args, config::Settings) = load_args_and_settings()?;
+ let Some((args, settings)) = load_args_and_settings()? else {
+ return Ok(());
+ };
settings.validate()?;
let authored_profile = settings.authored_profile()?;
diff --git a/tests/command_display.rs b/tests/command_display.rs
@@ -0,0 +1,42 @@
+use std::process::Command;
+
+#[test]
+fn help_and_version_succeed_before_configuration_or_identity_state() {
+ for arguments in [
+ vec!["--help"],
+ vec!["--version"],
+ vec!["transport-publish", "--help"],
+ vec!["transport-publish", "principal", "init", "--help"],
+ ] {
+ let root = tempfile::tempdir().unwrap();
+ let output = Command::new(env!("CARGO_BIN_EXE_radrootsd"))
+ .current_dir(root.path())
+ .arg("--config")
+ .arg(root.path().join("absent-config.toml"))
+ .arg("--identity")
+ .arg(root.path().join("absent-identity.enc"))
+ .args(&arguments)
+ .output()
+ .unwrap();
+ assert!(output.status.success(), "{arguments:?}");
+ assert!(!output.stdout.is_empty());
+ assert!(output.stderr.is_empty());
+ assert!(std::fs::read_dir(root.path()).unwrap().next().is_none());
+ }
+}
+
+#[test]
+fn malformed_arguments_keep_redacted_failure_without_creating_state() {
+ let root = tempfile::tempdir().unwrap();
+ let output = Command::new(env!("CARGO_BIN_EXE_radrootsd"))
+ .current_dir(root.path())
+ .arg("--config")
+ .arg(root.path().join("absent-config.toml"))
+ .arg("--unknown-daemon-option")
+ .output()
+ .unwrap();
+ assert_eq!(output.status.code(), Some(1));
+ assert!(output.stdout.is_empty());
+ assert_eq!(output.stderr, b"Fatal error: daemon execution failed\n");
+ assert!(std::fs::read_dir(root.path()).unwrap().next().is_none());
+}
diff --git a/tests/package_boundary.rs b/tests/package_boundary.rs
@@ -34,7 +34,7 @@ fn public_error_is_redacted_and_source_free() {
#[test]
fn nix_outputs_are_real_owned_and_exactly_bounded() {
for required in [
- "github:radrootslabs/lib/4b4aa8a7feaab08492c3f596df9182070ee8d814",
+ "github:radrootslabs/lib/60ce9294ff271bc311b7d18af97dc78e48e75377",
"\"aarch64-darwin\"",
"\"x86_64-linux\"",
"craneLib.buildPackage",
diff --git a/tests/source_boundary.rs b/tests/source_boundary.rs
@@ -198,7 +198,7 @@ fn transport_publish_sources_reject_removed_protocol_identifiers() {
}
assert!(
manifest_source.contains(
- "radroots_transport_nostr = { git = \"https://github.com/radrootslabs/lib.git\", rev = \"4b4aa8a7feaab08492c3f596df9182070ee8d814\", version = \"=0.1.0-alpha\""
+ "radroots_transport_nostr = { git = \"https://github.com/radrootslabs/lib.git\", rev = \"60ce9294ff271bc311b7d18af97dc78e48e75377\", version = \"=0.1.0-alpha\""
),
"Cargo.toml must pin radroots_transport_nostr to the approved Lib revision and exact version"
);