chore(cli): resolve merge conflict with dev in bootstrap; keep try/finally with explicit return