@witty-crayon-22786 Following our discussion the other day, I believe this does everything we want — let me know what you think: https://github.com/pantsbuild/pants/pull/16965