@@ -4,10 +4,39 @@ Changelog
 [Unreleased]
 ------------
 
+Added
+^^^^^
+- A check reporting a service description that cannot be composed, such as a
+  :class:`~scim2_models.ResourceType` naming a schema ``/Schemas`` does not publish.
+  The remaining checks used to be silently skipped.
+
+Changed
+^^^^^^^
+- scim2-client 0.9.0 and scim2-models 0.8.0 are now the minimum supported versions.
+- What the discovery endpoints publish is registered on the client as a
+  :class:`~scim2_models.ScimProvider`, in place of its resource models, its resource types
+  and its service provider configuration.
+
+Removed
+^^^^^^^
+- **Breaking:** the ``httpx`` packaging extra, as scim2-client dropped its own.
+  The engines require `httpx2 <https://github.com/pydantic/httpx2>`_, pulled by the
+  ``httpx2`` extra. An application that cannot migrate all its dependencies at once can
+  call :code:`httpx2.alias_httpx()` at the very top of its entrypoint, so that
+  :code:`import httpx` resolves to httpx2 process-wide.
+
 Fixed
 ^^^^^
 - The :attr:`~scim2_tester.CheckResult.data` of a failed check holds the decoded response
   payload instead of the response object, whose representation only carries a status code.
+- Two resource types built upon a same schema are told apart, where the model of the first
+  one declaring the schema used to answer for both.
+- The :attr:`~scim2_tester.CheckResult.data` of a check failed against the
+  :class:`~scim2_client.engines.werkzeug.TestSCIMClient` engine holds the response payload,
+  where reading it raised a :class:`TypeError`.
+- :meth:`~scim2_tester.check_server` takes any synchronous client, as it always did, instead
+  of declaring the httpx2 one. Importing ``scim2_tester`` no longer requires the ``httpx2``
+  packaging extra, which only the command line needs.
 
 [0.3.0] - 2026-09-20
 --------------------
 
@@ -12,12 +12,12 @@ scim2-tester is integrated in :doc:`scim2-cli <scim2_cli:index>`:
     export SCIM_CLI_URL="https://auth.example"
     scim test
 
-You can check the :ref:`scim2-cli test command reference <scim2_cli:test>` for more details.
+You can check the :ref:`scim2-cli test command reference <scim2_cli:reference:test>` for more details.
 
 Code integration
 ================
 
-If you need to integrate the tester in your code, you can initialize a :ref:`scim2-client engine <scim2_client:tutorial:engines>`
+If you need to integrate the tester in your code, you can initialize a :ref:`scim2-client engine <scim2_client:reference:engines>`
 and pass it to the :meth:`~scim2_tester.check_server` method:
 
 .. code-block:: python
 
@@ -26,8 +26,8 @@ classifiers = [
 
 requires-python = ">= 3.10"
 dependencies = [
-    "scim2-client>=0.8.0",
-    "scim2-models>=0.7.0",
+    "scim2-client>=0.9.0",
+    "scim2-models>=0.8.0",
 ]
 
 [project.urls]
@@ -41,12 +41,7 @@ module-root = ""
 
 [project.optional-dependencies]
 httpx2 = [
-    "scim2-client[httpx2]>=0.8.0",
-]
-
-# Deprecated, will be removed in 0.9.
-httpx = [
-    "scim2-client[httpx]>=0.8.0",
+    "scim2-client[httpx2]>=0.9.0",
 ]
 
 [dependency-groups]
@@ -138,7 +133,6 @@ env_list = [
     "py312",
     "py313",
     "py314",
-    "legacy",
     "minversions",
     "doc",
     "coverage",
@@ -158,9 +152,6 @@ commands = [
     ["prek", "run", "--all-files", "--show-diff-on-failure"],
 ]
 
-[tool.tox.env.legacy]
-extras = ["httpx"]
-
 [tool.tox.env.minversions]
 base_python = ["python3.10"]
 runner = "uv-venv-runner"
 
@@ -1,6 +1,8 @@
 from typing import Any
 
-from scim2_client.engines.httpx2 import SyncSCIMClient
+from scim2_client import BaseSyncSCIMClient
+from scim2_models import ScimProvider
+from scim2_models import ScimProviderError
 
 from scim2_tester.checkers import random_url
 from scim2_tester.checkers import resource_type_tests
@@ -11,6 +13,7 @@
 from scim2_tester.utils import CheckContext
 from scim2_tester.utils import CheckResult
 from scim2_tester.utils import Status
+from scim2_tester.utils import check_result
 
 
 def _discovered_objects(results: list[CheckResult]) -> Any:
@@ -23,8 +26,56 @@ def _discovered_objects(results: list[CheckResult]) -> Any:
     return results[0].data if results[0].status == Status.SUCCESS else None
 
 
+def _describe_service(
+    context: CheckContext,
+    results_spc: list[CheckResult],
+    results_resource_types: list[CheckResult],
+    results_schemas: list[CheckResult],
+) -> tuple[ScimProvider | None, list[CheckResult]]:
+    """Compose the description of the server from what its discovery endpoints published.
+
+    What the client already describes wins over what the server publishes, as
+    :meth:`~scim2_client.BaseSyncSCIMClient.discover` does. The description is
+    registered on the client so the remaining checks are run against it.
+    """
+    provider = context.client.provider
+    config = provider.config or _discovered_objects(results_spc)
+
+    if provider.models:
+        described = ScimProvider(
+            provider.models, provider.resource_types, config, provider.policy
+        )
+        context.client.provider = described
+        return described, []
+
+    resource_types = _discovered_objects(results_resource_types)
+    schemas = _discovered_objects(results_schemas)
+    if not resource_types or not schemas:
+        return None, []
+
+    try:
+        described = ScimProvider.from_discovery(
+            schemas, resource_types, config, provider.policy
+        )
+    except ScimProviderError as exc:
+        return None, [
+            check_result(
+                context,
+                status=Status.ERROR,
+                title="service_description",
+                description="Compose the resource models the server serves from "
+                "the schemas and the resource types it publishes.",
+                reason=str(exc),
+                tags={"discovery"},
+            )
+        ]
+
+    context.client.provider = described
+    return described, []
+
+
 def check_server(
-    client: SyncSCIMClient,
+    client: BaseSyncSCIMClient,
     raise_exceptions: bool = False,
     include_tags: set[str] | None = None,
     exclude_tags: set[str] | None = None,
@@ -34,7 +85,8 @@ def check_server(
 
     It starts by retrieving the standard :class:`~scim2_models.ServiceProviderConfig`,
     :class:`~scim2_models.Schema` and :class:`~scim2_models.ResourceType` endpoints.
-    Those configuration resources will be registered to the client if no other have been registered yet.
+    What they publish describes the server as a :class:`~scim2_models.ScimProvider`
+    registered on the client, leaving untouched whatever the client already described.
 
     Then for all available resources (whether they have been manually configured in the client,
     or dynamically discovered by the checker), it perform a series of creation, query, replacement and deletion.
@@ -86,33 +138,25 @@ def check_server(
 
     results_spc = service_provider_config_endpoint(context)
     results.extend(results_spc)
-    if not client.service_provider_config:
-        client.service_provider_config = _discovered_objects(results_spc)
 
     results_resource_types = _resource_types_endpoint(context)
     results.extend(results_resource_types)
-    if not client.resource_types:
-        client.resource_types = _discovered_objects(results_resource_types)
 
     results_schemas = _schemas_endpoint(context)
     results.extend(results_schemas)
-    schemas = _discovered_objects(results_schemas)
-    if not client.resource_models and schemas:
-        client.resource_models = client.build_resource_models(
-            client.resource_types or [], schemas
-        )
 
-    if (
-        not client.service_provider_config
-        or not client.resource_types
-        or not client.resource_models
-    ):
+    provider, results_description = _describe_service(
+        context, results_spc, results_resource_types, results_schemas
+    )
+    results.extend(results_description)
+
+    if provider is None or not provider.config:
         return results
 
     result_random = random_url(context)
     results.extend(result_random)
 
-    for resource_type in client.resource_types or []:
+    for resource_type in provider.resource_types:
         if conf.resource_types and resource_type.name not in conf.resource_types:
             continue
 
 
@@ -6,10 +6,10 @@
 from scim2_models import Mutability
 from scim2_models import PatchOp
 from scim2_models import PatchOperation
+from scim2_models import Path
 from scim2_models import Required
 from scim2_models import Resource
 from scim2_models import SCIMException
-from scim2_models.path import Path
 
 from ..filling import generate_random_value
 from ..utils import CheckContext
@@ -46,8 +46,8 @@ def check_add_attribute(
        an existing resource."
     """
     if (
-        context.client.service_provider_config
-        and not context.client.service_provider_config.patch.supported
+        context.client.provider.config
+        and not context.client.provider.config.patch.supported
     ):
         return [
             check_result(
@@ -86,7 +86,8 @@ def check_add_attribute(
     for path in all_paths:
         urn = str(path)
         patch_value = generate_random_value(context, path=path)
-        mutability = path.get_annotation(Mutability)
+        binding = path.resolve()
+        mutability = binding.get_annotation(Mutability) if binding else None
 
         patch_op = PatchOp[type(base_resource)](
             operations=[
 
@@ -6,10 +6,10 @@
 from scim2_models import Mutability
 from scim2_models import PatchOp
 from scim2_models import PatchOperation
+from scim2_models import Path
 from scim2_models import Required
 from scim2_models import Resource
 from scim2_models import SCIMException
-from scim2_models.path import Path
 
 from ..utils import CheckContext
 from ..utils import CheckResult
@@ -45,8 +45,8 @@ def check_remove_attribute(
        functions, depending on the target location specified by 'path'."
     """
     if (
-        context.client.service_provider_config
-        and not context.client.service_provider_config.patch.supported
+        context.client.provider.config
+        and not context.client.provider.config.patch.supported
     ):
         return [
             check_result(
@@ -81,7 +81,8 @@ def check_remove_attribute(
     for path in all_paths:
         urn = str(path)
         initial_value = path.get(full_resource)
-        mutability = path.get_annotation(Mutability)
+        binding = path.resolve()
+        mutability = binding.get_annotation(Mutability) if binding else None
         if initial_value is None:
             continue
 
 
@@ -6,9 +6,9 @@
 from scim2_models import Mutability
 from scim2_models import PatchOp
 from scim2_models import PatchOperation
+from scim2_models import Path
 from scim2_models import Resource
 from scim2_models import SCIMException
-from scim2_models.path import Path
 
 from ..filling import generate_random_value
 from ..utils import CheckContext
@@ -45,8 +45,8 @@ def check_replace_attribute(
        specified by the 'path'."
     """
     if (
-        context.client.service_provider_config
-        and not context.client.service_provider_config.patch.supported
+        context.client.provider.config
+        and not context.client.provider.config.patch.supported
     ):
         return [
             check_result(
@@ -80,7 +80,8 @@ def check_replace_attribute(
     for path in all_paths:
         urn = str(path)
         patch_value = generate_random_value(context, path=path)
-        mutability = path.get_annotation(Mutability)
+        binding = path.resolve()
+        mutability = binding.get_annotation(Mutability) if binding else None
 
         patch_op = PatchOp[type(base_resource)](
             operations=[
 
@@ -1,4 +1,5 @@
 from typing import Any
+from typing import cast
 
 from scim2_models import Resource
 from scim2_models import ResourceType
@@ -13,16 +14,14 @@
 def _model_from_resource_type(
     context: CheckContext, resource_type: ResourceType
 ) -> type[Resource[Any]] | None:
-    """Resolve Resource model class from ResourceType metadata.
+    """Resolve the model a :class:`~scim2_models.ResourceType` designates.
 
-    Maps a :class:`~scim2_models.ResourceType` object (containing schema URIs and metadata) to the
-    corresponding Python model class registered in the SCIM client.
+    The description of the server binds each resource type name to the model an
+    endpoint serves, extensions included, so two resource types built upon a
+    same schema are told apart.
     """
-    for resource_model in context.client.resource_models:
-        if resource_model.__schema__ == resource_type.schema_:
-            return resource_model
-
-    return None
+    model = context.client.provider.model_for(resource_type)
+    return cast("type[Resource[Any]]", model) if model else None
 
 
 @checker("crud:read")
 
@@ -1,10 +1,6 @@
 import argparse
 
-try:
-    from httpx2 import Client
-except ImportError:
-    from httpx import Client
-
+from httpx2 import Client
 from scim2_client.engines.httpx2 import SyncSCIMClient
 
 from scim2_tester.checker import check_server