An agreement preventing a new wave of US tariffs is close and could include an end to Canada's boycott of US wine and spirits.