Unify command retrieval by web and command line