I could use a second opinion / a helping hand with review on these two PRs to figure out what is the best approach to solve the problem: https://github.com/pantsbuild/pants/pull/20343 https://github.com/pantsbuild/pants/pull/20358 For context, original discussion here: https://pantsbuild.slack.com/archives/C0D7TNJHL/p1699634989875479?thread_ts=1699632752.483199&cid=C0D7TNJHL