Iran-Oman deal over Hormuz takes shape as war-weary US looks on