fix(cli): make app_dir() logic consistent

fix(cli): make app_dir() logic consistent #2653