Enhanced ruyi-cli