refactor(cli): guard device resolution, fix test catalog isolation

Wrap _resolve_device_handle() in do_login and do_logout with a
(ValueError, KeyError) guard so unknown or missing devices produce a
clean error message + sys.exit(1) instead of an uncaught traceback.

Refactor all four TestCliLoginLogout tests to use the existing
_patch_catalog(stack) helper, which patches entry_points AND registers
a teardown callback that clears _cat._cache, eliminating the catalog
state leak that the previous inline pattern left behind.

Also strengthen test_login_dispatches_to_auth_login to assert that the
real device handle (schema.name == "d3d") is passed to auth.login.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: sammuli

fdp/cli.py

@@ -52,9 +52,12 @@ def do_env(args) -> None:
 
 
 def do_login(args) -> None:
-    handle = _resolve_device_handle(args.default_device)
     try:
+        handle = _resolve_device_handle(args.default_device)
         result = auth.login(handle, write=args.write)
+    except (ValueError, KeyError) as exc:
+        print(f"Error: {exc}", file=sys.stderr)
+        sys.exit(1)
     except auth.AuthError as exc:
         print(f"Login failed: {exc}", file=sys.stderr)
         sys.exit(1)
@@ -71,7 +74,11 @@ def do_login(args) -> None:
 
 
 def do_logout(args) -> None:
-    handle = _resolve_device_handle(args.default_device)
+    try:
+        handle = _resolve_device_handle(args.default_device)
+    except (ValueError, KeyError) as exc:
+        print(f"Error: {exc}", file=sys.stderr)
+        sys.exit(1)
     removed = auth.logout(handle)
     print("Removed cached token."
           if removed else "No cached token to remove.")

tests/test_cli.py

@@ -333,34 +333,28 @@ def test_default_device_passed_to_setup_environment(self):
 class TestCliLoginLogout(unittest.TestCase):
     def test_login_dispatches_to_auth_login(self):
         from fdp import cli, auth
-        ep = _make_catalog_ep("d3d", _D3D_TEST_YAML)
         ct = auth.CachedToken(device="d3d", scope="read", exp=None)
         with ExitStack() as stack:
+            _patch_catalog(stack)
             stack.enter_context(mock.patch.object(
                 sys, "argv", ["fdp", "login"]))
-            stack.enter_context(mock.patch(
-                "fdp.catalog.entry_points", return_value=[ep]))
-            from fdp.catalog import catalog as _cat
-            _cat._cache = None
             login_mock = stack.enter_context(
                 mock.patch.object(cli.auth, "login", return_value=ct))
             buf = io.StringIO()
             with redirect_stdout(buf):
                 cli.main()
             login_mock.assert_called_once()
+            self.assertEqual(
+                login_mock.call_args.args[0].schema.name, "d3d")
             self.assertEqual(login_mock.call_args.kwargs.get("write"), False)
 
     def test_login_write_flag(self):
         from fdp import cli, auth
-        ep = _make_catalog_ep("d3d", _D3D_TEST_YAML)
         ct = auth.CachedToken(device="d3d", scope="write", exp=None)
         with ExitStack() as stack:
+            _patch_catalog(stack)
             stack.enter_context(mock.patch.object(
                 sys, "argv", ["fdp", "login", "--write"]))
-            stack.enter_context(mock.patch(
-                "fdp.catalog.entry_points", return_value=[ep]))
-            from fdp.catalog import catalog as _cat
-            _cat._cache = None
             login_mock = stack.enter_context(
                 mock.patch.object(cli.auth, "login", return_value=ct))
             with redirect_stdout(io.StringIO()):
@@ -369,14 +363,10 @@ def test_login_write_flag(self):
 
     def test_logout_dispatches(self):
         from fdp import cli
-        ep = _make_catalog_ep("d3d", _D3D_TEST_YAML)
         with ExitStack() as stack:
+            _patch_catalog(stack)
             stack.enter_context(mock.patch.object(
                 sys, "argv", ["fdp", "logout"]))
-            stack.enter_context(mock.patch(
-                "fdp.catalog.entry_points", return_value=[ep]))
-            from fdp.catalog import catalog as _cat
-            _cat._cache = None
             logout_mock = stack.enter_context(
                 mock.patch.object(cli.auth, "logout", return_value=True))
             with redirect_stdout(io.StringIO()):
@@ -385,14 +375,10 @@ def test_logout_dispatches(self):
 
     def test_run_sets_auto_login_true(self):
         from fdp import cli
-        ep = _make_catalog_ep("d3d", _D3D_TEST_YAML)
         with ExitStack() as stack:
+            _patch_catalog(stack)
             stack.enter_context(mock.patch.object(
                 sys, "argv", ["fdp", "run", "true"]))
-            stack.enter_context(mock.patch(
-                "fdp.catalog.entry_points", return_value=[ep]))
-            from fdp.catalog import catalog as _cat
-            _cat._cache = None
             setup_mock = stack.enter_context(
                 mock.patch.object(cli, "setup_environment"))
             stack.enter_context(mock.patch.object(