FYI I'm actively fixing https://github.com/pantsbuild/pants/issues/16656 Hopefully I'll have a PR tomorrow. Sorry for the broken window 🙂