Hi, this was actually just improved this week! https://github.com/pantsbuild/pants/pull/16841 It looks like we need to cherry-pick it to 2.14 still. I will get that out today, and possibly another 2.14 rc