You're largely correct in how Diplomatic Immunity works. The requirement in diplomatic immunity is that it be extended to a diplomat from the time they enter the country under its protection until they leave the country or their country of origin rescends it.

Putin should be denied immunity by the US and forced to leave. But he can't be arrested by the US until he's been expelled from the country and either refuses to leave or returns to the US.