uv

refactor resolver forking to make it easier to centralize decision making

#8754

Merged