whoops, fix client to use core/gen-commands.