fix: prioritize bundle catalog URL matches

Assisted-by: GitHub Copilot (model: GPT-5.6 Sol, autonomous)

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: mnriem

src/specify_cli/bundles/catalog_config.py

@@ -196,22 +196,26 @@ def add_source(
         },
         Scope.PROJECT,
     )
+    id_collision = False
     for existing in catalogs:
         existing_source = CatalogSource.from_dict(existing, Scope.PROJECT)
-        if (
-            existing_source.id == requested_source.id
-            or existing_source.url == requested_source.url
-        ):
+        if existing_source.url == requested_source.url:
             if (
-                existing_source.url == requested_source.url
-                and (not requested_id or existing_source.id == requested_source.id)
+                (not requested_id or existing_source.id == requested_source.id)
                 and existing_source.priority == requested_source.priority
                 and existing_source.install_policy is requested_source.install_policy
             ):
                 return existing_source, "unchanged"
             raise BundlerError(
                 f"Catalog source '{resolved_id}' (or url) already exists in this project."
             )
+        if existing_source.id == requested_source.id:
+            id_collision = True
+
+    if id_collision:
+        raise BundlerError(
+            f"Catalog source '{resolved_id}' (or url) already exists in this project."
+        )
 
     entry = requested_source.to_dict()
     catalogs.append(entry)

tests/specify_cli/bundles/test_catalog_config.py

@@ -153,6 +153,40 @@ def test_add_source_uses_existing_id_when_id_is_omitted(tmp_path: Path):
     assert second == first
 
 
+def test_add_source_prefers_url_match_over_derived_id_collision(tmp_path: Path):
+    project = tmp_path / "proj"
+    (project / ".specify").mkdir(parents=True)
+    cc._write(
+        project,
+        [
+            {
+                "id": "example-com-target",
+                "url": "https://other.example/catalog.json",
+                "priority": 50,
+                "install_policy": "install-allowed",
+            },
+            {
+                "id": "custom",
+                "url": "https://example.com/target.json",
+                "priority": 50,
+                "install_policy": "install-allowed",
+            },
+        ],
+    )
+    original = cc._config_path(project).read_bytes()
+
+    source, status = cc.add_source(
+        project,
+        "https://example.com/target.json",
+        policy="install-allowed",
+        priority=50,
+    )
+
+    assert status == "unchanged"
+    assert source.id == "custom"
+    assert cc._config_path(project).read_bytes() == original
+
+
 def test_remove_source_accepts_relative_local_path(tmp_path: Path, monkeypatch):
     """add_source stores a local path as an absolute url, so remove_source must
     accept the same relative path the caller added; otherwise `remove ./cat.json`