feat(maestro): wire maestro-daemon to unified config (NAP-233)
Daemon now loads `[shared].registry_url`, `[shared].token`, and the `[daemon]` section from the unified file via maestro-config. The registry-WS endpoint is derived from `[shared].registry_url` (scheme swap + `/daemon`), so operators configure a single base URL instead of duplicating the daemon-specific endpoint. Env-var renames (all per the new `MAESTRO_<SECTION>_<FIELD>` convention): - MAESTROD_REGISTRY_URL → MAESTRO_SHARED_REGISTRY_URL (and the value is now an http(s) base, not the ws daemon endpoint) - MAESTROD_DAEMON_URL → MAESTRO_DAEMON_URL - MAESTROD_DAEMON_ID → MAESTRO_DAEMON_ID - MAESTROD_BIND_ADDR → MAESTRO_DAEMON_BIND_ADDR - MAESTROD_CONFIG → MAESTRO_CONFIG - MAESTRO_TOKEN → MAESTRO_SHARED_TOKEN `maestrod configure` now writes the unified file with read-modify-write so any existing `[cli]` / `[registry]` sections on the same host are preserved. The interactive prompts reflect the new shape: registry URL is asked for as a base URL, and the token prompt names the new env var. Missing-file behaviour is hard cutover: if the config doesn't exist and not every required field comes from env, the daemon errors with a message pointing at `maestrod configure` and explicitly noting that the legacy paths (~/.config/maestrod/config.toml) are no longer read. e2e harness updated to match: `Daemon::spawn` takes the registry's HTTP base, and the spawned subprocess sees the renamed env vars.
This commit is contained in:
@@ -28,12 +28,13 @@ pub struct Daemon {
|
||||
}
|
||||
|
||||
impl Daemon {
|
||||
/// Spawn a fresh daemon pointing at `registry_url` (the daemon-facing WS
|
||||
/// URL — usually `ws://<addr>/daemon`).
|
||||
pub async fn spawn(daemon_id: &str, registry_url: &str, token: &str) -> Self {
|
||||
/// Spawn a fresh daemon pointing at `registry_base_url` (the registry's
|
||||
/// HTTP base, e.g. `http://127.0.0.1:1234`). The daemon derives its WS
|
||||
/// endpoint internally via `derive_daemon_ws_url`.
|
||||
pub async fn spawn(daemon_id: &str, registry_base_url: &str, token: &str) -> Self {
|
||||
let port = free_port();
|
||||
let bind = SocketAddr::from((Ipv4Addr::LOCALHOST, port));
|
||||
Self::spawn_with_port(daemon_id, registry_url, token, bind).await
|
||||
Self::spawn_with_port(daemon_id, registry_base_url, token, bind).await
|
||||
}
|
||||
|
||||
/// Stop the underlying process, but keep its state dirs around so we can
|
||||
@@ -151,11 +152,11 @@ fn launch(
|
||||
.env("XDG_CONFIG_HOME", home.join(".config"))
|
||||
.env("XDG_STATE_HOME", home.join(".local/state"))
|
||||
.env("TMUX_TMPDIR", tmux_tmpdir)
|
||||
.env("MAESTRO_TOKEN", token)
|
||||
.env("MAESTROD_DAEMON_ID", daemon_id)
|
||||
.env("MAESTROD_REGISTRY_URL", registry_url)
|
||||
.env("MAESTROD_BIND_ADDR", bind.to_string())
|
||||
.env("MAESTROD_DAEMON_URL", daemon_url)
|
||||
.env("MAESTRO_SHARED_TOKEN", token)
|
||||
.env("MAESTRO_DAEMON_ID", daemon_id)
|
||||
.env("MAESTRO_SHARED_REGISTRY_URL", registry_url)
|
||||
.env("MAESTRO_DAEMON_BIND_ADDR", bind.to_string())
|
||||
.env("MAESTRO_DAEMON_URL", daemon_url)
|
||||
.env("RUST_LOG", "warn")
|
||||
.stdout(Stdio::null())
|
||||
.stderr(Stdio::inherit())
|
||||
|
||||
Reference in New Issue
Block a user