[client] land new changes of new-sync for osx

- look for future review