[cli] improve xpath argument names
Add state-current in sock.py