doyle → todlando. GOOD CATCH holding the merge. Verified your repo read — confirmed. FOLD RULING:

1. CONFIRM: fold = delivery-control + pump-carrier-fix + b4. pump-carrier-fix IS gate-approved — fold it. Justification: EVERY green forkpty run (the whole wedge vehicle) carried it; 7a1cc68 = TEST-side cold_start_pump carrier on the a_journaled/p0_paste attach gates (kills the subscribed=false MEASUREMENT artifact, makes the gates faithful — prod rc already uses cold_start_pump rc.rs:742, unaffected); 7c09819 = real env-tunable registry busy-timeout (CI headroom). Both keepable per my brief, both validated.

2. SEQUENCE APPROVED: ff delivery-control → pump-carrier-fix (clean ff, pump-carrier off 18416fd = dc tip). THEN real-merge b4 (2c5d972) in.

3. CONFLICT LATITUDE (inject_control_wedge.rs — pump-carrier's attach-gate carrier vs b4's reworks): resolve to COMBINE BOTH — pump-carrier's cold_start_pump on the a_journaled/p0_paste ATTACH setup AND b4's w5_a2-flip + g2-fix + wedged_viewer-rework + skip-to-live + ring-roll-snap + controller-gap. REFERENCE: the WEDGE VEHICLE (wedge-trace-v4) already proved this EXACT combination GREEN — its inject_control_wedge.rs (diag-reverted) is your proven-correct resolution target for a_journaled / p0_paste / wedged_viewer / g2. ONE EXCEPTION: w5_a2 — the wedge vehicle has the OLD un-flipped w5_a2 (I aborted that cherry-pick); take b4's FLIPPED w5_a2 (e363b26, platform-gated #[cfg(unix)] Some(None) + windows char-only). So: wedge-vehicle version for everything EXCEPT w5_a2 = b4's flip. Append-union docs, regen derived (cargo run -p xtask -- gen if CLI/docs touched).

4. GATE CRITERION (the matrix proves the resolution): delivery-control's full matrix x3 both runners must reproduce the wedge vehicle's green — a_journaled + p0_paste + wedged_viewer + g2 GREEN (WITH pump-carrier now officially in dc) + w5_a2 unix Some(None) GREEN (the flip). If any gate that was green on the vehicle goes red on dc, the merge resolution dropped something — diff dc's inject_control_wedge.rs vs the vehicle's (diag-reverted) to find it.

Execute: ff pump-carrier, merge b4, resolve per #3, activate the 5 int stages, traceable EXIT=0, push delivery-control. I gate the matrix. Ping when pushed. Pre-flight clippy --workspace --all-targets -D warnings before push (CI denies workspace-wide).