fix(bundler): normalize the catalog entry id and cover the nested version field

Addresses two review comments.

1. `CatalogEntry.from_dict` still computed `entry_id` with
   `str(data.get("id", ""))`, so an explicit `id: null` remained the literal
   "None". That is truthy, so `load_catalog_payload` compared it against the
   mapping key and reported the wrong error:

       before: Catalog entry id mismatch: key 'demo' != entry id 'None'.
       after : Catalog entry for 'demo' is missing its 'id' field.

   Now routed through `_text` like every other text field.

2. `requires.speckit_version` was switched to `_text` in this PR but only the
   seven top-level attributes were tested, so that branch could regress while
   the suite still passed. Added a dedicated case.

Mutation-verified: reverting only `entry_id` fails only the null-id test, and
reverting only `requires_speckit_version` fails only the nested-field test --
each pins its own branch.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>

Author: jawwad-ali

src/specify_cli/bundler/models/catalog.py

@@ -170,7 +170,11 @@ class CatalogEntry:
     def from_dict(cls, data: Any) -> "CatalogEntry":
         if not isinstance(data, dict):
             raise BundlerError("Each catalog entry must be a mapping.")
-        entry_id = str(data.get("id", "")).strip()
+        # ``_text`` here too: an ``id: null`` otherwise became the literal
+        # "None", which is truthy, so ``load_catalog_payload`` reported it as an
+        # id MISMATCH against the mapping key rather than the accurate
+        # missing-id error.
+        entry_id = _text(data.get("id"))
         # `or {}` would coerce a FALSY non-mapping (0, '', False, []) to {} before
         # the isinstance guard, silently accepting a corrupt catalog entry; only
         # an absent/None value means "not present".

tests/contract/test_catalog_schema.py

@@ -404,3 +404,37 @@ def test_catalog_entry_rejects_falsy_non_mapping(field, bad):
     data[field] = bad
     with pytest.raises(BundlerError, match=f"'{field}' must be a mapping"):
         CatalogEntry.from_dict(data)
+
+
+def test_catalog_entry_explicit_null_id_reports_missing_id():
+    """`id: null` must surface as the missing-id error, not an id mismatch.
+
+    `entry_id` was still computed with `str(data.get("id", ""))`, so an explicit
+    null became the literal "None". That is truthy, so `load_catalog_payload`
+    compared it against the mapping key and reported
+    "id mismatch: key 'demo' != entry id 'None'" instead of the accurate
+    missing-id error.
+    """
+    from specify_cli.bundler.models.catalog import CatalogEntry
+
+    data = catalog_entry_dict("demo")
+    data["id"] = None
+    assert CatalogEntry.from_dict(data).id == ""
+
+    with pytest.raises(BundlerError, match="missing its 'id' field"):
+        load_catalog_payload(catalog_payload({"demo": data}))
+
+
+def test_catalog_entry_explicit_null_requires_speckit_version_reads_as_empty():
+    """The nested `requires.speckit_version` branch is covered too.
+
+    It was switched to `_text` alongside the top-level fields, but only the
+    top-level attributes were exercised — so this branch could regress while
+    the suite still passed.
+    """
+    from specify_cli.bundler.models.catalog import CatalogEntry
+
+    data = catalog_entry_dict("demo")
+    data["requires"] = {"speckit_version": None}
+
+    assert CatalogEntry.from_dict(data).requires_speckit_version == ""