Change `reset` terminal-run commands into normal commands w/ proper error handling

[eamodio]

Refs: #3527

Identify all the cases and create issues to track each one