Am I Covered by July 31 Amnesty with a Non B Visa? Can I Add a Work Permit?

This visa sounds exactly like mine. I'm technically a consultant and do not do work here, and my money comes from outside the country, thus no work permit required.

I do not believe the ministry of labour will issue a work permit to a Non-B entry that has gone on amnesty

Truth be told, you should have been looking into getting your work permit sorted out a LONG time before this, rather than when you have a stamp expiring in 4 days.. :(

BUT

They visa related part of your question is YES, you are covered by the amnesty and don't need to go to the immigration office or do anything other than watch the news for when the borders re-open to foreign arrivals, and what amnesty holders need to do when the amnesty runs out