Fix inconsistent cwd of run and debug command in client
#17275
Merged
run and debug command in client
#17275