fix: address second Copilot review

Author: Adr1an04

src/specify_cli/integrations/catalog.py

@@ -445,7 +445,12 @@ def add_catalog(self, url: str, name: Optional[str] = None) -> None:
 
         data: Dict[str, Any] = {"catalogs": []}
         if config_path.exists():
-            raw = yaml.safe_load(config_path.read_text(encoding="utf-8"))
+            try:
+                raw = yaml.safe_load(config_path.read_text(encoding="utf-8"))
+            except (yaml.YAMLError, OSError, UnicodeError) as exc:
+                raise IntegrationValidationError(
+                    f"Failed to read catalog config {config_path}: {exc}"
+                ) from exc
             if not isinstance(raw, dict):
                 raise IntegrationValidationError(
                     "Catalog config file is corrupted (expected a mapping)."
@@ -491,6 +496,10 @@ def add_catalog(self, url: str, name: Optional[str] = None) -> None:
                         f"{type(raw_priority).__name__}."
                     )
                 existing_priorities.append(raw_priority)
+            else:
+                # Match `_load_catalog_config()`'s defaulting rule so the new
+                # entry still sorts after implicit-priority siblings.
+                existing_priorities.append(idx + 1)
 
         max_priority = max(existing_priorities, default=0)
         catalogs.append(
@@ -520,7 +529,12 @@ def remove_catalog(self, index: int) -> str:
         if not config_path.exists():
             raise IntegrationValidationError("No catalog config file found.")
 
-        data = yaml.safe_load(config_path.read_text(encoding="utf-8")) or {}
+        try:
+            data = yaml.safe_load(config_path.read_text(encoding="utf-8")) or {}
+        except (yaml.YAMLError, OSError, UnicodeError) as exc:
+            raise IntegrationValidationError(
+                f"Failed to read catalog config {config_path}: {exc}"
+            ) from exc
         if not isinstance(data, dict):
             raise IntegrationValidationError(
                 "Catalog config file is corrupted (expected a mapping)."

tests/integrations/test_integration_catalog.py

@@ -820,6 +820,67 @@ def test_add_catalog_rejects_existing_entry_with_bad_url(self, tmp_path, monkeyp
         with pytest.raises(IntegrationCatalogError, match="HTTPS"):
             cat.add_catalog("https://good.example.com/catalog.json")
 
+    def test_add_catalog_wraps_yaml_parse_errors(self, tmp_path, monkeypatch):
+        """Invalid YAML on disk surfaces as IntegrationValidationError, not a raw YAMLError."""
+        self._isolate(tmp_path, monkeypatch)
+        cfg_path = tmp_path / ".specify" / "integration-catalogs.yml"
+        cfg_path.write_text(
+            "catalogs:\n  - url: 'https://a.example.com/cat.json'\n  - [bad\n",
+            encoding="utf-8",
+        )
+        cat = IntegrationCatalog(tmp_path)
+        with pytest.raises(
+            IntegrationValidationError, match="Failed to read catalog config"
+        ):
+            cat.add_catalog("https://b.example.com/catalog.json")
+
+    def test_remove_catalog_wraps_yaml_parse_errors(self, tmp_path, monkeypatch):
+        """Invalid YAML on disk surfaces as IntegrationValidationError from remove_catalog too."""
+        self._isolate(tmp_path, monkeypatch)
+        cfg_path = tmp_path / ".specify" / "integration-catalogs.yml"
+        cfg_path.write_text(
+            "catalogs:\n  - url: 'https://a.example.com/cat.json'\n  - [bad\n",
+            encoding="utf-8",
+        )
+        cat = IntegrationCatalog(tmp_path)
+        with pytest.raises(
+            IntegrationValidationError, match="Failed to read catalog config"
+        ):
+            cat.remove_catalog(0)
+
+    def test_add_catalog_defaults_missing_priority_to_index_plus_one(
+        self, tmp_path, monkeypatch
+    ):
+        """Existing entries without `priority` should be treated as idx + 1.
+
+        Matches the rule in `_load_catalog_config()`: a valid catalog entry
+        without an explicit `priority` sorts at `idx + 1`, so the new entry
+        should get `max(...) + 1` from those derived values.
+        """
+        self._isolate(tmp_path, monkeypatch)
+        cfg_path = tmp_path / ".specify" / "integration-catalogs.yml"
+        cfg_path.write_text(
+            yaml.dump(
+                {
+                    "catalogs": [
+                        # No explicit priority → should be treated as 1
+                        {"url": "https://a.example.com/cat.json", "name": "a"},
+                        # No explicit priority → should be treated as 2
+                        {"url": "https://b.example.com/cat.json", "name": "b"},
+                    ]
+                }
+            ),
+            encoding="utf-8",
+        )
+        cat = IntegrationCatalog(tmp_path)
+        cat.add_catalog("https://c.example.com/cat.json", name="c")
+
+        data = yaml.safe_load(cfg_path.read_text(encoding="utf-8"))
+        new_entry = data["catalogs"][-1]
+        assert new_entry["name"] == "c"
+        # max(implicit [1, 2]) + 1 == 3
+        assert new_entry["priority"] == 3
+
     def test_remove_catalog_empty_list_gives_clear_error(self, tmp_path, monkeypatch):
         """Hand-edited empty `catalogs:` produces a clear error, not '0--1'."""
         self._isolate(tmp_path, monkeypatch)