common-cli: Improve command match

Probably want to use `.+` instead of `\\S+`