Barring last-minute snags, the deal would bring to an end a prolonged battle that began after the WikiLeaks founder became alternately celebrated and reviled for revealing state secrets in the 2010s.