From 24554862056c959811ab84593829ac5dbb6064fc Mon Sep 17 00:00:00 2001 From: ari Date: Tue, 20 Oct 2026 10:41:35 -0400 Subject: [PATCH] F: handoff for F2 to F4 Status, the nix commands to run, the blocking proxy defect reported to WS-C, and the dev-test/doc seams. --- plan/phase-5-consolidator/ws-f-nixos-docs.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/plan/phase-5-consolidator/ws-f-nixos-docs.md b/plan/phase-5-consolidator/ws-f-nixos-docs.md index 7913096..8106603 100644 --- a/plan/phase-5-consolidator/ws-f-nixos-docs.md +++ b/plan/phase-5-consolidator/ws-f-nixos-docs.md @@ -4,7 +4,7 @@ Part of [Phase 5: Consolidator](README.md). Contracts: [contracts.md](contracts. | Field | Value | |---|---| -| Status | In progress (F1 done; F2 to F4 pending) | +| Status | In progress: F1 approved; F2 to F4 written, green locally, waiting on the nix gate and one fix outside this workstream (see the Handoff) | | Owner | | | Depends on | C, D, E (original plan). F1 (module) and F4 (docs drafts) can begin once A1 settles the config keys, since they depend only on contracts sections 6 and 9; F2/F3 need the other streams | | Blocks | phase exit | @@ -88,3 +88,21 @@ Shippable, documented, verified. - `config.example.toml`: commentary only — one token per consolidator, the module's `tokenFile` option and a pointer to `docs/consolidator.md`. Keys and defaults unchanged and checked against `docs/consolidator.md` and `PeersConfig::default`. - Corrected F1's `caFile` description in `nix/module.nix`: nothing opens the CA at startup, so "fails at startup" was wrong; a root-only file makes every check and proxied request to that peer fail as `tls_error`. - Not an Owned file, so left for the fold: `docs/README.md`'s Reference table does not list `docs/consolidator.md` yet. + +## Handoff 2026-10-20 (WS-F -> orchestrator) + +**State.** `ws/F` is rebased onto `main` (9e4fb38, so D's MCP peer tools are present; F1's five commits were replayed unchanged). Four commits follow this entry's parent: F2 (`36ac4f1`), F3 (`92d1318`), F4 (`db3a981`) and this one. Local gate green: `cargo fmt --check`, `cargo clippy --all-targets -- -D warnings`, `cargo test` (all targets, 2 pre-existing ignored journal tests plus the 2 blocked proxy tests described below), `cargo tree -i openssl` empty, `nix eval` of `nix/tests/module-peers.nix` (40/40), `nix flake check --no-build` (`package`, `vm`, `vm-peers`, `module-peers` all evaluate). + +**Run, in the nix gate** (nothing here was built, per AGENTS.md): +- `nix flake check -L` — now covers `checks.vm-peers` (three-machine peers VM test) and `checks.module-peers` (eval-only, a `runCommand` whose interpolation forces the 40 cases, so a wrong rendering fails evaluation without a VM). +- Individually: `nix build .#checks.x86_64-linux.vm-peers -L` and `nix build .#checks.x86_64-linux.module-peers -L`. `checks.vm` (TLS/plain) is unchanged. + +**Blocking, belongs to WS-C (reported in its Log, 2026-10-20).** Every proxied call to a healthy peer answers `peer : not found on peer`: `proxy::get` gives the transport the stripped route (`/systemd/units`) and the peer only serves `/api/v1/systemd/units`. Health checks are unaffected. Consequence: `checks.vm-peers` will still fail at its proxy subtest ("each side returns the other's data") until C (one line: prefix `/api/v1` in `proxy::get`) is fixed, and the two `#[ignore]`d tests in `tests/peers.rs` (`a_plain_peer_serves_its_own_data_through_the_proxy`, `shutdown_ends_a_proxied_follow`) stay ignored; removing those attributes is the acceptance check. F2 also found and fixed an unrelated cause of the reported first-subtest timeout (see the F2 entry: node names resolve IPv6-first in NixOS test networks, so the nodes now bind `::`). + +**To WS-B (client, `src/peers/client.rs`).** `resolve_target` connects to `addrs.first()` only, so a peer that listens on IPv4 while its name also resolves to an IPv6 address reads as `unreachable`. Candidate fix: try the resolved addresses in order. Worked around in the VM test by binding `::`; documented for operators in `docs/consolidator.md`. + +**To WS-T (`dev/dev-test.nu`, not an Owned file here).** `vm-steps` maps `"peers" => "tests"` and builds `.#($attr).($system).($name)`. After F2 the test lives at `checks..vm-peers`, so `dev-test vm peers` needs `"peers" => "checks"` and the build name `vm-peers`. `dev-test ci` (which runs `vm`) and `nix flake check` are unaffected. + +**Not an Owned file.** `docs/README.md`'s Reference table should list `docs/consolidator.md`; left for the fold. + +**For the phase exit (orchestrator).** ARCHITECTURE.md: DEC-13 plus the DEC-11 clarification, and the F4 doc facts worth keeping (two checks and the `auth` states, `LoadCredential` token delivery, reload-vs-restart split, GET-only allowlisted proxy, per-consolidator tokens). TODO.md: F1 to F4 boxes and Backlog entries for D8 (aggregation), scoped tokens, peer health history, runtime peer management, and the B address-selection issue if the fix is deferred. `plan/phase-5-consolidator/` moves to `docs/workstreams/` per `plan/README.md`.