I'm going through this same issue myself. Unfortunately I don't quite have the answer yet to what I need to do for my tax filing as the spouse of a foreign diplomat, who was employed at a US company under an Employment Authorization Document.
However I want to point out that holders of A-1 or A-2 visas are "exempt individuals" and do not pass the Substantial Presence test. Therefore I believe we are non-resident aliens - so maybe tax form 1040NR is the way to go? (I'm not sure)
