Is there a sefer chumash with Rashi's commentary which brings Rashi's sources in context?
For example, if Rashi were to quote a gemara, this sefer would print the relevant text of the gemara in the sefer.
There's Chumash Rashi Ha'Shalem by Mosdot Ariel (link). Also available on Otzar Hachochmah. Here's an example of one page: