So what if safeguards are for perpetuity. No reactor is for perpetuity. They have a productive life and most of the reactors we put under the deal has 10-15 years life left.
Our militrary facilities are out of the deal, whether present or future.
It is up to us to put any future civilian facilities under IAEA inspection regime