According to Strunk, what is the correct way to punctuate this compound sentence?

“Tony cooked dinner and I made the salad, but Mike just ate.”

“Tony cooked dinner, and I made the salad, but Mike just ate.”

“Tony cooked dinner, and I made the salad but Mike just ate.”