I think its likely they will extend amnesty until it's at least possible to leave and re enter to get a Visa stamp. mandatory quarantine upon reentry is another matter entirely, however
sneaky quarantine "tax" of mandatory expensive hotel quarantine which the authorities are doubtless collecting a percentage of. Short sighted short term gain for long term loss. they seem determined to bury their tourism income. Someone should show them a breakdown of their economic revenue sometime.
you should consult with a legal / accountancy firm and your local immigration office the only issue right now is that you wont be able to leave the country to get your Visa stamps. covid won't stop accountancy firms processing all necessary paperwork up to this point. you might be able to get a temporary visa or extension of stay on your current Visa in the interim.