Thanks for talking this all through, Stu! There are 3 proposals based on this convo, and I don't think any of them are competing actually: https://github.com/pantsbuild/pants/pull/12491 I'm going to focus on finishing that PR today to provide a common denominator for which of the 3 (if any) we want to follow up on.