Merge branch 'refactor-node' into refactor-node-next

Forward-merge the dataplane/session concept-home reorganization onto
the next line. The moved files carry next's (XX-line) content; the one
hand-resolved surface is src/peer/active.rs, where the source-location
citation sits in different surrounding text than on the master line —
resolved by keeping next's body and applying the same node/session.rs
-> node/session/mod.rs citation update.

testing/mesh-lab/README.md

@@ -102,7 +102,7 @@ each rep does, set them in the invoking shell:
     `handshake`, `forwarding`, `session`, `encrypted`, `mmp`
     (via `compose-trace.yml`).
   - nat-lan — `discovery::nostr`, `transport::udp`,
-    `node::lifecycle`, `handlers::handshake`, `handlers::forwarding`
+    `node::lifecycle`, `handlers::handshake`, `dataplane::forwarding`
     (via `compose-trace-nat.yml`, picked up by
     `testing/nat/scripts/nat-test.sh` through the
     `FIPS_NAT_EXTRA_COMPOSE` env-var hook).

testing/mesh-lab/compose-trace-nat.yml

@@ -12,7 +12,7 @@
 #                                          cross-init tie-breaker
 #                                          ("Ignoring established NAT
 #                                          traversal..." emits here)
-#   - fips::node::handlers::forwarding  — transit/local datagram routing
+#   - fips::node::dataplane::forwarding — transit/local datagram routing
 #                                          (catches drops post-adoption)
 #
 # Other modules stay at info to keep log volume manageable. The base
@@ -33,7 +33,7 @@
 # is set and the suite is nat-lan.
 
 x-trace-rust-log: &trace-rust-log
-  RUST_LOG: "info,fips::nostr=trace,fips::transport::udp=trace,fips::node::lifecycle=trace,fips::node::handlers::handshake=trace,fips::node::handlers::forwarding=trace"
+  RUST_LOG: "info,fips::nostr=trace,fips::transport::udp=trace,fips::node::lifecycle=trace,fips::node::handlers::handshake=trace,fips::node::dataplane::forwarding=trace"
 
 services:
   lan-a:

testing/mesh-lab/compose-trace.yml

@@ -4,10 +4,10 @@
 #   - fips::node::handlers::rekey       — FMP/FSP rekey state machine
 #   - fips::node::handlers::handshake   — Noise handshake (cross-init,
 #                                          dual-init, msg1/2/3 dispatch)
-#   - fips::node::handlers::forwarding  — transit datagram forwarding,
+#   - fips::node::dataplane::forwarding — transit datagram forwarding,
 #                                          route lookup, drops
 #   - fips::node::handlers::session     — FSP K-bit cutover, drain
-#   - fips::node::handlers::encrypted   — FMP K-bit flip detection
+#   - fips::node::dataplane::encrypted  — FMP K-bit flip detection
 #   - fips::node::handlers::mmp         — link liveness, SRTT, ETX
 #
 # Other modules stay at info to keep log volume manageable. The base
@@ -33,7 +33,7 @@
 # environment variable FIPS_MESH_LAB_TRACE=1 is set.
 
 x-trace-rust-log: &trace-rust-log
-  RUST_LOG: "info,fips::node::handlers::rekey=trace,fips::node::handlers::handshake=trace,fips::node::handlers::forwarding=trace,fips::node::handlers::session=trace,fips::node::handlers::encrypted=trace,fips::node::handlers::mmp=trace"
+  RUST_LOG: "info,fips::node::handlers::rekey=trace,fips::node::handlers::handshake=trace,fips::node::dataplane::forwarding=trace,fips::node::handlers::session=trace,fips::node::dataplane::encrypted=trace,fips::node::handlers::mmp=trace"
 
 services:
   # rekey profile

testing/mesh-lab/run-loop.sh

@@ -429,7 +429,7 @@ run_nat_lan() {
     # nat-test.sh at the nat-specific trace overlay via the
     # FIPS_NAT_EXTRA_COMPOSE env-var hook in nat-test.sh. The overlay
     # bumps RUST_LOG to trace on discovery::nostr, transport::udp,
-    # node::lifecycle, handlers::handshake, handlers::forwarding —
+    # node::lifecycle, handlers::handshake, dataplane::forwarding —
     # the modules covering the cross-init / adoption / handshake
     # path that the NAT-traversal flake exhibits. Path is repo-relative.
     local -a env_args=(FIPS_NAT_SKIP_FINAL_CLEANUP=1)