I commented on https://github.com/pantsbuild/pants/issues/6666. Didn’t get enough time to finish it, but it’s close in case someone wants to pick it up.