The agreement came after more than three months of stop-start negotiations and bouts of fighting since late February, roiling global energy and commodities markets.