Mainly the Thai immigration will be see valid of your passport. It is the norm of many countries to require travelers to hold Passports that will be valid for longer than 6 months before leaving the country. If a Passport will expire in less than 6 months, the traveler must apply for a new Passport. (It’s not concern about valid of your work ) If you do new passport you have to do new re-entry and new work permit