A weekend of back-and-forth military exchanges between Washington and Tehran had put broader peace negotiations at risk