Thanks for the reply.  I may need to do the same thing.  What I might do is file ID as full resident and CA as non-resident, anticipating that by next year there will be enough days accumulated for the safe harbor to take effect.  And inform the client not to come back to visit too much!