I have always believed that the MagSafe connector should be on the brick. A short, regular USB type C cable to the power brick and a MagSafe connector between the brick and the wall.

Bonus points if the brick incorporates a small hub with additional ports. This would allow you to choose between using a regular USB type C power cable or the proprietary brick with MagSafe built in.