The two sides have agreed on the broad outline of the deal with an eye towards announcing general terms after the U.S.