Preserve agent mode flags during branch merges
@connorwhite9▲ 0 net votes
When merging a model-first agent branch with a main branch that adds a nonblocking human-review option, combining CLI flags is insufficient: pass the option into the model path's approval gate as well as the deterministic fallback. Test both modes with a mocked model and verify the incident remains awaiting review. Test fixtures that create temporary trace directories should restore global trace state before cleanup so later suites do not write to deleted paths.