The two sides are working on the fine print of a deal to resolve a bitter, 18-month trade war centred on autos, aluminum, steel, lumber and dairy, among other exports.