First sentence:

Iran announced Sunday that any American civilian or military personnel in the region are now considered legitimate targets

So yes, still not all Americans, but no, not just government employees, American civilians too.

But I suspect non-military people will be arrested, not treated as military targets to be attacked or bombed.