env: re-add support for auto-completion