Add CommandsCommand for shell completion
Improve keyword detecting mechanism of zsh completion