Improve cli
Prevent history.back
[sync] 0.9.2.4