Energy agency predicts oil supply recovery post-war