diff --git a/.github/scripts/assert_ci_coverage.py b/.github/scripts/assert_ci_coverage.py
index fbdbfafa66d..b442948c3ca 100644
--- a/.github/scripts/assert_ci_coverage.py
+++ b/.github/scripts/assert_ci_coverage.py
@@ -32,6 +32,7 @@ IGNORE_ARG_RE: Final = re.compile(r"--ignore(?:-glob)?[= ](\S+)")
 DOCKERFILE_TOKEN_RE = re.compile(r"[A-Za-z0-9_./-]*Dockerfile[A-Za-z0-9_.-]*")
 COMMENT_RE = re.compile(r"^\s*#.*$", re.MULTILINE)
 GLOB_CHARS = frozenset("*?")
+DEDICATED_INTEGRATION_WORKFLOWS: Final = MappingProxyType({"image-scan.yml": "tests/integration/database/image/"})
 
 # Trees whose jobs are sharded with no catch-all bucket, so every child that holds
 # tests has to be named by some shard or it runs nowhere. A child listed here is
@@ -560,6 +561,17 @@ def _integration_github_files(runner: pathlib.Path) -> frozenset[str]:
     return frozenset(ast.literal_eval(values))
 
 
+def _owns(workflow: str, relative_path: str) -> bool:
+    owned_root: Final = DEDICATED_INTEGRATION_WORKFLOWS.get(workflow)
+    return owned_root is not None and relative_path.startswith(owned_root)
+
+
+def _tokens_outside_owner(relative_path: str, workflow_tokens: Mapping[str, frozenset[str]]) -> frozenset[str]:
+    return frozenset[str]().union(
+        *(tokens for workflow, tokens in workflow_tokens.items() if not _owns(workflow, relative_path))
+    )
+
+
 def _integration_ownership(repo_root: pathlib.Path = REPO_ROOT) -> tuple[frozenset[str], tuple[Finding, ...]]:
     runner: Final = repo_root / "tests/integration/run.py"
     if not runner.exists():
@@ -611,15 +623,20 @@ def _integration_ownership(repo_root: pathlib.Path = REPO_ROOT) -> tuple[frozens
         )
         != 1
     )
-    gha_tokens: Final = _invoked_test_tokens(
-        scalar
-        for path in (repo_root / ".github/workflows").glob("*.y*ml")
-        for scalar in _scalars(yaml.safe_load(path.read_text()), path.name)
+    workflow_tokens: Final = MappingProxyType(
+        {
+            path.name: _invoked_test_tokens(_scalars(yaml.safe_load(path.read_text()), path.name))
+            for path in (repo_root / ".github/workflows").glob("*.y*ml")
+        }
+    )
+    gha_tokens: Final = frozenset[str]().union(*workflow_tokens.values())
+    circle_owned: Final = (
+        frozenset(str(path.relative_to(repo_root)) for path in integration_root.rglob("test_*.py")) - github_files
     )
     findings: Final = (
         tuple(
-            Finding(path, "integration contract is also selected by GitHub Actions")
-            for path in paths
+            Finding(path, "integration file outside GITHUB_FILES is selected by GitHub Actions")
+            for path in sorted(circle_owned)
             if any(_token_covers(token, path) for token in gha_tokens)
         )
         + tuple(
@@ -632,6 +649,11 @@ def _integration_ownership(repo_root: pathlib.Path = REPO_ROOT) -> tuple[frozens
             for path in sorted(github_files)
             if not (repo_root / path).is_file()
         )
+        + tuple(
+            Finding(path, "GitHub-owned integration contract runs outside a dedicated integration workflow")
+            for path in sorted(github_files)
+            if any(_token_covers(token, path) for token in _tokens_outside_owner(path, workflow_tokens))
+        )
     )
     browser_commands: Final = tuple(
         scalar.value
@@ -688,13 +710,9 @@ def main() -> int:
     scalars = _all_scalars()
 
     integration_paths, ownership_findings = _integration_ownership()
-    test_findings = (
-        _uncovered_tests(
-            allowlist,
-            _invoked_selections(scalars)
-            + (Selection(included=integration_paths, ignored=frozenset()),),
-        )
-        + ownership_findings
+    test_findings = _uncovered_tests(
+        allowlist,
+        _invoked_selections(scalars) + (Selection(included=integration_paths, ignored=frozenset()),),
     )
     dockerfile_findings = _uncovered_dockerfiles(allowlist, _built_dockerfile_tokens(scalars))
     stale_findings = _stale_allowlist_paths(allowlist, test_files=_test_files(), dockerfiles=_dockerfiles())
@@ -711,13 +729,25 @@ def main() -> int:
             test_findings,
             "Add each to a job's test path, or list it in .github/ci-coverage-allowlist.yml with a reason.",
         )
+    if ownership_findings:
+        browser_remedy = (
+            " CircleCI's browser group owns the integrationCritical Playwright contracts, so no GitHub workflow may "
+            "select them and the default Playwright config must exclude them."
+            if any("browser" in finding.detail or "Playwright" in finding.detail for finding in ownership_findings)
+            else ""
+        )
+        _report(
+            "integration contracts with the wrong CI owner",
+            ownership_findings,
+            "Follow tests/integration/AGENTS.md, which says which CI job owns each integration file." + browser_remedy,
+        )
     if dockerfile_findings:
         _report(
             "Dockerfiles that no CI job builds",
             dockerfile_findings,
             "Build each in a workflow, or list it in .github/ci-coverage-allowlist.yml with a reason.",
         )
-    if stale_findings or test_findings or dockerfile_findings:
+    if stale_findings or test_findings or ownership_findings or dockerfile_findings:
         return 1
 
     _write(
diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml
index f8a7c38ef79..636a5031e5f 100644
--- a/.github/workflows/test-rust.yml
+++ b/.github/workflows/test-rust.yml
@@ -16,6 +16,10 @@ on:
       - "litellm/proxy/guardrails/**"
       - "litellm/utils.py"
       - "litellm/ocr/**"
+      - "litellm/chat_completions/dispatch.py"
+      - "litellm/embeddings/dispatch.py"
+      - "litellm/messages/dispatch.py"
+      - "litellm/responses/dispatch.py"
       - "litellm/llms/base_llm/ocr/**"
       - "litellm/llms/custom_httpx/llm_http_handler.py"
       - "Makefile"
@@ -46,6 +50,10 @@ on:
       - "litellm/proxy/guardrails/**"
       - "litellm/utils.py"
       - "litellm/ocr/**"
+      - "litellm/chat_completions/dispatch.py"
+      - "litellm/embeddings/dispatch.py"
+      - "litellm/messages/dispatch.py"
+      - "litellm/responses/dispatch.py"
       - "litellm/llms/base_llm/ocr/**"
       - "litellm/llms/custom_httpx/llm_http_handler.py"
       - "Makefile"
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
index 0558875bdad..1b486d78f04 100644
--- a/.github/workflows/test-unit.yml
+++ b/.github/workflows/test-unit.yml
@@ -696,7 +696,6 @@ jobs:
               tests/unit/responses/litellm_completion_transformation
               tests/unit/responses/test_additional_tools.py
               tests/unit/responses/test_custom_tool_call.py
-              tests/unit/responses/test_dispatch.py
               tests/unit/responses/test_metadata_codex_callback.py
               tests/unit/responses/test_no_duplicate_spend_logs.py
               tests/unit/responses/test_null_test_fix.py
diff --git a/AGENTS.md b/AGENTS.md
index 87e4df49299..f4b1de57807 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -29,7 +29,7 @@ A test must only fail when litellm code changes. Never pin facts we don't own (a
 
 `tests/unit/` mirrors `litellm/` in a parallel path (see `tests/unit/AGENTS.md`). Name tests `test_<filename>.py`, but always match the existing test file in the directory you touch — many provider dirs use longer descriptive names (e.g. `test_anthropic_chat_transformation.py`) to avoid ambiguity across sibling folders. For bug fixes, extend the existing mapped test file rather than creating a new one. Only create a new test file for a new feature (provider, endpoint, or transformation module) that has no mapped test yet, following that directory's naming convention (or `test_<filename>.py` if you're the first test there). One focused regression test beats many shallow ones
 
-End-to-end tests belong in `tests/e2e/` and must follow the harness conventions documented in that directory's `AGENTS.md`
+End-to-end tests belong in `tests/e2e/`. A rule about one directory's files, like its harness or which CI runs it, goes in that directory's `AGENTS.md`, never only in a README or here. Read a directory's `AGENTS.md` before editing files in it
 
 When creating PRs, target the repository's current default branch for both internal and external / OSS contributions. Check it with `python3 scripts/default_branch.py --branch` instead of assuming a branch name or relying on cached `origin/HEAD`
 
@@ -72,7 +72,7 @@ When referencing or running models (coding, QA'ing, writing docs, writing tests,
 
 Always pull before starting any work. The checkout or worktree may be sitting on a stale branch
 
-If you're an internal contributor, when creating a new PR, the typical flow is to branch off the repository's current default branch and create a branch prefixed with litellm_. Do not create a branch prefixed with claude/ and generally do not have / in your branch names
+Internal contributors branch a new PR off the repository's current default branch, with a branch name prefixed with litellm_
 
 Do not add `Co-Authored-By: Claude` or any Claude attribution to commit messages. Never use a `claude/` prefix or put a `/` in a branch name. Do not add "Generated with Claude Code" (or any similar attribution) to PR descriptions or comments. Do not create a new PR/branch off the existing PR to fix/add something that is related and could've just been committed directly to the existing PR's branch
 
diff --git a/litellm-rust/crates/gateway-inference/src/messages.rs b/litellm-rust/crates/gateway-inference/src/messages.rs
index c7a8e3e3294..d612a042e03 100644
--- a/litellm-rust/crates/gateway-inference/src/messages.rs
+++ b/litellm-rust/crates/gateway-inference/src/messages.rs
@@ -24,7 +24,7 @@ const OPENROUTER_API_HEADERS: [&str; 2] = [
     "x-openrouter-experimental-metadata",
 ];
 const ANTHROPIC_API_HEADER_PROVIDERS: &str =
-    "anthropic,bedrock,bedrock_mantle,vertex_ai,openrouter";
+    "anthropic,bedrock,bedrock_mantle,vertex_ai,openrouter,deepseek";
 
 pub async fn create(
     State(gateway): State<Arc<Gateway>>,
diff --git a/litellm-rust/crates/gateway-inference/tests/messages.rs b/litellm-rust/crates/gateway-inference/tests/messages.rs
index b0a9baa2fac..bf11e67e0fc 100644
--- a/litellm-rust/crates/gateway-inference/tests/messages.rs
+++ b/litellm-rust/crates/gateway-inference/tests/messages.rs
@@ -16,7 +16,7 @@ use wiremock::{
 #[rstest]
 #[case::anthropic("anthropic/test-model", "/v1/messages", true)]
 #[case::azure("azure_ai/test-model", "/anthropic/v1/messages", false)]
-#[case::deepseek("deepseek/test-model", "/anthropic/v1/messages", false)]
+#[case::deepseek("deepseek/test-model", "/anthropic/v1/messages", true)]
 #[tokio::test]
 async fn messages_reaches_the_provider_and_preserves_json_or_sse(
     #[case] model: &str,
diff --git a/litellm/__init__.py b/litellm/__init__.py
index 88e56c14187..df52808643d 100644
--- a/litellm/__init__.py
+++ b/litellm/__init__.py
@@ -1177,7 +1177,9 @@ def _build_models_by_provider() -> dict:
         "edenai": edenai_models,
         "datarobot": datarobot_models,
         "vertex_ai": vertex_chat_models
+        | vertex_code_chat_models
         | vertex_text_models
+        | vertex_code_text_models
         | vertex_anthropic_models
         | vertex_vision_models
         | vertex_language_models
@@ -1185,7 +1187,7 @@ def _build_models_by_provider() -> dict:
         | vertex_minimax_models
         | vertex_moonshot_models
         | vertex_zai_models,
-        "ai21": ai21_models,
+        "ai21": ai21_models | ai21_chat_models,
         "bedrock": bedrock_models | bedrock_converse_models,
         "petals": petals_models,
         "ollama": ollama_models,
@@ -1416,6 +1418,7 @@ from .exceptions import (
     InvalidRequestError,
     BadRequestError,
     ImageFetchError,
+    MalformedRequestFieldError as MalformedRequestFieldError,
     VectorStoreSearchError,
     NotFoundError,
     PermissionDeniedError,
diff --git a/litellm/assistants/main.py b/litellm/assistants/main.py
index ba542bebaf8..a3428261636 100644
--- a/litellm/assistants/main.py
+++ b/litellm/assistants/main.py
@@ -129,6 +129,7 @@ def get_assistants(
             timeout=timeout,
             max_retries=optional_params.max_retries,
             organization=organization,
+            litellm_params=litellm_params_dict,
             client=client,
             aget_assistants=aget_assistants,
         )
@@ -312,6 +313,7 @@ def create_assistants(
             timeout=timeout,
             max_retries=optional_params.max_retries,
             organization=organization,
+            litellm_params=litellm_params_dict,
             create_assistant_data=create_assistant_data,
             client=client,
             async_create_assistants=async_create_assistants,
@@ -461,6 +463,7 @@ def delete_assistant(
             timeout=timeout,
             max_retries=optional_params.max_retries,
             organization=organization,
+            litellm_params=litellm_params_dict,
             assistant_id=assistant_id,
             client=client,
             async_delete_assistants=async_delete_assistants,
@@ -637,6 +640,7 @@ def create_thread(
             timeout=timeout,
             max_retries=optional_params.max_retries,
             organization=organization,
+            litellm_params=litellm_params_dict,
             client=client,
             acreate_thread=acreate_thread,
         )
@@ -783,6 +787,7 @@ def get_thread(
             timeout=timeout,
             max_retries=optional_params.max_retries,
             organization=organization,
+            litellm_params=litellm_params_dict,
             client=client,
             aget_thread=aget_thread,
         )
@@ -960,6 +965,7 @@ def add_message(
             timeout=timeout,
             max_retries=optional_params.max_retries,
             organization=organization,
+            litellm_params=litellm_params_dict,
             client=client,
             a_add_message=a_add_message,
         )
@@ -1111,6 +1117,7 @@ def get_messages(
             timeout=timeout,
             max_retries=optional_params.max_retries,
             organization=organization,
+            litellm_params=litellm_params_dict,
             client=client,
             aget_messages=aget_messages,
         )
@@ -1308,6 +1315,7 @@ def run_thread(
             timeout=timeout,
             max_retries=optional_params.max_retries,
             organization=organization,
+            litellm_params=litellm_params_dict,
             client=client,
             arun_thread=arun_thread,
             event_handler=event_handler,
diff --git a/litellm/batches/batch_utils.py b/litellm/batches/batch_utils.py
index e7b009eaefe..a50cdf75d33 100644
--- a/litellm/batches/batch_utils.py
+++ b/litellm/batches/batch_utils.py
@@ -19,7 +19,7 @@ from litellm.llms.vertex_ai.batches.transformation import (
 )
 from litellm.types.llms.openai import Batch
 from litellm.types.utils import ModelInfo, Usage
-from litellm.types.workload_identity import ANTHROPIC_WIF_KWARGS_KEYS
+from litellm.types.workload_identity import ANTHROPIC_WIF_KWARGS_KEYS, OPENAI_WIF_KWARGS_KEYS
 from litellm.utils import token_counter
 
 
@@ -569,6 +569,7 @@ def extract_file_access_credentials(
             # A federated deployment holds no api_key, so without these the fetch that reads a
             # finished batch's output has nothing to authenticate with and its cost is never billed.
             *sorted(ANTHROPIC_WIF_KWARGS_KEYS),
+            *sorted(OPENAI_WIF_KWARGS_KEYS),
         )
         for key in credential_keys:
             if key in litellm_params:
diff --git a/litellm/batches/main.py b/litellm/batches/main.py
index 1acd7ad67d1..9b5630d81ad 100644
--- a/litellm/batches/main.py
+++ b/litellm/batches/main.py
@@ -309,6 +309,7 @@ def create_batch(
                 timeout=timeout,
                 max_retries=optional_params.max_retries,
                 _is_async=_is_async,
+                litellm_params=litellm_params,
             )
         elif custom_llm_provider == "azure":
             api_base = optional_params.api_base or litellm.api_base or get_secret_str("AZURE_API_BASE")
@@ -471,6 +472,7 @@ def _handle_retrieve_batch_providers_without_provider_config(
             organization=organization,
             timeout=timeout,
             max_retries=optional_params.max_retries,
+            litellm_params=litellm_params,
         )
     elif custom_llm_provider == "azure":
         api_base = optional_params.api_base or litellm.api_base or get_secret_str("AZURE_API_BASE")
@@ -819,6 +821,7 @@ def list_batches(
                 organization=organization,
                 timeout=timeout,
                 max_retries=optional_params.max_retries,
+                litellm_params=litellm_params,
             )
         elif custom_llm_provider == "azure":
             api_base = optional_params.api_base or litellm.api_base or get_secret_str("AZURE_API_BASE")
@@ -1016,6 +1019,7 @@ def cancel_batch(
                 organization=organization,
                 timeout=timeout,
                 max_retries=optional_params.max_retries,
+                litellm_params=litellm_params,
             )
         elif custom_llm_provider == "azure":
             api_base = optional_params.api_base or litellm.api_base or get_secret_str("AZURE_API_BASE")
diff --git a/litellm/completion_extras/litellm_responses_transformation/transformation.py b/litellm/completion_extras/litellm_responses_transformation/transformation.py
index 979caa29832..8d23526b41a 100644
--- a/litellm/completion_extras/litellm_responses_transformation/transformation.py
+++ b/litellm/completion_extras/litellm_responses_transformation/transformation.py
@@ -197,7 +197,7 @@ def _drops_audio_input(model: str, litellm_params: Mapping[str, object]) -> bool
     return not _supports_audio_input(model, litellm_params)
 
 
-def _provider_metadata(response_fields: Mapping[str, object] | None) -> Mapping[str, object]:
+def responses_provider_metadata(response_fields: Mapping[str, object] | None) -> Mapping[str, object]:
     return MappingProxyType(
         {
             key: value
@@ -1455,7 +1455,7 @@ class LiteLLMResponsesTransformationHandler(CompletionTransformationBridge):
         )
 
         model_response.id = _upstream_response_id(raw_response.id) or raw_response.id
-        for key, value in _provider_metadata(raw_response.model_extra).items():
+        for key, value in responses_provider_metadata(raw_response.model_extra).items():
             setattr(model_response, key, value)
 
         # Preserve hidden params from the ResponsesAPIResponse, especially the headers
@@ -2139,7 +2139,7 @@ class OpenAiResponsesToChatCompletionStreamIterator(BaseModelResponseIterator):
                 from litellm.responses.utils import ResponseAPILoggingUtils
 
                 usage = ResponseAPILoggingUtils.transform_response_api_usage_to_chat_usage(response_data.get("usage"))
-            provider_metadata: Final = _provider_metadata(response_data)
+            provider_metadata: Final = responses_provider_metadata(response_data)
             served_service_tier: Final = response_data.get("service_tier")
             return ModelResponseStream(
                 choices=[
diff --git a/litellm/constants.py b/litellm/constants.py
index 39363cc02e4..425fc22d340 100644
--- a/litellm/constants.py
+++ b/litellm/constants.py
@@ -1859,6 +1859,7 @@ SPEND_COUNTER_RESEED_LOCKS_MAX_SIZE: Final = get_env_int("SPEND_COUNTER_RESEED_L
 PROXY_DB_LOOKUP_MAX_CONCURRENCY: Final = max(1, get_env_int("PROXY_DB_LOOKUP_MAX_CONCURRENCY", 25))
 PROXY_DB_LOOKUP_DEADLINE_SECONDS: Final = max(0.1, get_env_float("PROXY_DB_LOOKUP_DEADLINE_SECONDS", 10.0))
 PROXY_DB_LOOKUP_STALL_WINDOW_SECONDS: Final = max(0.0, get_env_float("PROXY_DB_LOOKUP_STALL_WINDOW_SECONDS", 30.0))
+TEAM_DELETE_TRANSACTION_TIMEOUT_SECONDS: Final = 30
 DEFAULT_CRON_JOB_LOCK_TTL_SECONDS: Final = get_env_int("DEFAULT_CRON_JOB_LOCK_TTL_SECONDS", 60)  # 1 minute
 PROXY_BUDGET_RESCHEDULER_MIN_TIME: Final = get_env_int("PROXY_BUDGET_RESCHEDULER_MIN_TIME", 597)
 RESET_BUDGET_JOB_BATCH_SIZE: Final = max(1, get_env_int("RESET_BUDGET_JOB_BATCH_SIZE", 500))
diff --git a/litellm/containers/README.md b/litellm/containers/README.md
index 571bcaf415c..40723add854 100644
--- a/litellm/containers/README.md
+++ b/litellm/containers/README.md
@@ -120,6 +120,7 @@ class AzureContainerConfig(BaseContainerConfig):
         self,
         headers: dict,
         api_key: Optional[str] = None,
+        litellm_params: Optional[GenericLiteLLMParams] = None,
     ) -> dict:
         """Azure uses api-key header instead of Bearer token."""
         import litellm
diff --git a/litellm/cost_calculator.py b/litellm/cost_calculator.py
index 0e315e97432..05dc2900349 100644
--- a/litellm/cost_calculator.py
+++ b/litellm/cost_calculator.py
@@ -86,6 +86,9 @@ from litellm.llms.openai.cost_calculation import (
 from litellm.llms.openai.cost_calculation import (
     video_output_cost_per_second,
 )
+from litellm.llms.openai.transcriptions.gpt_transformation import (
+    OpenAIGPTAudioTranscriptionConfig,
+)
 from litellm.llms.perplexity.cost_calculator import (
     cost_per_token as perplexity_cost_per_token,
 )
@@ -325,6 +328,15 @@ def _transcription_usage_has_token_details(
     return (prompt_tokens_val > 0) or (completion_tokens_val > 0)
 
 
+def _bills_provider_transcription_seconds(model: str | None, custom_llm_provider: str | None) -> bool:
+    if model is None or custom_llm_provider != LlmProviders.OPENAI.value:
+        return False
+    transcription_config: Final = ProviderConfigManager.get_provider_audio_transcription_config(
+        model=model.removeprefix(f"{LlmProviders.OPENAI.value}/"), provider=LlmProviders.OPENAI
+    )
+    return isinstance(transcription_config, OpenAIGPTAudioTranscriptionConfig)
+
+
 OCRPricingField = Literal["ocr_cost_per_page", "ocr_cost_per_credit", "annotation_cost_per_page"]
 
 
@@ -1739,6 +1751,12 @@ def completion_cost(
                     audio_transcription_file_duration = _hidden.get(
                         "audio_transcription_duration",
                         getattr(completion_response, "duration", 0.0),
+                    ) or (
+                        completion_response.usage.seconds
+                        if isinstance(completion_response, TranscriptionResponse)
+                        and isinstance(completion_response.usage, TranscriptionUsageDurationObject)
+                        and _bills_provider_transcription_seconds(requested_model, custom_llm_provider)
+                        else 0.0
                     )
                 elif call_type in _RERANK_CALL_TYPES:
                     if completion_response is not None and isinstance(completion_response, RerankResponse):
diff --git a/litellm/decisions/call.py b/litellm/decisions/call.py
index ef35b61f10e..040d80e1ac0 100644
--- a/litellm/decisions/call.py
+++ b/litellm/decisions/call.py
@@ -458,7 +458,7 @@ def prepare_call(
         ) from error
 
     try:
-        resolved_api_base, resolved_api_key = provider_config.resolve_connection(
+        resolved_api_base, static_api_key = provider_config.resolve_connection(
             dynamic_api_base or api_base, dynamic_api_key or api_key
         )
     except ValueError as error:
@@ -469,6 +469,7 @@ def prepare_call(
             model=model,
             llm_provider=provider,
         )
+    resolved_api_key: Final = provider_config.resolve_credential(static_api_key, resolved_api_base, kwargs)
     if resolved_api_key is None and provider_config.api_key_required:
         raise litellm.AuthenticationError(
             message=f"Missing API key for Decisions provider '{provider}'",
diff --git a/litellm/decisions/main.py b/litellm/decisions/main.py
index 553fe4b884a..7d2ee03da0e 100644
--- a/litellm/decisions/main.py
+++ b/litellm/decisions/main.py
@@ -1,5 +1,7 @@
+import asyncio
 import warnings
 from collections.abc import Mapping
+from functools import partial
 from typing import Final
 
 import httpx
@@ -104,19 +106,22 @@ async def adecisions(
     videos: DecisionsVideoClips | None = None,
     **kwargs: object,
 ) -> OpenAIDecisionResponse | DecisionsResponse:
-    call: Final = _prepare_decisions_call(
-        model=model,
-        decision_input=input,
-        questions=questions,
-        safety_identifier=safety_identifier,
-        audio=audio,
-        videos=videos,
-        api_key=api_key,
-        api_base=api_base,
-        timeout=timeout,
-        custom_llm_provider=custom_llm_provider,
-        extra_headers=extra_headers,
-        kwargs=kwargs,
+    call: Final = await asyncio.to_thread(
+        partial(
+            _prepare_decisions_call,
+            model=model,
+            decision_input=input,
+            questions=questions,
+            safety_identifier=safety_identifier,
+            audio=audio,
+            videos=videos,
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            custom_llm_provider=custom_llm_provider,
+            extra_headers=extra_headers,
+            kwargs=kwargs,
+        )
     )
     return await asend(call)
 
diff --git a/litellm/exceptions.py b/litellm/exceptions.py
index b3a0802db13..733f1aa72d5 100644
--- a/litellm/exceptions.py
+++ b/litellm/exceptions.py
@@ -313,6 +313,10 @@ class VectorStoreSearchError(BadRequestError):
         )
 
 
+class MalformedRequestFieldError(BadRequestError):
+    pass
+
+
 class UnprocessableEntityError(openai.UnprocessableEntityError):
     def __init__(
         self,
diff --git a/litellm/files/main.py b/litellm/files/main.py
index e259d4230de..16ff5b02f9c 100644
--- a/litellm/files/main.py
+++ b/litellm/files/main.py
@@ -259,6 +259,7 @@ def create_file(
                 max_retries=optional_params.max_retries,
                 organization=openai_creds.organization,
                 create_file_data=_create_file_request,
+                litellm_params=litellm_params_dict,
             )
         elif custom_llm_provider == "azure":
             azure_creds: Final = get_azure_credentials(
@@ -388,6 +389,7 @@ def file_retrieve(
                 timeout=timeout,
                 max_retries=optional_params.max_retries,
                 organization=openai_creds.organization,
+                litellm_params=optional_params.model_dump(exclude_none=True),
             )
         elif custom_llm_provider == "azure":
             azure_creds: Final = get_azure_credentials(
@@ -569,6 +571,7 @@ def file_delete(
                 timeout=timeout,
                 max_retries=optional_params.max_retries,
                 organization=openai_creds.organization,
+                litellm_params=litellm_params_dict,
             )
         elif custom_llm_provider == "azure":
             azure_creds: Final = get_azure_credentials(
@@ -775,6 +778,7 @@ def file_list(
                 timeout=timeout,
                 max_retries=optional_params.max_retries,
                 organization=openai_creds.organization,
+                litellm_params=optional_params.model_dump(exclude_none=True),
             )
         elif custom_llm_provider == "azure":
             azure_creds: Final = get_azure_credentials(
@@ -972,6 +976,7 @@ def file_content(
                 timeout=timeout,
                 max_retries=optional_params.max_retries,
                 organization=openai_creds.organization,
+                litellm_params=litellm_params_dict,
             )
         elif custom_llm_provider == "azure":
             azure_creds: Final = get_azure_credentials(
@@ -1093,6 +1098,7 @@ def file_content_streaming(
             organization=openai_creds.organization,
             chunk_size=chunk_size,
             client=client if isinstance(client, (OpenAI, AsyncOpenAI)) else None,
+            litellm_params=optional_params.model_dump(exclude_none=True),
         )
     elif custom_llm_provider == LlmProviders.VERTEX_AI.value:
         if not _is_async:
diff --git a/litellm/fine_tuning/main.py b/litellm/fine_tuning/main.py
index 38be0666008..5297a8215be 100644
--- a/litellm/fine_tuning/main.py
+++ b/litellm/fine_tuning/main.py
@@ -239,6 +239,7 @@ def create_fine_tuning_job(
                 client=kwargs.get(
                     "client", None
                 ),  # note, when we add this to `GenericLiteLLMParams` it impacts a lot of other tests + linting
+                litellm_params=optional_params.model_dump(exclude_none=True),
             )
         # Azure OpenAI
         elif custom_llm_provider == "azure":
@@ -436,6 +437,7 @@ def cancel_fine_tuning_job(
                 max_retries=optional_params.max_retries,
                 _is_async=_is_async,
                 client=kwargs.get("client", None),
+                litellm_params=optional_params.model_dump(exclude_none=True),
             )
         # Azure OpenAI
         elif custom_llm_provider == "azure":
@@ -591,6 +593,7 @@ def list_fine_tuning_jobs(
                 max_retries=optional_params.max_retries,
                 _is_async=_is_async,
                 client=kwargs.get("client", None),
+                litellm_params=optional_params.model_dump(exclude_none=True),
             )
         # Azure OpenAI
         elif custom_llm_provider == "azure":
@@ -730,6 +733,7 @@ def retrieve_fine_tuning_job(
                 max_retries=optional_params.max_retries,
                 _is_async=_is_async,
                 client=kwargs.get("client", None),
+                litellm_params=optional_params.model_dump(exclude_none=True),
             )
         # Azure OpenAI
         elif custom_llm_provider == "azure":
diff --git a/litellm/images/main.py b/litellm/images/main.py
index be32ea4daed..7f94835d59b 100644
--- a/litellm/images/main.py
+++ b/litellm/images/main.py
@@ -39,6 +39,7 @@ from openai.types.audio.transcription_create_params import FileTypes
 # BFL handlers
 from litellm.llms.black_forest_labs.image_edit.handler import bfl_image_edit
 from litellm.llms.black_forest_labs.image_generation.handler import bfl_image_generation
+from litellm.llms.openai.workload_identity import resolve_openai_workload_identity_config
 from litellm.main import (
     azure_chat_completions,
     base_llm_aiohttp_handler,
@@ -505,6 +506,7 @@ def image_generation(
                 aimg_generation=aimg_generation,
                 client=client,
                 headers=headers,
+                litellm_params=litellm_params_dict,
             )
         elif custom_llm_provider == "bedrock":
             if model is None:
@@ -681,10 +683,13 @@ def image_variation(
     api_base = provider_config.get_api_base(litellm_params.get("api_base", None))
 
     if image_variation_provider == LITELLM_IMAGE_VARIATION_PROVIDERS.OPENAI:
-        if api_key is None:
-            raise ValueError("API key is required for OpenAI image variations")
         if api_base is None:
             raise ValueError("API base is required for OpenAI image variations")
+        if api_key is None and (
+            resolve_openai_workload_identity_config(api_key=api_key, api_base=api_base, litellm_params=litellm_params)
+            is None
+        ):
+            raise ValueError("API key is required for OpenAI image variations")
 
         response = openai_image_variations.image_variations(
             model_response=model_response,
diff --git a/litellm/integrations/prometheus.py b/litellm/integrations/prometheus.py
index fa5496004e3..97a1073d7c0 100644
--- a/litellm/integrations/prometheus.py
+++ b/litellm/integrations/prometheus.py
@@ -27,6 +27,7 @@ from litellm.constants import (
     PROXY_REJECTED_BEFORE_ROUTING_KEY,
 )
 from litellm.exceptions import (
+    MalformedRequestFieldError,
     validate_rate_limit_category,
     validate_rate_limit_type,
 )
@@ -3104,7 +3105,11 @@ class PrometheusLogger(CustomLogger):
 
             # On LiteLLM-side rejects (no deployment picked), route request_kwargs["model"]
             # into requested_model and leave deployment-scoped labels empty.
-            deployment_selected: Final = bool(model_id) and not _litellm_params.get(PROXY_REJECTED_BEFORE_ROUTING_KEY)
+            deployment_selected: Final = (
+                bool(model_id)
+                and not _litellm_params.get(PROXY_REJECTED_BEFORE_ROUTING_KEY)
+                and not isinstance(exception, MalformedRequestFieldError)
+            )
             if deployment_selected:
                 label_litellm_model_name = litellm_model_name
                 label_model_id = model_id
diff --git a/litellm/litellm_core_utils/get_litellm_params.py b/litellm/litellm_core_utils/get_litellm_params.py
index 04755f9e1e9..9dee3714c60 100644
--- a/litellm/litellm_core_utils/get_litellm_params.py
+++ b/litellm/litellm_core_utils/get_litellm_params.py
@@ -78,6 +78,7 @@ OPTIONAL_KWARGS_KEYS: Final = (
             "github_copilot_auth_type",
             "github_copilot_user_session",
             "fireworks_forward_user_id",
+            "responses_api_version",
             PROVIDER_AFFINITY_HEADER_KWARG_KEY,
         }
     )
diff --git a/litellm/litellm_core_utils/get_model_cost_map.py b/litellm/litellm_core_utils/get_model_cost_map.py
index fee48cca0cf..6e3769260cc 100644
--- a/litellm/litellm_core_utils/get_model_cost_map.py
+++ b/litellm/litellm_core_utils/get_model_cost_map.py
@@ -17,6 +17,7 @@ import random
 import sys
 import threading
 import time
+import urllib.parse
 from collections.abc import Awaitable, Callable, Mapping
 from dataclasses import dataclass, replace
 from datetime import datetime, timezone
@@ -24,11 +25,11 @@ from importlib.resources import files
 from itertools import chain
 from pathlib import Path
 from types import MappingProxyType
-from typing import Final, Protocol
+from typing import Final, Protocol, cast  # noqa: TID251  # adapts boto3 and botocore's dynamic client responses
 
 import httpx
 from pydantic import ConfigDict, TypeAdapter
-from typing_extensions import ReadOnly, TypedDict
+from typing_extensions import NotRequired, ReadOnly, TypedDict
 
 from litellm import verbose_logger
 from litellm.constants import (
@@ -266,6 +267,19 @@ class _SyncGetClient(Protocol):
     def get(self, url: str, *, timeout: float | None = None) -> httpx.Response: ...
 
 
+class _S3Body(Protocol):
+    def read(self) -> bytes: ...
+
+
+class _S3GetObjectResponse(TypedDict):
+    Body: ReadOnly[_S3Body]
+    ETag: NotRequired[ReadOnly[str]]
+
+
+class _S3Client(Protocol):
+    def get_object(self, *, Bucket: str, Key: str) -> _S3GetObjectResponse: ...
+
+
 _FetchAttemptOutcome = ModelCostMapReloaded | ModelCostMapReloadUnavailable | _FetchAttemptRetryable
 
 
@@ -276,6 +290,20 @@ def _default_reload_client() -> _AsyncGetClient:
     return get_async_httpx_client(llm_provider=httpxSpecialProvider.ModelCostMap)
 
 
+def _default_s3_client(timeout: int) -> _S3Client:
+    import boto3
+    from botocore.config import Config
+
+    return cast(  # cast-ok: boto3's generic client factory does not expose its generated S3 response type
+        _S3Client,
+        boto3.client(  # pyright: ignore[reportUnknownMemberType]  # generic factory returns Unknown service clients
+            "s3",
+            region_name=os.getenv("AWS_REGION_NAME") or None,
+            config=Config(connect_timeout=timeout, read_timeout=timeout, retries={"total_max_attempts": 1}),
+        ),
+    )
+
+
 def _classify_fetch_error(error: httpx.HTTPError | httpx.InvalidURL, url: str) -> _FetchAttemptOutcome:
     reason: Final = f"{type(error).__name__} fetching {url}: {error}"
     if isinstance(error, (httpx.InvalidURL, httpx.UnsupportedProtocol)):
@@ -283,7 +311,41 @@ def _classify_fetch_error(error: httpx.HTTPError | httpx.InvalidURL, url: str) -
     return _FetchAttemptRetryable(reason=reason, retry_after_seconds=None)
 
 
+def _classify_fetch_content(content: bytes, url: str, etag: str | None) -> _FetchAttemptOutcome:
+    try:
+        parsed: Final[object] = json.loads(content)
+    except ValueError as e:
+        return ModelCostMapReloadUnavailable(reason=f"invalid JSON from {url}: {e}")
+    if not isinstance(parsed, dict):
+        return ModelCostMapReloadUnavailable(reason=f"expected a JSON object from {url}, got {type(parsed).__name__}")
+    model_cost_map: Final = cast(  # cast-ok: JSON object keys are strings by definition
+        dict[str, object], parsed
+    )
+    return ModelCostMapReloaded(model_cost_map=model_cost_map, revision=git_blob_id(content), etag=etag)
+
+
+def _attempt_fetch_s3(url: str, timeout: int) -> _FetchAttemptOutcome:
+    from botocore.exceptions import BotoCoreError, ClientError
+
+    parts: Final = urllib.parse.urlsplit(url)
+    bucket: Final = parts.netloc
+    key: Final = parts.path.lstrip("/")
+    if not bucket or not key:
+        return ModelCostMapReloadUnavailable(reason=f"invalid S3 URL {url}: expected s3://bucket/key")
+
+    try:
+        client: Final = _default_s3_client(timeout)
+        response: Final = client.get_object(Bucket=bucket, Key=key)
+        content: Final = response["Body"].read()
+    except (BotoCoreError, ClientError) as error:
+        return ModelCostMapReloadUnavailable(reason=f"S3 {type(error).__name__} fetching {url}: {error}")
+    return _classify_fetch_content(content, url, response.get("ETag"))
+
+
 async def _attempt_fetch(client: _AsyncGetClient, url: str, timeout: int) -> _FetchAttemptOutcome:
+    parts: Final = urllib.parse.urlsplit(url)
+    if parts.scheme == "s3":
+        return await asyncio.to_thread(_attempt_fetch_s3, url, timeout)
     try:
         response: Final = await client.get(url, timeout=timeout)
     except (httpx.HTTPError, httpx.InvalidURL) as e:
@@ -292,6 +354,9 @@ async def _attempt_fetch(client: _AsyncGetClient, url: str, timeout: int) -> _Fe
 
 
 def _attempt_fetch_sync(client: _SyncGetClient, url: str, timeout: int) -> _FetchAttemptOutcome:
+    parts: Final = urllib.parse.urlsplit(url)
+    if parts.scheme == "s3":
+        return _attempt_fetch_s3(url, timeout)
     try:
         response: Final = client.get(url, timeout=timeout)
     except (httpx.HTTPError, httpx.InvalidURL) as e:
@@ -307,15 +372,7 @@ def _classify_fetch_response(response: httpx.Response, url: str) -> _FetchAttemp
         )
     if response.is_error:
         return ModelCostMapReloadUnavailable(reason=f"HTTP {response.status_code} from {url}")
-    try:
-        parsed: Final = response.json()
-    except ValueError as e:
-        return ModelCostMapReloadUnavailable(reason=f"invalid JSON from {url}: {e}")
-    if not isinstance(parsed, dict):
-        return ModelCostMapReloadUnavailable(reason=f"expected a JSON object from {url}, got {type(parsed).__name__}")
-    return ModelCostMapReloaded(
-        model_cost_map=parsed, revision=git_blob_id(response.content), etag=response.headers.get("etag")
-    )
+    return _classify_fetch_content(response.content, url, response.headers.get("etag"))
 
 
 def _next_retry_wait(
diff --git a/litellm/litellm_core_utils/litellm_logging.py b/litellm/litellm_core_utils/litellm_logging.py
index 67d1573dbc4..35decbb4bd7 100644
--- a/litellm/litellm_core_utils/litellm_logging.py
+++ b/litellm/litellm_core_utils/litellm_logging.py
@@ -2300,6 +2300,13 @@ class Logging(LiteLLMLoggingBaseClass):
         self.model_call_details["combined_usage_object"] = usage
         self.model_call_details["response_cost"] = response_cost
 
+    def attempt_scoped_copy(self) -> "Logging":
+        """A copy with its own model_call_details, so logging one attempt of a request through it leaves
+        the state the request's other attempts share untouched."""
+        attempt: Final = copy.copy(self)
+        attempt.model_call_details = dict(self.model_call_details)
+        return attempt
+
     def carry_failed_attempt_usage(self) -> None:
         """Move what a failed earlier attempt stashed off the retry sharing this logging object, so the retry logs its
         own usage while the request's failure log still bills every attempt."""
@@ -4345,6 +4352,9 @@ class Logging(LiteLLMLoggingBaseClass):
         row is built from this response rather than re-parsed from the served body."""
         self.bridged_model_response = response
 
+    def record_bridged_responses_api_response(self, response: ResponsesAPIResponse) -> None:
+        self.record_bridged_model_response(self._translate_responses_api_response_to_model_response(response))
+
     def billable_result(self, result: object) -> object:
         """The response the cost calculator prices: a /v1/messages body served through the chat
         bridge is replaced by the ModelResponse its spend row is built from, anything else is
@@ -4445,6 +4455,7 @@ class Logging(LiteLLMLoggingBaseClass):
         """
         from litellm.completion_extras.litellm_responses_transformation.transformation import (
             LiteLLMResponsesTransformationHandler,
+            responses_provider_metadata,
         )
 
         served_id: Final = _provider_response_id(result)
@@ -4469,7 +4480,9 @@ class Logging(LiteLLMLoggingBaseClass):
                 "usage-only ModelResponse to keep the spend_logs row.",
                 str(e),
             )
-            model_response: Final = litellm.ModelResponse(id=served_id)
+            model_response: Final = litellm.ModelResponse(
+                id=served_id, **responses_provider_metadata(result.model_extra)
+            )
             model_response.model = self.model
             usage: Final = result.usage
             if usage is not None and ResponseAPILoggingUtils.is_response_api_usage(usage):
diff --git a/litellm/litellm_core_utils/llm_cost_calc/tool_call_cost_tracking.py b/litellm/litellm_core_utils/llm_cost_calc/tool_call_cost_tracking.py
index ce5dceb2e5c..04510c20db0 100644
--- a/litellm/litellm_core_utils/llm_cost_calc/tool_call_cost_tracking.py
+++ b/litellm/litellm_core_utils/llm_cost_calc/tool_call_cost_tracking.py
@@ -858,9 +858,9 @@ class StandardBuiltInToolCostTracking:
 
     @staticmethod
     def get_web_search_options(kwargs: Mapping[str, object]) -> WebSearchOptions | None:
-        if "web_search_options" in kwargs:
-            web_search_options: Final = cast(WebSearchOptions, kwargs.get("web_search_options", {}))
-            return WebSearchOptions(**web_search_options)
+        web_search_options: Final = kwargs.get("web_search_options")
+        if isinstance(web_search_options, dict):
+            return WebSearchOptions(**cast(WebSearchOptions, web_search_options))
 
         tools: Final = StandardBuiltInToolCostTracking._get_tools_from_kwargs(
             kwargs=kwargs, tool_type="web_search_preview"
@@ -876,10 +876,9 @@ class StandardBuiltInToolCostTracking:
     _get_web_search_options = get_web_search_options
 
     @staticmethod
-    def _get_tools_from_kwargs(kwargs: Mapping[str, object], tool_type: str) -> list[object] | None:
-        if "tools" in kwargs:
-            return cast(list[object], kwargs.get("tools", []))
-        return None
+    def _get_tools_from_kwargs(kwargs: Mapping[str, object], tool_type: str) -> Sequence[object] | None:
+        tools: Final = kwargs.get("tools")
+        return cast(Sequence[object], tools) if isinstance(tools, (list, tuple)) else None
 
     @staticmethod
     def get_file_search_tool_call(kwargs: Mapping[str, object]) -> FileSearchTool | None:
diff --git a/litellm/litellm_core_utils/tool_fields.py b/litellm/litellm_core_utils/tool_fields.py
new file mode 100644
index 00000000000..f90c8f5d174
--- /dev/null
+++ b/litellm/litellm_core_utils/tool_fields.py
@@ -0,0 +1,164 @@
+from collections.abc import Callable, Mapping
+from dataclasses import dataclass
+from functools import reduce
+from typing import Annotated, Final, TypeAlias
+
+from pydantic import BeforeValidator, ConfigDict, Json, TypeAdapter, ValidationError
+from typing_extensions import ReadOnly, TypedDict
+
+import litellm
+from litellm.litellm_core_utils.core_helpers import normalize_drop_params
+
+ROUTES_WITH_TOOLS: Final = frozenset(
+    {
+        "acompletion",
+        "aresponses",
+        "acompact_responses",
+        "anthropic_messages",
+        "agenerate_content",
+        "agenerate_content_stream",
+        "acreate_interaction",
+    }
+)
+TOOL_FIELDS: Final = frozenset({"tools", "tool_choice", "parallel_tool_calls", "toolConfig", "tool_config"})
+_TOOLS: Final = TypeAdapter(list[object])
+_FIELD_LIST: Final = TypeAdapter(list[object], config=ConfigDict(strict=True))
+_JSON_OBJECT: Final = TypeAdapter(Json[dict[str, object]])
+
+
+def _schema_as_read(value: object) -> object:
+    if not value:
+        return None
+    if not isinstance(value, str):
+        return value
+    try:
+        return _JSON_OBJECT.validate_python(value)
+    except ValidationError:
+        return value
+
+
+_Schema: TypeAlias = Annotated[dict[str, object] | None, BeforeValidator(_schema_as_read)]
+
+
+class _ToolFunction(TypedDict, total=False):
+    parameters: ReadOnly[_Schema]
+
+
+class _ToolEntry(TypedDict, total=False):
+    function: ReadOnly[_ToolFunction | None]
+    parameters: ReadOnly[_Schema]
+    input_schema: ReadOnly[_Schema]
+    vector_store_ids: ReadOnly[list[str] | None]
+
+
+_TOOL_ENTRY: Final = TypeAdapter(_ToolEntry)
+_WEB_SEARCH_OPTIONS: Final = TypeAdapter(dict[str, object] | None, config=ConfigDict(strict=True))
+
+
+@dataclass(frozen=True, slots=True)
+class DropPolicy:
+    drop_params: bool
+    additional_drop_params: frozenset[str]
+
+    def drops(self, field: str) -> bool:
+        return self.drop_params or field in self.additional_drop_params
+
+
+@dataclass(frozen=True, slots=True)
+class MalformedField:
+    field: str
+    message: str
+    dropped: Callable[[Mapping[str, object]], Mapping[str, object]]
+
+
+def _field_names(value: object) -> frozenset[str]:
+    try:
+        return frozenset(name for name in _FIELD_LIST.validate_python(value) if isinstance(name, str))
+    except ValidationError:
+        return frozenset()
+
+
+def drop_policy(params: Mapping[str, object]) -> DropPolicy:
+    return DropPolicy(
+        drop_params=litellm.drop_params is True or normalize_drop_params(params.get("drop_params")) is True,
+        additional_drop_params=_field_names(params.get("additional_drop_params")),
+    )
+
+
+def first_validation_error(e: ValidationError, prefix: tuple[str | int, ...] = ()) -> str:
+    error: Final = e.errors(include_url=False)[0]
+    return f"{'.'.join(str(part) for part in (*prefix, *error['loc']))}: {error['msg']}"
+
+
+def _tool_entry_error(index: int, entry: object) -> str | None:
+    try:
+        _TOOL_ENTRY.validate_python(entry, strict=True)
+    except ValidationError as e:
+        return first_validation_error(e, prefix=("tools", index))
+    return None
+
+
+def _without_tool_fields(data: Mapping[str, object]) -> Mapping[str, object]:
+    return {name: value for name, value in data.items() if name not in TOOL_FIELDS}
+
+
+def _malformed_tools(data: Mapping[str, object]) -> MalformedField | None:
+    tools: Final = data.get("tools")
+    if tools is None:
+        return None
+    try:
+        entries: Final = _TOOLS.validate_python(tools)
+    except ValidationError as e:
+        return MalformedField("tools", first_validation_error(e, prefix=("tools",)), _without_tool_fields)
+    entry_errors: Final = tuple(_tool_entry_error(index, entry) for index, entry in enumerate(entries))
+    first_error: Final = next((error for error in entry_errors if error is not None), None)
+    if first_error is None:
+        return None
+    kept: Final = [entry for entry, error in zip(entries, entry_errors) if error is None]
+    return MalformedField(
+        "tools", first_error, lambda fields: {**fields, "tools": kept} if kept else _without_tool_fields(fields)
+    )
+
+
+def _without_web_search_options(data: Mapping[str, object]) -> Mapping[str, object]:
+    return {name: value for name, value in data.items() if name != "web_search_options"}
+
+
+def _malformed_web_search_options(data: Mapping[str, object]) -> MalformedField | None:
+    try:
+        _WEB_SEARCH_OPTIONS.validate_python(data.get("web_search_options"))
+    except ValidationError as e:
+        return MalformedField(
+            "web_search_options",
+            first_validation_error(e, prefix=("web_search_options",)),
+            _without_web_search_options,
+        )
+    return None
+
+
+def resolve_tool_fields(
+    data: Mapping[str, object], candidates: Callable[[], tuple[DropPolicy, ...]]
+) -> Mapping[str, object] | MalformedField:
+    checked: Final = (_malformed_tools(data), _malformed_web_search_options(data))
+    malformed: Final = tuple(field for field in checked if field is not None)
+    if not malformed:
+        return data
+    policies: Final = candidates()
+    rejected: Final = next(
+        (field for field in malformed if not any(policy.drops(field.field) for policy in policies)), None
+    )
+    if rejected is not None:
+        return rejected
+    return reduce(
+        lambda resolved, field: field.dropped(resolved),
+        (field for field in malformed if all(policy.drops(field.field) for policy in policies)),
+        data,
+    )
+
+
+def resolve_deployment_tool_fields(
+    kwargs: Mapping[str, object], route: object
+) -> Mapping[str, object] | MalformedField:
+    if "proxy_server_request" not in kwargs or route not in ROUTES_WITH_TOOLS:
+        return kwargs
+    return resolve_tool_fields(kwargs, lambda: (drop_policy(kwargs),))
diff --git a/litellm/llms/anthropic/chat/guardrail_translation/handler.py b/litellm/llms/anthropic/chat/guardrail_translation/handler.py
index 6bc1c4ead64..6b6974becac 100644
--- a/litellm/llms/anthropic/chat/guardrail_translation/handler.py
+++ b/litellm/llms/anthropic/chat/guardrail_translation/handler.py
@@ -45,6 +45,7 @@ from litellm.llms.base_llm.guardrail_translation.utils import (
     effective_scan_only_tool_results_for_guardrail,
     effective_skip_system_message_for_guardrail,
     effective_skip_tool_message_for_guardrail,
+    list_field,
     merge_guardrailed_scoped_messages,
     merge_returned_tools_into_request_tools,
     scoped_structured_message_indices,
@@ -924,10 +925,10 @@ class AnthropicMessagesHandler(BaseTranslation):
             images=(),
         )
 
-    def extract_request_tool_names(self, data: dict) -> list[str]:
+    def extract_request_tool_names(self, data: Mapping[str, object]) -> list[str]:
         """Extract every tool name in an Anthropic messages request: tools[].name, plus
         tools[].function.name for OpenAI-format tools the bridge forwards verbatim."""
-        return [name for tool in data.get("tools") or [] for name in anthropic_tool_names(tool)]
+        return [name for tool in list_field(data, "tools") for name in anthropic_tool_names(tool)]
 
     @classmethod
     def _extract_input_text_and_images(
diff --git a/litellm/llms/anthropic/pass_through/messages/streaming_iterator.py b/litellm/llms/anthropic/pass_through/messages/streaming_iterator.py
index 5fb2546a5ae..e65fe596da7 100644
--- a/litellm/llms/anthropic/pass_through/messages/streaming_iterator.py
+++ b/litellm/llms/anthropic/pass_through/messages/streaming_iterator.py
@@ -2,6 +2,7 @@ import asyncio
 import json
 import re
 from collections.abc import AsyncGenerator, AsyncIterator, Mapping, Sequence
+from contextvars import ContextVar
 from datetime import datetime
 from typing import TYPE_CHECKING, Any, Final, Protocol, runtime_checkable
 
@@ -352,6 +353,22 @@ async def aclose_if_supported(stream: object) -> None:
         await stream.aclose()
 
 
+_CLOSING_SUPERSEDED_ATTEMPT: Final[ContextVar[bool]] = ContextVar("closing_superseded_attempt", default=False)
+
+
+async def aclose_superseded_attempt(stream: object) -> None:
+    """Close an attempt a retry or fallback is taking over, so its end-of-stream logging records a failure."""
+    token: Final = _CLOSING_SUPERSEDED_ATTEMPT.set(True)
+    try:
+        await aclose_if_supported(stream)
+    finally:
+        _CLOSING_SUPERSEDED_ATTEMPT.reset(token)
+
+
+def closing_superseded_attempt() -> bool:
+    return _CLOSING_SUPERSEDED_ATTEMPT.get()
+
+
 _RESPONSE_HEADERS_ADAPTER: Final[TypeAdapter[dict[str, str]]] = TypeAdapter(dict[str, str])
 
 
diff --git a/litellm/llms/anthropic/pass_through/responses_adapters/handler.py b/litellm/llms/anthropic/pass_through/responses_adapters/handler.py
index 18ecff990d2..692e5d4c175 100644
--- a/litellm/llms/anthropic/pass_through/responses_adapters/handler.py
+++ b/litellm/llms/anthropic/pass_through/responses_adapters/handler.py
@@ -43,6 +43,12 @@ _BLOCK_LIST: Final = TypeAdapter(list[dict[str, object]])
 _ADAPTER: Final = LiteLLMAnthropicToResponsesAPIAdapter()
 
 
+def _record_bridged_response(responses_kwargs: Mapping[str, object], result: ResponsesAPIResponse) -> None:
+    logging_obj: Final = litellm_logging_obj_from_kwargs(responses_kwargs)
+    if logging_obj is not None:
+        logging_obj.record_bridged_responses_api_response(result)
+
+
 def _forwarded_kwargs(extra_kwargs: Mapping[str, object] | None) -> Mapping[str, object]:
     """The litellm-specific kwargs forwarded verbatim onto the Responses API request."""
     return extra_kwargs or {}
@@ -301,7 +307,9 @@ class LiteLLMMessagesToResponsesAPIHandler:
         if not isinstance(result, ResponsesAPIResponse):
             raise ValueError(f"Expected ResponsesAPIResponse, got {type(result)}")
 
-        return await with_safeguard_results(_ADAPTER.translate_response(result), safeguards_evaluator)
+        served: Final = await with_safeguard_results(_ADAPTER.translate_response(result), safeguards_evaluator)
+        _record_bridged_response(responses_kwargs, result)
+        return served
 
     @staticmethod
     def anthropic_messages_handler(
diff --git a/litellm/llms/azure/chat/gpt_5_transformation.py b/litellm/llms/azure/chat/gpt_5_transformation.py
index 82150e415aa..a23fffb5744 100644
--- a/litellm/llms/azure/chat/gpt_5_transformation.py
+++ b/litellm/llms/azure/chat/gpt_5_transformation.py
@@ -95,7 +95,6 @@ class AzureOpenAIGPT5Config(AzureOpenAIConfig, OpenAIGPT5Config):
                     status_code=400,
                     message=(
                         "Azure OpenAI does not support reasoning_effort='none' for this model. "
-                        "Supported values are: 'low', 'medium', and 'high'. "
                         "To drop this parameter, set `litellm.drop_params=True` or for proxy:\n\n"
                         "`litellm_settings:\n drop_params: true`\n"
                         "Issue: https://github.com/BerriAI/litellm/issues/16704"
diff --git a/litellm/llms/azure/common_utils.py b/litellm/llms/azure/common_utils.py
index 3564d7a1364..46106026920 100644
--- a/litellm/llms/azure/common_utils.py
+++ b/litellm/llms/azure/common_utils.py
@@ -2,6 +2,7 @@ import asyncio
 import hashlib
 import json
 import os
+import re
 from collections.abc import Callable, Mapping
 from functools import lru_cache
 from types import MappingProxyType
@@ -25,6 +26,7 @@ from litellm.types.router import GenericLiteLLMParams
 from litellm.utils import add_path_to_api_base
 
 azure_ad_cache: Final = DualCache()
+_LAST_OPENAI_PATH_SEGMENT: Final = re.compile(r"^(.*/openai)(?=/|$)")
 
 
 class _AzureAdTokenJson(TypedDict, total=False):
@@ -798,6 +800,10 @@ class BaseAzureLLM(BaseOpenAILLM):
     ) -> dict[str, str]:  # mutable-ok: mirrors override contract
         return cls._base_validate_azure_environment(headers, litellm_params)
 
+    @staticmethod
+    def resolve_azure_api_base(api_base: str | None) -> str | None:
+        return api_base or litellm.api_base or get_secret_str("AZURE_API_BASE")
+
     @staticmethod
     def _get_base_azure_url(
         api_base: str | None,
@@ -815,7 +821,7 @@ class BaseAzureLLM(BaseOpenAILLM):
             default_api_version: The default API version to use if no api_version is provided. If 'latest', it will use `openai/v1/...` route.
         """
 
-        api_base = api_base or litellm.api_base or get_secret_str("AZURE_API_BASE")
+        api_base = BaseAzureLLM.resolve_azure_api_base(api_base)
         if api_base is None:
             raise ValueError(
                 f"api_base is required for Azure AI Studio. Please set the api_base parameter. Passed `api_base={api_base}`"
@@ -843,7 +849,7 @@ class BaseAzureLLM(BaseOpenAILLM):
             # ensure the request go to /openai/v1 and not just /openai
             if "/openai/v1" not in new_url:
                 parsed_url: Final = httpx.URL(new_url)
-                new_url = str(parsed_url.copy_with(path=parsed_url.path.replace("/openai", "/openai/v1")))
+                new_url = str(parsed_url.copy_with(path=_LAST_OPENAI_PATH_SEGMENT.sub(r"\1/v1", parsed_url.path, 1)))
 
         # Use the new query_params dictionary
         final_url: Final = httpx.URL(new_url).copy_with(params=query_params)
diff --git a/litellm/llms/azure/containers/transformation.py b/litellm/llms/azure/containers/transformation.py
index 5031f38bf8f..d69c39d8873 100644
--- a/litellm/llms/azure/containers/transformation.py
+++ b/litellm/llms/azure/containers/transformation.py
@@ -28,6 +28,7 @@ class AzureContainerConfig(OpenAIContainerConfig):
         self,
         headers: dict,
         api_key: str | None = None,
+        litellm_params: GenericLiteLLMParams | None = None,
     ) -> dict:
         return BaseAzureLLM.base_validate_azure_environment(
             headers=headers,
diff --git a/litellm/llms/azure/fine_tuning/handler.py b/litellm/llms/azure/fine_tuning/handler.py
index 0baf3ccc598..aa410d8232b 100644
--- a/litellm/llms/azure/fine_tuning/handler.py
+++ b/litellm/llms/azure/fine_tuning/handler.py
@@ -1,4 +1,4 @@
-from collections.abc import Coroutine
+from collections.abc import Coroutine, Mapping
 from typing import Final, cast
 
 import httpx
@@ -66,6 +66,7 @@ class AzureOpenAIFineTuningAPI(OpenAIFineTuningAPI, BaseAzureLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> LiteLLMFineTuningJob | Coroutine[object, object, LiteLLMFineTuningJob]:
         self._ensure_training_type(create_fine_tuning_job_data)
 
@@ -78,6 +79,7 @@ class AzureOpenAIFineTuningAPI(OpenAIFineTuningAPI, BaseAzureLLM):
             client=client,
             _is_async=_is_async,
             api_version=api_version,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -109,6 +111,7 @@ class AzureOpenAIFineTuningAPI(OpenAIFineTuningAPI, BaseAzureLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> LiteLLMFineTuningJob | Coroutine[object, object, LiteLLMFineTuningJob]:
         openai_client: Final[OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -119,6 +122,7 @@ class AzureOpenAIFineTuningAPI(OpenAIFineTuningAPI, BaseAzureLLM):
             client=client,
             _is_async=_is_async,
             api_version=api_version,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -149,6 +153,7 @@ class AzureOpenAIFineTuningAPI(OpenAIFineTuningAPI, BaseAzureLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> LiteLLMFineTuningJob | Coroutine[object, object, LiteLLMFineTuningJob]:
         openai_client: Final[OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -159,6 +164,7 @@ class AzureOpenAIFineTuningAPI(OpenAIFineTuningAPI, BaseAzureLLM):
             client=client,
             _is_async=_is_async,
             api_version=api_version,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -188,14 +194,14 @@ class AzureOpenAIFineTuningAPI(OpenAIFineTuningAPI, BaseAzureLLM):
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
         _is_async: bool = False,
         api_version: str | None = None,
-        litellm_params: dict | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None:
         # Override to use Azure-specific client initialization
         if isinstance(client, OpenAI) or isinstance(client, AsyncOpenAI):
             client = None
 
         return self.get_azure_openai_client(
-            litellm_params=litellm_params or {},
+            litellm_params=dict(litellm_params) if litellm_params is not None else None,
             api_key=api_key,
             api_base=api_base,
             api_version=api_version,
diff --git a/litellm/llms/azure/responses/transformation.py b/litellm/llms/azure/responses/transformation.py
index 98b4241d7ab..75714d5253b 100644
--- a/litellm/llms/azure/responses/transformation.py
+++ b/litellm/llms/azure/responses/transformation.py
@@ -1,4 +1,7 @@
+import re
+from collections.abc import Mapping
 from copy import deepcopy
+from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, Final, Literal
 
 import httpx
@@ -6,6 +9,7 @@ from openai.types.responses import ResponseReasoningItem
 from pydantic import TypeAdapter
 
 from litellm._logging import verbose_logger
+from litellm.constants import AZURE_DEFAULT_RESPONSES_API_VERSION
 from litellm.litellm_core_utils.url_utils import encode_url_path_segment
 from litellm.llms.azure.chat.gpt_5_transformation import AzureOpenAIGPT5Config
 from litellm.llms.azure.common_utils import BaseAzureLLM
@@ -25,6 +29,34 @@ else:
 _DECODED_JSON: Final = TypeAdapter(object)
 
 
+_DATED_GA_API_VERSION: Final = re.compile(r"\d{4}-\d{2}-\d{2}")
+
+
+def _str_param(litellm_params: Mapping[str, object], key: str) -> str | None:
+    value: Final = litellm_params.get(key)
+    return value if isinstance(value, str) and value else None
+
+
+def _resolve_responses_api_version(api_base: str | None, litellm_params: Mapping[str, object]) -> str | None:
+    """
+    Dated GA api_versions (e.g. 2024-10-21) predate the Responses API on Azure and 404 there, so a deployment
+    pinned to one for chat gets the default Responses version unless it sets responses_api_version.
+    """
+    api_version: Final = _str_param(litellm_params, "api_version")
+    if api_base is not None and "api-version" in httpx.URL(api_base).params:
+        return api_version
+    responses_api_version: Final = _str_param(litellm_params, "responses_api_version")
+    if responses_api_version is not None:
+        return responses_api_version
+    if api_version is not None and _DATED_GA_API_VERSION.fullmatch(api_version):
+        return AZURE_DEFAULT_RESPONSES_API_VERSION
+    return api_version
+
+
+def _with_responses_api_version(api_base: str | None, litellm_params: Mapping[str, object]) -> Mapping[str, object]:
+    return MappingProxyType({**litellm_params, "api_version": _resolve_responses_api_version(api_base, litellm_params)})
+
+
 class AzureOpenAIResponsesAPIConfig(OpenAIResponsesAPIConfig):
     # Parameters not supported by Azure Responses API
     AZURE_UNSUPPORTED_PARAMS = ["context_management"]
@@ -170,11 +202,10 @@ class AzureOpenAIResponsesAPIConfig(OpenAIResponsesAPIConfig):
         - A complete URL string, e.g.,
         "https://litellm8397336933.openai.azure.com/openai/responses?api-version=2024-05-01-preview"
         """
-        from litellm.constants import AZURE_DEFAULT_RESPONSES_API_VERSION
-
+        resolved_api_base: Final = BaseAzureLLM.resolve_azure_api_base(api_base)
         return BaseAzureLLM.get_base_azure_url(
-            api_base=api_base,
-            litellm_params=litellm_params,
+            api_base=resolved_api_base,
+            litellm_params=_with_responses_api_version(resolved_api_base, litellm_params),
             route="/openai/responses",
             default_api_version=AZURE_DEFAULT_RESPONSES_API_VERSION,
         )
diff --git a/litellm/llms/azure_ai/chat/transformation.py b/litellm/llms/azure_ai/chat/transformation.py
index a8e6320bd1e..fc22e9a8b73 100644
--- a/litellm/llms/azure_ai/chat/transformation.py
+++ b/litellm/llms/azure_ai/chat/transformation.py
@@ -1,6 +1,7 @@
 import copy
 import enum
 import re
+from collections.abc import AsyncIterator, Iterator
 from typing import TYPE_CHECKING, Final, cast
 
 import httpx
@@ -21,12 +22,12 @@ from litellm.llms.azure_ai.common_utils import (
 from litellm.llms.base_llm.chat.transformation import LiteLLMLoggingObj
 from litellm.llms.openai.chat.gpt_5_transformation import OpenAIGPT5Config
 from litellm.llms.openai.common_utils import drop_params_from_unprocessable_entity_error
-from litellm.llms.openai.openai import OpenAIConfig
+from litellm.llms.openai.openai import OpenAIChatCompletionResponseIterator, OpenAIConfig
 from litellm.llms.xai.chat.transformation import XAIChatConfig
 from litellm.secret_managers.main import get_secret_str
 from litellm.types.llms.openai import AllMessageValues
 from litellm.types.router import GenericLiteLLMParams
-from litellm.types.utils import ModelResponse, ProviderField
+from litellm.types.utils import ModelResponse, ModelResponseStream, ProviderField
 from litellm.utils import add_path_to_api_base, supports_tool_choice
 
 if TYPE_CHECKING:
@@ -45,6 +46,18 @@ NON_OPENAI_SPEC_MESSAGE_FIELDS: Final = (
 )
 
 
+def _is_grok_model(model: str) -> bool:
+    return "grok" in model
+
+
+class AzureAIChatCompletionResponseIterator(OpenAIChatCompletionResponseIterator):
+    def chunk_parser(self, chunk: dict[str, object]) -> ModelResponseStream:  # mutable-ok: mirrors override contract
+        usage: Final = chunk.get("usage")
+        if _is_grok_model(str(chunk.get("model") or "")) and isinstance(usage, dict):
+            XAIChatConfig.fold_reasoning_tokens_into_completion(usage)
+        return super().chunk_parser(chunk)
+
+
 class AzureAIGPT5Config(OpenAIGPT5Config):
     @classmethod
     def _model_map_lookup_name(cls, model: str) -> str:
@@ -114,7 +127,7 @@ class AzureAIStudioConfig(OpenAIConfig):
         """
         Check if the model supports stop tokens.
         """
-        if "grok" in model:
+        if _is_grok_model(model):
             # Reuse Xai method for Grok model
             xai_config: Final = XAIChatConfig()
             return xai_config.supports_stop_reason(model)
@@ -319,7 +332,7 @@ class AzureAIStudioConfig(OpenAIConfig):
         json_mode: bool | None = None,
     ) -> ModelResponse:
         model_response.model = f"azure_ai/{model}"
-        return super().transform_response(
+        response: Final = super().transform_response(
             model=model,
             raw_response=raw_response,
             model_response=model_response,
@@ -332,6 +345,21 @@ class AzureAIStudioConfig(OpenAIConfig):
             api_key=api_key,
             json_mode=json_mode,
         )
+        if _is_grok_model(model):
+            XAIChatConfig.fold_reasoning_tokens_into_completion(response)
+        return response
+
+    def get_model_response_iterator(
+        self,
+        streaming_response: Iterator[str] | AsyncIterator[str] | ModelResponse,
+        sync_stream: bool,
+        json_mode: bool | None = False,
+    ) -> "AzureAIChatCompletionResponseIterator":
+        return AzureAIChatCompletionResponseIterator(
+            streaming_response=streaming_response,
+            sync_stream=sync_stream,
+            json_mode=json_mode,
+        )
 
     def should_retry_llm_api_inside_llm_translation_on_http_error(
         self, e: httpx.HTTPStatusError, litellm_params: dict
diff --git a/litellm/llms/base_llm/containers/transformation.py b/litellm/llms/base_llm/containers/transformation.py
index 49487cddb6f..7a04c4d9488 100644
--- a/litellm/llms/base_llm/containers/transformation.py
+++ b/litellm/llms/base_llm/containers/transformation.py
@@ -81,6 +81,7 @@ class BaseContainerConfig(ABC):
         self,
         headers: dict,
         api_key: str | None = None,
+        litellm_params: GenericLiteLLMParams | None = None,
     ) -> dict:
         return {}
 
diff --git a/litellm/llms/base_llm/decisions/transformation.py b/litellm/llms/base_llm/decisions/transformation.py
index 041473cb634..df7b7645840 100644
--- a/litellm/llms/base_llm/decisions/transformation.py
+++ b/litellm/llms/base_llm/decisions/transformation.py
@@ -495,6 +495,11 @@ class BaseDecisionsConfig(ABC):
     def resolve_connection(self, api_base: str | None, api_key: str | None) -> tuple[str | None, str | None]:
         return self.resolve_api_base(api_base), self.resolve_api_key(api_key)
 
+    def resolve_credential(
+        self, api_key: str | None, api_base: str, litellm_params: Mapping[str, object]
+    ) -> str | None:
+        return api_key
+
     @staticmethod
     def _first_secret(names: tuple[str, ...]) -> str | None:
         return next((value for value in (get_secret_str(name) for name in names) if value), None)
diff --git a/litellm/llms/base_llm/guardrail_translation/utils.py b/litellm/llms/base_llm/guardrail_translation/utils.py
index 39ff2fa0528..55a4b3da0b3 100644
--- a/litellm/llms/base_llm/guardrail_translation/utils.py
+++ b/litellm/llms/base_llm/guardrail_translation/utils.py
@@ -4,7 +4,7 @@ import json
 from collections.abc import Callable, Iterator, Mapping, Sequence
 from typing import Final, TypeVar, cast  # noqa: TID251  # a rebuilt chat row has no typed constructor across roles
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict, TypeAdapter, ValidationError
 
 from litellm.types.llms.anthropic_messages.anthropic_response import AnthropicUsage
 from litellm.types.llms.openai import AllMessageValues, ResponseAPIUsage
@@ -292,6 +292,17 @@ def openai_tool_name(tool: object) -> str | None:
     return flat_name if isinstance(flat_name, str) else None
 
 
+_FIELDS: Final = TypeAdapter(Mapping[object, object], config=ConfigDict(strict=True))
+_ITEMS: Final = TypeAdapter(Sequence[object], config=ConfigDict(strict=True))
+
+
+def list_field(data: object, key: str) -> Sequence[object]:
+    try:
+        return _ITEMS.validate_python(_FIELDS.validate_python(data).get(key))
+    except ValidationError:
+        return ()
+
+
 def anthropic_tool_names(tool: object) -> tuple[str, ...]:
     """Every name a /v1/messages tool dict can act under: the flat Anthropic ``name`` plus
     ``function.name`` for OpenAI-format tools the bridge forwards verbatim. Allowlist checks
diff --git a/litellm/llms/bedrock/chat/invoke_transformations/anthropic_claude3_transformation.py b/litellm/llms/bedrock/chat/invoke_transformations/anthropic_claude3_transformation.py
index 04747405375..fc6088ddc66 100644
--- a/litellm/llms/bedrock/chat/invoke_transformations/anthropic_claude3_transformation.py
+++ b/litellm/llms/bedrock/chat/invoke_transformations/anthropic_claude3_transformation.py
@@ -32,6 +32,7 @@ from litellm.llms.bedrock.common_utils import (
     tools_without_eager_input_streaming,
 )
 from litellm.types.llms.anthropic import (
+    ANTHROPIC_BETA_HEADER_VALUES,
     ANTHROPIC_FINE_GRAINED_TOOL_STREAMING_BETA_HEADER,
     ANTHROPIC_TOOL_SEARCH_BETA_HEADER,
     AnthropicThinkingParam,
@@ -270,7 +271,12 @@ class AmazonAnthropicClaudeConfig(AmazonInvokeConfig, AnthropicConfig):
         is_mid_conversation_output_config_used: Final = self.is_mid_conversation_output_config_used(messages)
         is_thinking_display_updates_used: Final = self.is_thinking_display_updates_used(thinking)
 
-        user_beta_set: Final = set(get_anthropic_beta_from_headers(headers))
+        client_beta_set: Final = set(get_anthropic_beta_from_headers(headers))
+        user_beta_set: Final = (
+            client_beta_set
+            if "safeguards" in optional_params
+            else client_beta_set - {ANTHROPIC_BETA_HEADER_VALUES.DANGEROUS_TOOL_USE_2026_09_03.value}
+        )
         beta_set: Final = set(user_beta_set)
         auto_betas: Final = self.get_anthropic_beta_list(
             model=model,
diff --git a/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py b/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py
index 88ae0d4d514..95e81fa3ee7 100644
--- a/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py
+++ b/litellm/llms/bedrock/messages/invoke_transformations/anthropic_claude3_transformation.py
@@ -90,6 +90,9 @@ class AmazonAnthropicClaudeMessagesConfig(
     def beta_headers_provider(self) -> str:
         return self.custom_llm_provider or "bedrock"
 
+    def drops_dangerous_tool_use_beta_without_safeguards(self) -> bool:
+        return True
+
     BEDROCK_INVOKE_ALLOWED_TOP_LEVEL_FIELDS = frozenset(BedrockInvokeAnthropicMessagesRequest.__annotations__.keys())
 
     def get_error_class(
@@ -552,8 +555,17 @@ class AmazonAnthropicClaudeMessagesConfig(
         if anthropic_model_info.is_eager_input_streaming_used(tools):
             beta_set.add(ANTHROPIC_FINE_GRAINED_TOOL_STREAMING_BETA_HEADER)
 
+        dangerous_tool_use_beta: Final = ANTHROPIC_BETA_HEADER_VALUES.DANGEROUS_TOOL_USE_2026_09_03.value
         if anthropic_messages_optional_request_params.get("safeguards") is not None:
-            beta_set.add(ANTHROPIC_BETA_HEADER_VALUES.DANGEROUS_TOOL_USE_2026_09_03.value)
+            beta_set.add(dangerous_tool_use_beta)
+        elif dangerous_tool_use_beta in beta_set and self.drops_dangerous_tool_use_beta_without_safeguards():
+            beta_set.discard(dangerous_tool_use_beta)
+            verbose_logger.debug(
+                "Bedrock Invoke: dropping %s from client headers because the request has no safeguards. Bedrock "
+                "answers it with 'invalid beta flag' next to structured outputs before Opus 4.7, and on Sonnet 4.5, "
+                "Opus 4.5, and Opus 4.6 even alone.",
+                dangerous_tool_use_beta,
+            )
 
         self._filter_context_management_for_bedrock_invoke(
             anthropic_messages_request=anthropic_messages_request,
diff --git a/litellm/llms/bedrock/messages/mantle_transformation.py b/litellm/llms/bedrock/messages/mantle_transformation.py
index ca93cc3e617..1ad84761bc9 100644
--- a/litellm/llms/bedrock/messages/mantle_transformation.py
+++ b/litellm/llms/bedrock/messages/mantle_transformation.py
@@ -67,6 +67,9 @@ class AmazonMantleMessagesConfig(AmazonAnthropicClaudeMessagesConfig):
     def should_filter_anthropic_beta_headers(self) -> bool:
         return False
 
+    def drops_dangerous_tool_use_beta_without_safeguards(self) -> bool:
+        return False
+
     def get_complete_url(
         self,
         api_base: str | None,
diff --git a/litellm/llms/custom_httpx/container_handler.py b/litellm/llms/custom_httpx/container_handler.py
index bfa163c7546..a9b96217379 100644
--- a/litellm/llms/custom_httpx/container_handler.py
+++ b/litellm/llms/custom_httpx/container_handler.py
@@ -5,6 +5,7 @@ This module provides a single generic handler that can process any container fil
 endpoint defined in endpoints.json, eliminating the need for individual handler methods.
 """
 
+import asyncio
 import json
 from collections.abc import Coroutine, Mapping, Sequence
 from pathlib import Path
@@ -236,6 +237,7 @@ def _request_headers(
     return container_provider_config.validate_environment(
         headers=extra_headers or {},
         api_key=litellm_params.get("api_key", None),
+        litellm_params=litellm_params,
     )
 
 
@@ -435,7 +437,7 @@ class GenericContainerHandler:
         http_client: Final = _async_http_client(client, litellm_params)
 
         # Build request
-        headers = _request_headers(container_provider_config, extra_headers, litellm_params)
+        headers = await asyncio.to_thread(_request_headers, container_provider_config, extra_headers, litellm_params)
         if extra_headers:
             headers.update(extra_headers)
 
diff --git a/litellm/llms/custom_httpx/llm_http_handler.py b/litellm/llms/custom_httpx/llm_http_handler.py
index f6d76ff05e4..3137404cbbe 100644
--- a/litellm/llms/custom_httpx/llm_http_handler.py
+++ b/litellm/llms/custom_httpx/llm_http_handler.py
@@ -7127,7 +7127,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = image_edit_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            image_edit_provider_config.validate_environment,
             api_key=litellm_params.api_key,
             headers=image_edit_optional_request_params.get("extra_headers", {}) or {},
             model=model,
@@ -7586,7 +7587,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_generation_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_generation_provider_config.validate_environment,
             api_key=api_key or litellm_params.get("api_key", None),
             headers=video_generation_optional_request_params.get("extra_headers", {}) or {},
             model=model,
@@ -7781,7 +7783,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_content_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_content_provider_config.validate_environment,
             headers=extra_headers or {},
             model="",
             api_key=api_key,
@@ -7961,7 +7964,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_remix_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_remix_provider_config.validate_environment,
             api_key=api_key or litellm_params.get("api_key", None),
             headers=extra_headers or {},
             model="",
@@ -8124,7 +8128,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_provider_config.validate_environment,
             api_key=api_key or litellm_params.get("api_key", None),
             headers=extra_headers or {},
             model="",
@@ -8264,7 +8269,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_provider_config.validate_environment,
             api_key=api_key or litellm_params.get("api_key", None),
             headers=extra_headers or {},
             model="",
@@ -8436,7 +8442,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_provider_config.validate_environment,
             api_key=api_key or litellm_params.get("api_key", None),
             headers=extra_headers or {},
             model="",
@@ -8622,7 +8629,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_provider_config.validate_environment,
             api_key=api_key or litellm_params.get("api_key", None),
             headers=extra_headers or {},
             model="",
@@ -8754,7 +8762,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_list_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_list_provider_config.validate_environment,
             api_key=api_key,
             headers=extra_headers or {},
             model="",
@@ -8835,7 +8844,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_delete_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_delete_provider_config.validate_environment,
             api_key=api_key,
             headers=extra_headers or {},
             model="",
@@ -9019,7 +9029,8 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = video_status_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            video_status_provider_config.validate_environment,
             api_key=api_key,
             headers=extra_headers or {},
             model="",
@@ -9122,6 +9133,7 @@ class BaseLLMHTTPHandler:
         headers: Final = container_provider_config.validate_environment(
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         # Add Content-Type header for JSON requests
@@ -9197,9 +9209,11 @@ class BaseLLMHTTPHandler:
             async_httpx_client = client
 
         # Validate environment and get headers
-        headers: Final = container_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            container_provider_config.validate_environment,
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         # Add Content-Type header for JSON requests
@@ -9293,6 +9307,7 @@ class BaseLLMHTTPHandler:
         headers: Final = container_provider_config.validate_environment(
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -9369,9 +9384,11 @@ class BaseLLMHTTPHandler:
             async_httpx_client = client
 
         # Validate environment and get headers
-        headers: Final = container_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            container_provider_config.validate_environment,
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -9460,6 +9477,7 @@ class BaseLLMHTTPHandler:
         headers: Final = container_provider_config.validate_environment(
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -9536,9 +9554,11 @@ class BaseLLMHTTPHandler:
             async_httpx_client = client
 
         # Validate environment and get headers
-        headers: Final = container_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            container_provider_config.validate_environment,
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -9629,6 +9649,7 @@ class BaseLLMHTTPHandler:
         headers: Final = container_provider_config.validate_environment(
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -9705,9 +9726,11 @@ class BaseLLMHTTPHandler:
             async_httpx_client = client
 
         # Validate environment and get headers
-        headers: Final = container_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            container_provider_config.validate_environment,
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -9803,6 +9826,7 @@ class BaseLLMHTTPHandler:
         headers: Final = container_provider_config.validate_environment(
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -9881,9 +9905,11 @@ class BaseLLMHTTPHandler:
             async_httpx_client = client
 
         # Validate environment and get headers
-        headers: Final = container_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            container_provider_config.validate_environment,
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -9972,6 +9998,7 @@ class BaseLLMHTTPHandler:
         headers: Final = container_provider_config.validate_environment(
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -10047,9 +10074,11 @@ class BaseLLMHTTPHandler:
             async_httpx_client = client
 
         # Validate environment and get headers
-        headers: Final = container_provider_config.validate_environment(
+        headers: Final = await asyncio.to_thread(
+            container_provider_config.validate_environment,
             headers=extra_headers or {},
             api_key=litellm_params.get("api_key", None),
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -10167,8 +10196,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers = vector_store_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers = await asyncio.to_thread(
+            vector_store_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -10410,8 +10441,10 @@ class BaseLLMHTTPHandler:
 
         vector_store_provider_config.validate_create_vector_store()
 
-        headers: Final = vector_store_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -10541,8 +10574,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -10663,8 +10698,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -10805,8 +10842,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -10950,8 +10989,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -11068,8 +11109,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_files_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_files_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
 
         if extra_headers:
@@ -11210,8 +11253,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_files_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_files_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
         if extra_headers:
             headers.update(extra_headers)
@@ -11351,8 +11396,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_files_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_files_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
         if extra_headers:
             headers.update(extra_headers)
@@ -11482,8 +11529,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_files_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_files_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
         if extra_headers:
             headers.update(extra_headers)
@@ -11619,8 +11668,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_files_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_files_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
         if extra_headers:
             headers.update(extra_headers)
@@ -11762,8 +11813,10 @@ class BaseLLMHTTPHandler:
         else:
             async_httpx_client = client
 
-        headers: Final = vector_store_files_provider_config.validate_environment(
-            headers=extra_headers or {}, litellm_params=litellm_params
+        headers: Final = await asyncio.to_thread(
+            vector_store_files_provider_config.validate_environment,
+            headers=extra_headers or {},
+            litellm_params=litellm_params,
         )
         if extra_headers:
             headers.update(extra_headers)
diff --git a/litellm/llms/openai/chat/guardrail_translation/handler.py b/litellm/llms/openai/chat/guardrail_translation/handler.py
index c168c3f88fc..3070bedd30d 100644
--- a/litellm/llms/openai/chat/guardrail_translation/handler.py
+++ b/litellm/llms/openai/chat/guardrail_translation/handler.py
@@ -39,6 +39,7 @@ from litellm.llms.base_llm.guardrail_translation.utils import (
     effective_scan_only_tool_results_for_guardrail,
     effective_skip_system_message_for_guardrail,
     effective_skip_tool_message_for_guardrail,
+    list_field,
     merge_guardrailed_scoped_messages,
     merge_returned_tools_into_request_tools,
     openai_tool_name,
@@ -156,7 +157,7 @@ class OpenAIChatCompletionsHandler(BaseTranslation):
                 inputs["structured_messages"] = [structured_messages[index] for index in scoped_message_indices]
             # Pass tools (function definitions) to the guardrail
             tools: Final = data.get("tools")
-            if tools and not scan_only_tool_results:
+            if isinstance(tools, list) and tools and not scan_only_tool_results:
                 inputs["tools"] = tools
             # Include model information if available
             model: Final = data.get("model")
@@ -258,19 +259,19 @@ class OpenAIChatCompletionsHandler(BaseTranslation):
             return "no scannable content after message scoping"
         return None if images else "no scannable content"
 
-    def extract_request_tool_names(self, data: dict) -> list[str]:
+    def extract_request_tool_names(self, data: Mapping[str, object]) -> list[str]:
         """Extract tool names from OpenAI chat completions request (tools[].function.name, functions[].name,
         and the tools a replayed tool_search_output loads)."""
         names: Final[list[str]] = []
-        for tool in data.get("tools") or []:
+        for tool in list_field(data, "tools"):
             if isinstance(tool, dict) and tool.get("type") == "function":
                 fn = tool.get("function")
                 if isinstance(fn, dict) and fn.get("name"):
                     names.append(str(fn["name"]))
-        for fn in data.get("functions") or []:
+        for fn in list_field(data, "functions"):
             if isinstance(fn, dict) and fn.get("name"):
                 names.append(str(fn["name"]))
-        return [*names, *replayed_tool_search_tool_names(cast(object, data))]  # cast-ok: upcast, read field by field
+        return [*names, *replayed_tool_search_tool_names(data)]
 
     def _extract_inputs(
         self,
diff --git a/litellm/llms/openai/common_utils.py b/litellm/llms/openai/common_utils.py
index 4ab91392ad4..e472661efb9 100644
--- a/litellm/llms/openai/common_utils.py
+++ b/litellm/llms/openai/common_utils.py
@@ -407,6 +407,10 @@ class BaseOpenAILLM:
             http2=http2_enabled(),
         )
 
+    @classmethod
+    def get_sync_http_client(cls) -> httpx.Client | None:
+        return cls._get_sync_http_client()
+
 
 class OpenAICredentials(NamedTuple):
     api_base: str
diff --git a/litellm/llms/openai/completion/handler.py b/litellm/llms/openai/completion/handler.py
index 174aefd29e5..278427e8d77 100644
--- a/litellm/llms/openai/completion/handler.py
+++ b/litellm/llms/openai/completion/handler.py
@@ -1,9 +1,7 @@
 import json
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 from typing import Final
 
-from openai import AsyncOpenAI, OpenAI
-
 import litellm
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
 from litellm.litellm_core_utils.streaming_handler import CustomStreamWrapper
@@ -12,7 +10,8 @@ from litellm.types.llms.openai import AllMessageValues, OpenAITextCompletionUser
 from litellm.types.utils import LlmProviders, ModelResponse, TextCompletionResponse
 from litellm.utils import ProviderConfigManager
 
-from ..common_utils import BaseOpenAILLM, OpenAIAsyncHTTPClient, OpenAIError, OpenAIHTTPClient
+from ..common_utils import BaseOpenAILLM, OpenAIError
+from ..workload_identity import build_async_openai_client, build_openai_client
 from .transformation import OpenAITextCompletionConfig
 
 
@@ -43,7 +42,7 @@ class OpenAITextCompletion(BaseLLM):
         print_verbose: Callable | None = None,
         api_base: str | None = None,
         acompletion: bool = False,
-        litellm_params=None,
+        litellm_params: Mapping[str, object] | None = None,
         logger_fn=None,
         client=None,
         organization: str | None = None,
@@ -95,6 +94,7 @@ class OpenAITextCompletion(BaseLLM):
                         max_retries=max_retries,
                         client=client,
                         organization=organization,
+                        litellm_params=litellm_params,
                     )
                 else:
                     return self.acompletion(
@@ -109,6 +109,7 @@ class OpenAITextCompletion(BaseLLM):
                         max_retries=max_retries,
                         organization=organization,
                         client=client,
+                        litellm_params=litellm_params,
                     )
             elif optional_params.get("stream", False):
                 return self.streaming(
@@ -123,19 +124,22 @@ class OpenAITextCompletion(BaseLLM):
                     max_retries=max_retries,
                     client=client,
                     organization=organization,
+                    litellm_params=litellm_params,
                 )
             else:
-                if client is None:
-                    openai_client = OpenAI(
+                openai_client: Final = (
+                    client
+                    if client is not None
+                    else build_openai_client(
                         api_key=api_key,
-                        base_url=api_base,
-                        http_client=litellm.client_session or OpenAIHTTPClient(),
+                        api_base=api_base,
                         timeout=timeout,
                         max_retries=max_retries,
                         organization=organization,
+                        litellm_params=litellm_params,
+                        static_key_http_client_factory=lambda: litellm.client_session,
                     )
-                else:
-                    openai_client = client
+                )
 
                 raw_response: Final = openai_client.completions.with_raw_response.create(**data)
                 response: Final = raw_response.parse()
@@ -175,19 +179,22 @@ class OpenAITextCompletion(BaseLLM):
         max_retries: int,
         organization: str | None = None,
         client=None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         try:
-            if client is None:
-                openai_aclient = AsyncOpenAI(
+            openai_aclient: Final = (
+                client
+                if client is not None
+                else build_async_openai_client(
                     api_key=api_key,
-                    base_url=api_base,
-                    http_client=BaseOpenAILLM.get_async_http_client(),
+                    api_base=api_base,
                     timeout=timeout,
                     max_retries=max_retries,
                     organization=organization,
+                    litellm_params=litellm_params,
+                    static_key_http_client_factory=BaseOpenAILLM.get_async_http_client,
                 )
-            else:
-                openai_aclient = client
+            )
 
             raw_response: Final = await openai_aclient.completions.with_raw_response.create(**data)
             response: Final = raw_response.parse()
@@ -228,18 +235,21 @@ class OpenAITextCompletion(BaseLLM):
         max_retries=None,
         client=None,
         organization=None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
-        if client is None:
-            openai_client = OpenAI(
+        openai_client: Final = (
+            client
+            if client is not None
+            else build_openai_client(
                 api_key=api_key,
-                base_url=api_base,
-                http_client=litellm.client_session or OpenAIHTTPClient(),
+                api_base=api_base,
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
+                static_key_http_client_factory=lambda: litellm.client_session,
             )
-        else:
-            openai_client = client
+        )
 
         try:
             raw_response: Final = openai_client.completions.with_raw_response.create(**data)
@@ -285,18 +295,21 @@ class OpenAITextCompletion(BaseLLM):
         api_base: str | None = None,
         client=None,
         organization=None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
-        if client is None:
-            openai_client = AsyncOpenAI(
+        openai_client: Final = (
+            client
+            if client is not None
+            else build_async_openai_client(
                 api_key=api_key,
-                base_url=api_base,
-                http_client=litellm.aclient_session or OpenAIAsyncHTTPClient(),
+                api_base=api_base,
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
+                static_key_http_client_factory=lambda: litellm.aclient_session,
             )
-        else:
-            openai_client = client
+        )
 
         raw_response: Final = await openai_client.completions.with_raw_response.create(**data)
         response: Final = raw_response.parse()
diff --git a/litellm/llms/openai/containers/transformation.py b/litellm/llms/openai/containers/transformation.py
index bff5e0cea10..6cb2396b85d 100644
--- a/litellm/llms/openai/containers/transformation.py
+++ b/litellm/llms/openai/containers/transformation.py
@@ -23,6 +23,7 @@ from litellm.types.containers.main import (
 from litellm.types.router import GenericLiteLLMParams
 
 from ...base_llm.containers.transformation import BaseContainerConfig
+from ..workload_identity import resolve_openai_bearer_token
 from .utils import join_container_api_base_path
 
 if TYPE_CHECKING:
@@ -104,13 +105,15 @@ class OpenAIContainerConfig(BaseContainerConfig):
         self,
         headers: dict,
         api_key: str | None = None,
+        litellm_params: GenericLiteLLMParams | None = None,
     ) -> dict:
-        api_key = api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
-        headers.update(
-            {
-                "Authorization": f"Bearer {api_key}",
-            },
+        params: Final = litellm_params or GenericLiteLLMParams()
+        bearer_token: Final = resolve_openai_bearer_token(
+            api_key=api_key or params.api_key,
+            api_base=params.api_base,
+            litellm_params=params.model_dump(exclude_none=True),
         )
+        headers.update({"Authorization": f"Bearer {bearer_token}"})
         return headers
 
     def get_complete_url(
diff --git a/litellm/llms/openai/decisions/transformation.py b/litellm/llms/openai/decisions/transformation.py
index 7ce5b8676ee..56f348881de 100644
--- a/litellm/llms/openai/decisions/transformation.py
+++ b/litellm/llms/openai/decisions/transformation.py
@@ -6,6 +6,7 @@ from typing_extensions import assert_never
 
 import litellm
 from litellm.llms.base_llm.decisions.transformation import BaseDecisionsConfig, decisions_text
+from litellm.llms.openai.workload_identity import resolve_openai_bearer_token
 from litellm.secret_managers.main import get_secret_str
 from litellm.types.decisions import (
     DecisionsImage,
@@ -349,6 +350,11 @@ class OpenAIDecisionsConfig(BaseDecisionsConfig):
     def resolve_api_key(self, api_key: str | None) -> str | None:
         return api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
 
+    def resolve_credential(
+        self, api_key: str | None, api_base: str, litellm_params: Mapping[str, object]
+    ) -> str | None:
+        return resolve_openai_bearer_token(api_key=api_key, api_base=api_base, litellm_params=litellm_params)
+
     def supports_audio_input(self, model: str, custom_llm_provider: str) -> bool:
         return False
 
diff --git a/litellm/llms/openai/evals/transformation.py b/litellm/llms/openai/evals/transformation.py
index 7980c5529cb..24de7f6d479 100644
--- a/litellm/llms/openai/evals/transformation.py
+++ b/litellm/llms/openai/evals/transformation.py
@@ -13,6 +13,7 @@ from litellm.llms.base_llm.evals.transformation import (
     BaseEvalsAPIConfig,
     LiteLLMLoggingObj,
 )
+from litellm.llms.openai.workload_identity import resolve_openai_bearer_token
 from litellm.types.llms.openai_evals import (
     CancelEvalResponse,
     CancelRunResponse,
@@ -44,24 +45,14 @@ class OpenAIEvalsConfig(BaseEvalsAPIConfig):
         return LlmProviders.OPENAI
 
     def validate_environment(self, headers: dict, litellm_params: GenericLiteLLMParams | None) -> dict:
-        """Add OpenAI-specific headers"""
-        import litellm
-        from litellm.secret_managers.main import get_secret_str
-
-        # Get API key following OpenAI pattern
-        api_key = None
-        if litellm_params:
-            api_key = litellm_params.api_key
-
-        api_key = api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
-
-        if not api_key:
+        params: Final = litellm_params or GenericLiteLLMParams()
+        bearer_token: Final = resolve_openai_bearer_token(
+            api_key=params.api_key, api_base=params.api_base, litellm_params=params.model_dump(exclude_none=True)
+        )
+        if not bearer_token:
             raise ValueError("OPENAI_API_KEY is required for Evals API")
-
-        # Add required headers
-        headers["Authorization"] = f"Bearer {api_key}"
+        headers["Authorization"] = f"Bearer {bearer_token}"
         headers["Content-Type"] = "application/json"
-
         return headers
 
     def get_complete_url(
diff --git a/litellm/llms/openai/fine_tuning/handler.py b/litellm/llms/openai/fine_tuning/handler.py
index 851113bbd37..9ba28803f93 100644
--- a/litellm/llms/openai/fine_tuning/handler.py
+++ b/litellm/llms/openai/fine_tuning/handler.py
@@ -6,7 +6,7 @@ from openai import AsyncAzureOpenAI, AsyncOpenAI, AzureOpenAI, OpenAI
 from openai.types.fine_tuning import FineTuningJob
 
 from litellm._logging import verbose_logger
-from litellm.llms.openai.common_utils import OpenAIAsyncHTTPClient, OpenAIHTTPClient
+from litellm.llms.openai.workload_identity import build_async_openai_client, build_openai_client
 from litellm.types.utils import LiteLLMFineTuningJob
 
 _AZURE_STATUS_MAP: Final[Mapping[object, str]] = {
@@ -74,27 +74,27 @@ class OpenAIFineTuningAPI:
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
         _is_async: bool = False,
         api_version: str | None = None,
-        litellm_params: dict | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None:
-        received_args: Final = locals()
-        openai_client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None
-        if client is None:
-            data: Final = {}
-            for k, v in received_args.items():
-                if k == "self" or k == "client" or k == "_is_async":
-                    pass
-                elif k == "api_base" and v is not None:
-                    data["base_url"] = v
-                elif v is not None:
-                    data[k] = v
-            if _is_async is True:
-                openai_client = AsyncOpenAI(**data, http_client=OpenAIAsyncHTTPClient())
-            else:
-                openai_client = OpenAI(**data, http_client=OpenAIHTTPClient())
-        else:
-            openai_client = client
-
-        return openai_client
+        if client is not None:
+            return client
+        if _is_async:
+            return build_async_openai_client(
+                api_key=api_key,
+                api_base=api_base,
+                timeout=timeout,
+                max_retries=max_retries,
+                organization=organization,
+                litellm_params=litellm_params,
+            )
+        return build_openai_client(
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            max_retries=max_retries,
+            organization=organization,
+            litellm_params=litellm_params,
+        )
 
     async def acreate_fine_tuning_job(
         self,
@@ -116,6 +116,7 @@ class OpenAIFineTuningAPI:
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> LiteLLMFineTuningJob | Coroutine[object, object, LiteLLMFineTuningJob]:
         openai_client: Final[OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -126,6 +127,7 @@ class OpenAIFineTuningAPI:
             client=client,
             _is_async=_is_async,
             api_version=api_version,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -164,6 +166,7 @@ class OpenAIFineTuningAPI:
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> LiteLLMFineTuningJob | Coroutine[object, object, LiteLLMFineTuningJob]:
         openai_client: Final[OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -174,6 +177,7 @@ class OpenAIFineTuningAPI:
             client=client,
             _is_async=_is_async,
             api_version=api_version,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -212,6 +216,7 @@ class OpenAIFineTuningAPI:
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
         after: str | None = None,
         limit: int | None = None,
     ):
@@ -224,6 +229,7 @@ class OpenAIFineTuningAPI:
             client=client,
             _is_async=_is_async,
             api_version=api_version,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -263,6 +269,7 @@ class OpenAIFineTuningAPI:
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> LiteLLMFineTuningJob | Coroutine[object, object, LiteLLMFineTuningJob]:
         openai_client: Final[OpenAI | AsyncOpenAI | AzureOpenAI | AsyncAzureOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -273,6 +280,7 @@ class OpenAIFineTuningAPI:
             client=client,
             _is_async=_is_async,
             api_version=api_version,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
diff --git a/litellm/llms/openai/image_edit/transformation.py b/litellm/llms/openai/image_edit/transformation.py
index d54522597a0..a9e5b1b9f34 100644
--- a/litellm/llms/openai/image_edit/transformation.py
+++ b/litellm/llms/openai/image_edit/transformation.py
@@ -17,6 +17,7 @@ from litellm.types.router import GenericLiteLLMParams
 from litellm.utils import ImageResponse
 
 from ..common_utils import OpenAIError
+from ..workload_identity import resolve_openai_bearer_token
 
 if TYPE_CHECKING:
     from litellm.litellm_core_utils.litellm_logging import Logging as _LiteLLMLoggingObj
@@ -160,12 +161,10 @@ class OpenAIImageEditConfig(BaseImageEditConfig):
         litellm_params: dict | None = None,
         api_base: str | None = None,
     ) -> dict:
-        api_key = api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
-        headers.update(
-            {
-                "Authorization": f"Bearer {api_key}",
-            }
+        bearer_token: Final = resolve_openai_bearer_token(
+            api_key=api_key, api_base=api_base, litellm_params=litellm_params
         )
+        headers.update({"Authorization": f"Bearer {bearer_token}"})
         return headers
 
     def get_complete_url(
diff --git a/litellm/llms/openai/image_variations/handler.py b/litellm/llms/openai/image_variations/handler.py
index 664d16c48bf..89dcdc40e02 100644
--- a/litellm/llms/openai/image_variations/handler.py
+++ b/litellm/llms/openai/image_variations/handler.py
@@ -2,7 +2,7 @@
 OpenAI Image Variations Handler
 """
 
-from collections.abc import Callable
+from collections.abc import Callable, Mapping
 from typing import Final
 
 import httpx
@@ -14,27 +14,58 @@ from litellm.utils import ProviderConfigManager
 
 from ...base_llm.image_variations.transformation import BaseImageVariationConfig
 from ...custom_httpx.llm_http_handler import LiteLLMLoggingObj
-from ..common_utils import OpenAIAsyncHTTPClient, OpenAIError, OpenAIHTTPClient
+from ..common_utils import OpenAIError
+from ..workload_identity import build_async_openai_client, build_openai_client
 
 
 class OpenAIImageVariationsHandler:
     def get_sync_client(
         self,
         client: OpenAI | None,
-        init_client_params: dict,
-    ):
+        api_key: str | None,
+        api_base: str,
+        timeout: float | httpx.Timeout | None,
+        max_retries: int,
+        organization: str | None,
+        litellm_params: Mapping[str, object],
+    ) -> OpenAI:
         if client is not None:
             return client
-        return OpenAI(**init_client_params, http_client=litellm.client_session or OpenAIHTTPClient())
+        return build_openai_client(
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            max_retries=max_retries,
+            organization=organization,
+            litellm_params=litellm_params,
+            static_key_http_client_factory=lambda: litellm.client_session,
+        )
 
-    def get_async_client(self, client: AsyncOpenAI | None, init_client_params: dict) -> AsyncOpenAI:
+    def get_async_client(
+        self,
+        client: AsyncOpenAI | None,
+        api_key: str | None,
+        api_base: str,
+        timeout: float | httpx.Timeout | None,
+        max_retries: int,
+        organization: str | None,
+        litellm_params: Mapping[str, object],
+    ) -> AsyncOpenAI:
         if client is not None:
             return client
-        return AsyncOpenAI(**init_client_params, http_client=litellm.aclient_session or OpenAIAsyncHTTPClient())
+        return build_async_openai_client(
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            max_retries=max_retries,
+            organization=organization,
+            litellm_params=litellm_params,
+            static_key_http_client_factory=lambda: litellm.aclient_session,
+        )
 
     async def async_image_variations(
         self,
-        api_key: str,
+        api_key: str | None,
         api_base: str,
         organization: str | None,
         client: AsyncOpenAI | None,
@@ -51,15 +82,15 @@ class OpenAIImageVariationsHandler:
         provider_config: BaseImageVariationConfig,
     ) -> ImageResponse:
         try:
-            init_client_params: Final = {
-                "api_key": api_key,
-                "base_url": api_base,
-                "timeout": timeout,
-                "max_retries": max_retries,
-                "organization": organization,
-            }
-
-            client = self.get_async_client(client=client, init_client_params=init_client_params)
+            client = self.get_async_client(
+                client=client,
+                api_key=api_key,
+                api_base=api_base,
+                timeout=timeout,
+                max_retries=max_retries,
+                organization=organization,
+                litellm_params=litellm_params,
+            )
 
             raw_response: Final = await client.images.with_raw_response.create_variation(**data)
             response: Final = raw_response.parse()
@@ -103,7 +134,7 @@ class OpenAIImageVariationsHandler:
     def image_variations(
         self,
         model_response: ImageResponse,
-        api_key: str,
+        api_key: str | None,
         api_base: str,
         model: str | None,
         image: FileTypes,
@@ -167,15 +198,15 @@ class OpenAIImageVariationsHandler:
                     litellm_params=litellm_params,
                 )
 
-            init_client_params: Final = {
-                "api_key": api_key,
-                "base_url": api_base,
-                "timeout": timeout,
-                "max_retries": max_retries,
-                "organization": organization,
-            }
-
-            client = self.get_sync_client(client=client, init_client_params=init_client_params)
+            client = self.get_sync_client(
+                client=client,
+                api_key=api_key,
+                api_base=api_base,
+                timeout=timeout,
+                max_retries=max_retries,
+                organization=organization,
+                litellm_params=litellm_params,
+            )
 
             raw_response: Final = client.images.with_raw_response.create_variation(**json_data)
             response: Final = raw_response.parse()
diff --git a/litellm/llms/openai/openai.py b/litellm/llms/openai/openai.py
index 835707202d7..9709c5b31d2 100644
--- a/litellm/llms/openai/openai.py
+++ b/litellm/llms/openai/openai.py
@@ -56,16 +56,19 @@ from .chat.gpt_transformation import OpenAIGPTConfig, OpenAIUnknownModelConfig
 from .chat.o_series_transformation import OpenAIOSeriesConfig
 from .common_utils import (
     BaseOpenAILLM,
-    OpenAIAsyncHTTPClient,
     OpenAIError,
-    OpenAIHTTPClient,
     build_output_token_limit_response,
     drop_params_from_unprocessable_entity_error,
     is_openai_backed_api_base,
     is_output_token_limit_error,
     model_dump_provider_response,
 )
-from .workload_identity import resolve_openai_workload_identity_config
+from .workload_identity import (
+    build_async_openai_client,
+    build_openai_client,
+    openai_static_api_key,
+    resolve_openai_workload_identity_config,
+)
 
 openaiOSeriesConfig: Final = OpenAIOSeriesConfig()
 openAIGPT5Config: Final = OpenAIGPT5Config()
@@ -429,7 +432,7 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
                     )
                     if workload_identity_config is not None
                     else AsyncOpenAI(
-                        api_key=api_key,
+                        api_key=openai_static_api_key(api_key),
                         base_url=api_base,
                         http_client=async_http_client,
                         timeout=timeout,
@@ -451,7 +454,7 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
                     )
                     if workload_identity_config is not None
                     else OpenAI(
-                        api_key=api_key,
+                        api_key=openai_static_api_key(api_key),
                         base_url=api_base,
                         http_client=sync_http_client,
                         timeout=timeout,
@@ -1459,10 +1462,12 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
         max_retries=None,
         organization: str | None = None,
         headers: dict | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         try:
             openai_aclient: Final = self._get_openai_client(
                 is_async=True,
+                litellm_params=litellm_params,
                 api_key=api_key,
                 api_base=api_base,
                 timeout=timeout,
@@ -1524,6 +1529,7 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
         aimg_generation=None,
         organization: str | None = None,
         headers: dict | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> ImageResponse:
         data = {}
         try:
@@ -1545,10 +1551,12 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
                     max_retries=max_retries,
                     organization=organization,
                     headers=headers,
+                    litellm_params=litellm_params,
                 )
 
             openai_client: Final[OpenAI] = self._get_openai_client(
                 is_async=False,
+                litellm_params=litellm_params,
                 api_key=api_key,
                 api_base=api_base,
                 timeout=timeout,
@@ -1627,6 +1635,7 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
         client=None,
         shared_session: Optional["ClientSession"] = None,
         stream: bool = False,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> HttpxBinaryResponseContent:
         if aspeech is not None and aspeech is True:
             return self.async_audio_speech(
@@ -1644,6 +1653,7 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
                 client=client,
                 shared_session=shared_session,
                 stream=stream,
+                litellm_params=litellm_params,
             )
 
         openai_client: Final = self._get_openai_client(
@@ -1654,6 +1664,7 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
             max_retries=max_retries,
             client=client,
             shared_session=shared_session,
+            litellm_params=litellm_params,
         )
 
         sync_client: Final = cast(OpenAI, openai_client)
@@ -1692,6 +1703,7 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
         client=None,
         shared_session: Optional["ClientSession"] = None,
         stream: bool = False,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> HttpxBinaryResponseContent:
         openai_client: Final = cast(
             AsyncOpenAI,
@@ -1703,6 +1715,7 @@ class OpenAIChatCompletion(BaseLLM, BaseOpenAILLM):
                 max_retries=max_retries,
                 client=client,
                 shared_session=shared_session,
+                litellm_params=litellm_params,
             ),
         )
 
@@ -1749,26 +1762,27 @@ class OpenAIFilesAPI(BaseLLM):
         organization: str | None,
         client: OpenAI | AsyncOpenAI | None = None,
         _is_async: bool = False,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> OpenAI | AsyncOpenAI | None:
-        received_args: Final[Mapping[str, object]] = types.MappingProxyType(locals())
-        openai_client: OpenAI | AsyncOpenAI | None = None
-        if client is None:
-            data: Final = {}
-            for k, v in received_args.items():
-                if k == "self" or k == "client" or k == "_is_async":
-                    pass
-                elif k == "api_base" and v is not None:
-                    data["base_url"] = v
-                elif v is not None:
-                    data[k] = v
-            if _is_async is True:
-                openai_client = AsyncOpenAI(**data, http_client=OpenAIAsyncHTTPClient())
-            else:
-                openai_client = OpenAI(**data, http_client=OpenAIHTTPClient())
-        else:
-            openai_client = client
-
-        return openai_client
+        if client is not None:
+            return client
+        if _is_async:
+            return build_async_openai_client(
+                api_key=api_key,
+                api_base=api_base,
+                timeout=timeout,
+                max_retries=max_retries,
+                organization=organization,
+                litellm_params=litellm_params,
+            )
+        return build_openai_client(
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            max_retries=max_retries,
+            organization=organization,
+            litellm_params=litellm_params,
+        )
 
     async def acreate_file(
         self,
@@ -1788,6 +1802,7 @@ class OpenAIFilesAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> OpenAIFileObject | Coroutine[None, None, OpenAIFileObject]:
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -1797,6 +1812,7 @@ class OpenAIFilesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -1830,6 +1846,7 @@ class OpenAIFilesAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> HttpxBinaryResponseContent | Coroutine[None, None, HttpxBinaryResponseContent]:
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -1839,6 +1856,7 @@ class OpenAIFilesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -1895,6 +1913,7 @@ class OpenAIFilesAPI(BaseLLM):
         organization: str | None,
         chunk_size: int = 1024 * 1024,
         client: OpenAI | AsyncOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> FileContentStreamingResult:
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -1904,6 +1923,7 @@ class OpenAIFilesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -1958,6 +1978,7 @@ class OpenAIFilesAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -1967,6 +1988,7 @@ class OpenAIFilesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -2004,6 +2026,7 @@ class OpenAIFilesAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -2013,6 +2036,7 @@ class OpenAIFilesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -2053,6 +2077,7 @@ class OpenAIFilesAPI(BaseLLM):
         organization: str | None,
         purpose: str | None = None,
         client: OpenAI | AsyncOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -2062,6 +2087,7 @@ class OpenAIFilesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -2107,26 +2133,27 @@ class OpenAIBatchesAPI(BaseLLM):
         organization: str | None,
         client: OpenAI | AsyncOpenAI | None = None,
         _is_async: bool = False,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> OpenAI | AsyncOpenAI | None:
-        received_args: Final[Mapping[str, object]] = types.MappingProxyType(locals())
-        openai_client: OpenAI | AsyncOpenAI | None = None
-        if client is None:
-            data: Final = {}
-            for k, v in received_args.items():
-                if k == "self" or k == "client" or k == "_is_async":
-                    pass
-                elif k == "api_base" and v is not None:
-                    data["base_url"] = v
-                elif v is not None:
-                    data[k] = v
-            if _is_async is True:
-                openai_client = AsyncOpenAI(**data, http_client=OpenAIAsyncHTTPClient())
-            else:
-                openai_client = OpenAI(**data, http_client=OpenAIHTTPClient())
-        else:
-            openai_client = client
-
-        return openai_client
+        if client is not None:
+            return client
+        if _is_async:
+            return build_async_openai_client(
+                api_key=api_key,
+                api_base=api_base,
+                timeout=timeout,
+                max_retries=max_retries,
+                organization=organization,
+                litellm_params=litellm_params,
+            )
+        return build_openai_client(
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            max_retries=max_retries,
+            organization=organization,
+            litellm_params=litellm_params,
+        )
 
     async def acreate_batch(
         self,
@@ -2146,6 +2173,7 @@ class OpenAIBatchesAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | AsyncOpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> LiteLLMBatch | Coroutine[None, None, LiteLLMBatch]:
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -2155,6 +2183,7 @@ class OpenAIBatchesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -2190,6 +2219,7 @@ class OpenAIBatchesAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -2199,6 +2229,7 @@ class OpenAIBatchesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -2233,6 +2264,7 @@ class OpenAIBatchesAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -2242,6 +2274,7 @@ class OpenAIBatchesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -2282,6 +2315,7 @@ class OpenAIBatchesAPI(BaseLLM):
         after: str | None = None,
         limit: int | None = None,
         client: OpenAI | None = None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         openai_client: Final[OpenAI | AsyncOpenAI | None] = self.get_openai_client(
             api_key=api_key,
@@ -2291,6 +2325,7 @@ class OpenAIBatchesAPI(BaseLLM):
             organization=organization,
             client=client,
             _is_async=_is_async,
+            litellm_params=litellm_params,
         )
         if openai_client is None:
             raise ValueError(
@@ -2319,22 +2354,19 @@ class OpenAIAssistantsAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: OpenAI | None = None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> OpenAI:
-        received_args: Final[Mapping[str, object]] = types.MappingProxyType(locals())
-        if client is None:
-            data: Final = {}
-            for k, v in received_args.items():
-                if k == "self" or k == "client":
-                    pass
-                elif k == "api_base" and v is not None:
-                    data["base_url"] = v
-                elif v is not None:
-                    data[k] = v
-            openai_client = OpenAI(**data, http_client=OpenAIHTTPClient())
-        else:
-            openai_client = client
-
-        return openai_client
+        if client is not None:
+            return client
+        return build_openai_client(
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            max_retries=max_retries,
+            organization=organization,
+            litellm_params=litellm_params,
+        )
 
     def async_get_openai_client(
         self,
@@ -2344,22 +2376,19 @@ class OpenAIAssistantsAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: AsyncOpenAI | None = None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> AsyncOpenAI:
-        received_args: Final[Mapping[str, object]] = types.MappingProxyType(locals())
-        if client is None:
-            data: Final = {}
-            for k, v in received_args.items():
-                if k == "self" or k == "client":
-                    pass
-                elif k == "api_base" and v is not None:
-                    data["base_url"] = v
-                elif v is not None:
-                    data[k] = v
-            openai_client = AsyncOpenAI(**data, http_client=OpenAIAsyncHTTPClient())
-        else:
-            openai_client = client
-
-        return openai_client
+        if client is not None:
+            return client
+        return build_async_openai_client(
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            max_retries=max_retries,
+            organization=organization,
+            litellm_params=litellm_params,
+        )
 
     ### ASSISTANTS ###
 
@@ -2375,6 +2404,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         limit: int | None = 20,
         before: str | None = None,
         after: str | None = None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> AsyncCursorPage[Assistant]:
         openai_client: Final = self.async_get_openai_client(
             api_key=api_key,
@@ -2382,6 +2413,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
         request_params: Final = {
@@ -2409,6 +2441,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: AsyncOpenAI | None,
         aget_assistants: Literal[True], 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Coroutine[None, None, AsyncCursorPage[Assistant]]:
         ...
 
@@ -2422,6 +2456,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: OpenAI | None,
         aget_assistants: Literal[False] | None, 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> SyncCursorPage[Assistant]: 
         ...
 
@@ -2440,7 +2476,9 @@ class OpenAIAssistantsAPI(BaseLLM):
         limit: int | None = 20,
         before: str | None = None,
         after: str | None = None,
-    ):
+        *,
+        litellm_params: Mapping[str, object] | None = None,
+    ) -> Coroutine[None, None, AsyncCursorPage[Assistant]] | SyncCursorPage[Assistant]:
         if aget_assistants is not None and aget_assistants is True:
             return self.async_get_assistants(
                 api_key=api_key,
@@ -2448,6 +2486,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
                 client=client,
             )
         openai_client: Final = self.get_openai_client(
@@ -2456,6 +2495,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2483,6 +2523,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: AsyncOpenAI | None,
         create_assistant_data: dict,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Assistant:
         openai_client: Final = self.async_get_openai_client(
             api_key=api_key,
@@ -2490,6 +2532,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2507,6 +2550,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         create_assistant_data: dict,
         client=None,
         async_create_assistants=None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         if async_create_assistants is not None and async_create_assistants is True:
             return self.async_create_assistants(
@@ -2515,6 +2560,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
                 client=client,
                 create_assistant_data=create_assistant_data,
             )
@@ -2524,6 +2570,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2540,6 +2587,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: AsyncOpenAI | None,
         assistant_id: str,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> AssistantDeleted:
         openai_client: Final = self.async_get_openai_client(
             api_key=api_key,
@@ -2547,6 +2596,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2564,6 +2614,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         assistant_id: str,
         client=None,
         async_delete_assistants=None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         if async_delete_assistants is not None and async_delete_assistants is True:
             return self.async_delete_assistant(
@@ -2572,6 +2624,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
                 client=client,
                 assistant_id=assistant_id,
             )
@@ -2581,6 +2634,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2599,6 +2653,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: AsyncOpenAI | None = None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> OpenAIMessage:
         openai_client: Final = self.async_get_openai_client(
             api_key=api_key,
@@ -2606,6 +2662,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2636,6 +2693,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: AsyncOpenAI | None,
         a_add_message: Literal[True], 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Coroutine[None, None, OpenAIMessage]:
         ...
 
@@ -2651,6 +2710,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: OpenAI | None,
         a_add_message: Literal[False] | None, 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> OpenAIMessage: 
         ...
 
@@ -2667,6 +2728,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client=None,
         a_add_message: bool | None = None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         if a_add_message is not None and a_add_message is True:
             return self.a_add_message(
@@ -2677,6 +2740,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
                 client=client,
             )
         openai_client: Final = self.get_openai_client(
@@ -2685,6 +2749,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2710,6 +2775,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: AsyncOpenAI | None = None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> AsyncCursorPage[OpenAIMessage]:
         openai_client: Final = self.async_get_openai_client(
             api_key=api_key,
@@ -2717,6 +2784,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2737,6 +2805,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: AsyncOpenAI | None,
         aget_messages: Literal[True], 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Coroutine[None, None, AsyncCursorPage[OpenAIMessage]]:
         ...
 
@@ -2751,6 +2821,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: OpenAI | None,
         aget_messages: Literal[False] | None, 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> SyncCursorPage[OpenAIMessage]: 
         ...
 
@@ -2766,6 +2838,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client=None,
         aget_messages=None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         if aget_messages is not None and aget_messages is True:
             return self.async_get_messages(
@@ -2775,6 +2849,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
                 client=client,
             )
         openai_client: Final = self.get_openai_client(
@@ -2783,6 +2858,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2802,6 +2878,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: AsyncOpenAI | None,
         messages: Iterable[OpenAICreateThreadParamsMessage] | None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Thread:
         openai_client: Final = self.async_get_openai_client(
             api_key=api_key,
@@ -2809,6 +2887,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2841,6 +2920,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         messages: Iterable[OpenAICreateThreadParamsMessage] | None,
         client: AsyncOpenAI | None,
         acreate_thread: Literal[True], 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Coroutine[None, None, Thread]:
         ...
 
@@ -2856,6 +2937,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         messages: Iterable[OpenAICreateThreadParamsMessage] | None,
         client: OpenAI | None,
         acreate_thread: Literal[False] | None, 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Thread: 
         ...
 
@@ -2872,6 +2955,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         messages: Iterable[OpenAICreateThreadParamsMessage] | None,
         client=None,
         acreate_thread=None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         """
         Here's an example:
@@ -2891,6 +2976,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
                 client=client,
                 messages=messages,
             )
@@ -2900,6 +2986,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2927,6 +3014,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: AsyncOpenAI | None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Thread:
         openai_client: Final = self.async_get_openai_client(
             api_key=api_key,
@@ -2934,6 +3023,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -2959,6 +3049,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: AsyncOpenAI | None,
         aget_thread: Literal[True], 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Coroutine[None, None, Thread]:
         ...
 
@@ -2973,6 +3065,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client: OpenAI | None,
         aget_thread: Literal[False] | None, 
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Thread: 
         ...
 
@@ -2988,6 +3082,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         organization: str | None,
         client=None,
         aget_thread=None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         if aget_thread is not None and aget_thread is True:
             return self.async_get_thread(
@@ -2997,6 +3093,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
                 client=client,
             )
         openai_client: Final = self.get_openai_client(
@@ -3005,6 +3102,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -3038,6 +3136,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         max_retries: int | None,
         organization: str | None,
         client: AsyncOpenAI | None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Run:
         openai_client: Final = self.async_get_openai_client(
             api_key=api_key,
@@ -3045,6 +3145,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
@@ -3149,6 +3250,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         client,
         arun_thread: Literal[True], 
         event_handler: AssistantEventHandler | None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Coroutine[None, None, Run]:
         ...
 
@@ -3171,6 +3274,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         client,
         arun_thread: Literal[False] | None, 
         event_handler: AssistantEventHandler | None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ) -> Run: 
         ...
 
@@ -3194,6 +3299,8 @@ class OpenAIAssistantsAPI(BaseLLM):
         client=None,
         arun_thread=None,
         event_handler: AssistantEventHandler | None = None,
+        *,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         if arun_thread is not None and arun_thread is True:
             if stream is not None and stream is True:
@@ -3203,6 +3310,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                     timeout=timeout,
                     max_retries=max_retries,
                     organization=organization,
+                    litellm_params=litellm_params,
                     client=client,
                 )
                 return self.async_run_thread_stream(
@@ -3230,6 +3338,7 @@ class OpenAIAssistantsAPI(BaseLLM):
                 timeout=timeout,
                 max_retries=max_retries,
                 organization=organization,
+                litellm_params=litellm_params,
                 client=client,
             )
         openai_client: Final = self.get_openai_client(
@@ -3238,6 +3347,7 @@ class OpenAIAssistantsAPI(BaseLLM):
             timeout=timeout,
             max_retries=max_retries,
             organization=organization,
+            litellm_params=litellm_params,
             client=client,
         )
 
diff --git a/litellm/llms/openai/responses/count_tokens/token_counter.py b/litellm/llms/openai/responses/count_tokens/token_counter.py
index 274d693baa7..c7c997bc961 100644
--- a/litellm/llms/openai/responses/count_tokens/token_counter.py
+++ b/litellm/llms/openai/responses/count_tokens/token_counter.py
@@ -27,6 +27,7 @@ from litellm.llms.openai.responses.count_tokens.transformation import (
 from litellm.llms.openai.workload_identity import (
     OpenAIWorkloadIdentityConfig,
     get_workload_identity_bearer_token,
+    openai_static_api_key,
     resolve_openai_workload_identity_config,
 )
 from litellm.types.utils import CountContextManagement, LlmProviders, TokenCountMessagesFormat, TokenCountResponse
@@ -35,13 +36,18 @@ from litellm.types.utils import CountContextManagement, LlmProviders, TokenCount
 openai_count_tokens_handler: Final = OpenAICountTokensHandler()
 
 
-def _workload_identity_config(litellm_params: Mapping[str, object]) -> OpenAIWorkloadIdentityConfig | None:
+def _workload_identity_config(
+    litellm_params: Mapping[str, object],
+) -> OpenAIWorkloadIdentityConfig | OpenAIError | None:
     api_base: Final = litellm_params.get("api_base")
-    return resolve_openai_workload_identity_config(
-        api_key=None,
-        api_base=api_base if isinstance(api_base, str) else None,
-        litellm_params=litellm_params,
-    )
+    try:
+        return resolve_openai_workload_identity_config(
+            api_key=None,
+            api_base=api_base if isinstance(api_base, str) else None,
+            litellm_params=litellm_params,
+        )
+    except OpenAIError as e:
+        return e
 
 
 class OpenAITokenCounter(BaseTokenCounter):
@@ -126,7 +132,18 @@ class OpenAITokenCounter(BaseTokenCounter):
         credentials: Final = get_openai_credentials(
             api_base=litellm_params.get("api_base"), api_key=litellm_params.get("api_key")
         )
-        credential: Final = credentials.api_key or _workload_identity_config(litellm_params)
+        credential: Final = openai_static_api_key(credentials.api_key) or _workload_identity_config(litellm_params)
+
+        if isinstance(credential, OpenAIError):
+            return TokenCountResponse(
+                total_tokens=0,
+                request_model=request_model,
+                model_used=model_to_use,
+                tokenizer_type="openai_api",
+                error=True,
+                error_message=credential.message,
+                status_code=credential.status_code,
+            )
 
         if credential is None:
             return TokenCountResponse(
diff --git a/litellm/llms/openai/responses/guardrail_translation/handler.py b/litellm/llms/openai/responses/guardrail_translation/handler.py
index 435c11c0602..84ff790ae48 100644
--- a/litellm/llms/openai/responses/guardrail_translation/handler.py
+++ b/litellm/llms/openai/responses/guardrail_translation/handler.py
@@ -55,6 +55,7 @@ from litellm.llms.base_llm.guardrail_translation.base_translation import (
 from litellm.llms.base_llm.guardrail_translation.utils import (
     blocked_responses_stream_usage,
     effective_skip_system_message_for_guardrail,
+    list_field,
     merge_guardrailed_scoped_messages,
     role_out_of_guardrail_scope,
     scoped_structured_message_indices,
@@ -764,11 +765,11 @@ class OpenAIResponsesHandler(BaseTranslation):
             data.get("input"), data.get("instructions"), structured_messages, merged
         )
 
-    def extract_request_tool_names(self, data: dict) -> list[str]:
+    def extract_request_tool_names(self, data: Mapping[str, object]) -> list[str]:
         """Extract tool names from Responses API request (tools[].name for function
         and custom, tools[].server_label for mcp)."""
         names: Final[list[str]] = []
-        for tool in data.get("tools") or []:
+        for tool in list_field(data, "tools"):
             if not isinstance(tool, dict):
                 continue
             if tool.get("type") in ("function", "custom") and tool.get("name"):
diff --git a/litellm/llms/openai/transcriptions/handler.py b/litellm/llms/openai/transcriptions/handler.py
index 733d7930144..48a44575989 100644
--- a/litellm/llms/openai/transcriptions/handler.py
+++ b/litellm/llms/openai/transcriptions/handler.py
@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Final, Optional, cast
 
 import httpx
@@ -97,6 +98,7 @@ class OpenAIAudioTranscription(OpenAIChatCompletion):
                 max_retries=max_retries,
                 logging_obj=logging_obj,
                 shared_session=shared_session,
+                litellm_params=litellm_params,
             )
 
         openai_client: Final[OpenAI] = self._get_openai_client(
@@ -106,6 +108,7 @@ class OpenAIAudioTranscription(OpenAIChatCompletion):
             timeout=timeout,
             max_retries=max_retries,
             client=client,
+            litellm_params=litellm_params,
         )
 
         ## LOGGING
@@ -159,6 +162,7 @@ class OpenAIAudioTranscription(OpenAIChatCompletion):
         client=None,
         max_retries=None,
         shared_session: Optional["ClientSession"] = None,
+        litellm_params: Mapping[str, object] | None = None,
     ):
         try:
             openai_aclient: Final[AsyncOpenAI] = self._get_openai_client(
@@ -169,6 +173,7 @@ class OpenAIAudioTranscription(OpenAIChatCompletion):
                 max_retries=max_retries,
                 client=client,
                 shared_session=shared_session,
+                litellm_params=litellm_params,
             )
 
             ## LOGGING
diff --git a/litellm/llms/openai/vector_store_files/transformation.py b/litellm/llms/openai/vector_store_files/transformation.py
index d5f15d639d6..7f65ade224e 100644
--- a/litellm/llms/openai/vector_store_files/transformation.py
+++ b/litellm/llms/openai/vector_store_files/transformation.py
@@ -8,6 +8,7 @@ from litellm.litellm_core_utils.url_utils import encode_url_path_segment
 from litellm.llms.base_llm.vector_store_files.transformation import (
     BaseVectorStoreFilesConfig,
 )
+from litellm.llms.openai.workload_identity import resolve_openai_bearer_token
 from litellm.secret_managers.main import get_secret_str
 from litellm.types.router import GenericLiteLLMParams
 from litellm.types.vector_store_files import (
@@ -70,11 +71,13 @@ class OpenAIVectorStoreFilesConfig(BaseVectorStoreFilesConfig):
         headers: dict[str, str],
         litellm_params: GenericLiteLLMParams | None,
     ) -> dict[str, str]:
-        litellm_params = litellm_params or GenericLiteLLMParams()
-        api_key = litellm_params.api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
+        params: Final = litellm_params or GenericLiteLLMParams()
+        bearer_token: Final = resolve_openai_bearer_token(
+            api_key=params.api_key, api_base=params.api_base, litellm_params=params.model_dump(exclude_none=True)
+        )
         headers.update(
             {
-                "Authorization": f"Bearer {api_key}",
+                "Authorization": f"Bearer {bearer_token}",
                 "Content-Type": "application/json",
             }
         )
diff --git a/litellm/llms/openai/vector_stores/transformation.py b/litellm/llms/openai/vector_stores/transformation.py
index 57fe5b04838..46105a66be3 100644
--- a/litellm/llms/openai/vector_stores/transformation.py
+++ b/litellm/llms/openai/vector_stores/transformation.py
@@ -5,6 +5,7 @@ import httpx
 import litellm
 from litellm.litellm_core_utils.url_utils import encode_url_path_segment
 from litellm.llms.base_llm.vector_store.transformation import BaseVectorStoreConfig
+from litellm.llms.openai.workload_identity import resolve_openai_bearer_token
 from litellm.secret_managers.main import get_secret_str
 from litellm.types.router import GenericLiteLLMParams
 from litellm.types.vector_stores import (
@@ -48,11 +49,13 @@ class OpenAIVectorStoreConfig(BaseVectorStoreConfig):
         }
 
     def validate_environment(self, headers: dict, litellm_params: GenericLiteLLMParams | None) -> dict:
-        litellm_params = litellm_params or GenericLiteLLMParams()
-        api_key = litellm_params.api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
+        params: Final = litellm_params or GenericLiteLLMParams()
+        bearer_token: Final = resolve_openai_bearer_token(
+            api_key=params.api_key, api_base=params.api_base, litellm_params=params.model_dump(exclude_none=True)
+        )
         headers.update(
             {
-                "Authorization": f"Bearer {api_key}",
+                "Authorization": f"Bearer {bearer_token}",
                 "Content-Type": "application/json",
             }
         )
diff --git a/litellm/llms/openai/videos/transformation.py b/litellm/llms/openai/videos/transformation.py
index 6e28695a96f..d422e51f649 100644
--- a/litellm/llms/openai/videos/transformation.py
+++ b/litellm/llms/openai/videos/transformation.py
@@ -8,11 +8,10 @@ from urllib.parse import quote
 import httpx
 from httpx._types import FileContent, FileTypes, RequestFiles
 
-import litellm
 from litellm.litellm_core_utils.url_utils import encode_url_path_segment
 from litellm.llms.base_llm.videos.transformation import BaseVideoConfig
 from litellm.llms.openai.image_edit.transformation import ImageEditRequestUtils
-from litellm.secret_managers.main import get_secret_str
+from litellm.llms.openai.workload_identity import resolve_openai_bearer_token
 from litellm.types.llms.openai import CreateVideoRequest
 from litellm.types.router import GenericLiteLLMParams
 from litellm.types.videos.main import (
@@ -78,16 +77,13 @@ class OpenAIVideoConfig(BaseVideoConfig):
         api_key: str | None = None,
         litellm_params: GenericLiteLLMParams | None = None,
     ) -> dict:
-        # Use api_key from litellm_params if available, otherwise fall back to other sources
-        if litellm_params and litellm_params.api_key:
-            api_key = api_key or litellm_params.api_key
-
-        api_key = api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
-        headers.update(
-            {
-                "Authorization": f"Bearer {api_key}",
-            }
+        params: Final = litellm_params or GenericLiteLLMParams()
+        bearer_token: Final = resolve_openai_bearer_token(
+            api_key=api_key or params.api_key,
+            api_base=params.api_base,
+            litellm_params=params.model_dump(exclude_none=True),
         )
+        headers.update({"Authorization": f"Bearer {bearer_token}"})
         return headers
 
     def get_complete_url(
diff --git a/litellm/llms/openai/workload_identity.py b/litellm/llms/openai/workload_identity.py
index e2971a2c100..5952ae3b3ef 100644
--- a/litellm/llms/openai/workload_identity.py
+++ b/litellm/llms/openai/workload_identity.py
@@ -6,10 +6,22 @@ from functools import lru_cache
 from typing import TYPE_CHECKING, Final
 from urllib.parse import urlparse
 
-import litellm
-from litellm.secret_managers.main import get_secret_str, normalize_nonempty_secret_str
+import httpx
+from openai import DEFAULT_MAX_RETRIES as OPENAI_SDK_DEFAULT_MAX_RETRIES
+from openai import NOT_GIVEN, AsyncOpenAI, NotGiven, OpenAI
 
-from .common_utils import OpenAIError, is_openai_backed_api_base
+import litellm
+from litellm.constants import DEFAULT_MAX_LRU_CACHE_SIZE
+from litellm.secret_managers.main import get_secret_str, normalize_nonempty_secret_str
+from litellm.types.workload_identity import OPENAI_WIF_KWARGS_KEYS
+
+from .common_utils import (
+    BaseOpenAILLM,
+    OpenAIAsyncHTTPClient,
+    OpenAIError,
+    OpenAIHTTPClient,
+    is_openai_backed_api_base,
+)
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -17,6 +29,11 @@ if TYPE_CHECKING:
     from openai.auth import SubjectTokenProvider, WorkloadIdentity, WorkloadIdentityAuth
 
 OPENAI_WIF_CLIENT_ID: Final = "litellm"
+_IDENTITY_PARAM_ENV_NAMES: Final = (
+    ("openai_identity_provider_id", "OPENAI_IDENTITY_PROVIDER_ID"),
+    ("openai_service_account_id", "OPENAI_SERVICE_ACCOUNT_ID"),
+    ("openai_identity_token_file", "OPENAI_IDENTITY_TOKEN_FILE"),
+)
 _SDK_UPGRADE_MESSAGE: Final = (
     "OpenAI workload identity federation requires openai>=2.32.0. "
     "Upgrade the installed openai package to use OPENAI_IDENTITY_PROVIDER_ID / "
@@ -51,17 +68,25 @@ def resolve_openai_workload_identity_config(
     )
     if static_api_key is not None:
         return None
-    effective_api_base: Final = (
-        api_base or litellm.api_base or get_secret_str("OPENAI_BASE_URL") or get_secret_str("OPENAI_API_BASE")
-    )
-    if not _targets_openai_api(effective_api_base):
+    return _configured_openai_workload_identity(api_base=api_base, litellm_params=litellm_params)
+
+
+def _effective_openai_api_base(api_base: str | None) -> str | None:
+    return api_base or litellm.api_base or get_secret_str("OPENAI_BASE_URL") or get_secret_str("OPENAI_API_BASE")
+
+
+def _configured_openai_workload_identity(
+    api_base: str | None,
+    litellm_params: Mapping[str, object] | None,
+) -> OpenAIWorkloadIdentityConfig | None:
+    if not _targets_openai_api(_effective_openai_api_base(api_base)):
         return None
-    identity_provider_id: Final = _config_value(
-        litellm_params, "openai_identity_provider_id", "OPENAI_IDENTITY_PROVIDER_ID"
+    identity_provider_id, service_account_id, token_file = (
+        _config_value(litellm_params, param_key, env_name) for param_key, env_name in _IDENTITY_PARAM_ENV_NAMES
     )
-    service_account_id: Final = _config_value(litellm_params, "openai_service_account_id", "OPENAI_SERVICE_ACCOUNT_ID")
-    token_file: Final = _config_value(litellm_params, "openai_identity_token_file", "OPENAI_IDENTITY_TOKEN_FILE")
     if identity_provider_id is None or service_account_id is None or token_file is None:
+        if _carries_deployment_identity(litellm_params):
+            raise OpenAIError(status_code=401, message=_incomplete_identity_message(litellm_params))
         return None
     return OpenAIWorkloadIdentityConfig(
         identity_provider_id=identity_provider_id,
@@ -81,11 +106,200 @@ async def get_workload_identity_bearer_token_for_api_base(api_base: str) -> str
     return await _workload_identity_auth(config).get_token_async()
 
 
+def openai_static_api_key(api_key: str | None) -> str | None:
+    return api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
+
+
+def resolve_openai_bearer_token(
+    api_key: str | None,
+    api_base: str | None,
+    litellm_params: Mapping[str, object] | None,
+) -> str | None:
+    static_api_key: Final = openai_static_api_key(api_key)
+    workload_identity_config: Final = resolve_openai_workload_identity_config(
+        api_key=static_api_key, api_base=api_base, litellm_params=litellm_params
+    )
+    if workload_identity_config is None:
+        return static_api_key
+    return get_workload_identity_bearer_token(workload_identity_config)
+
+
+async def resolve_openai_bearer_token_async(
+    static_api_key: str | None,
+    api_base: str | None,
+    litellm_params: Mapping[str, object] | None,
+) -> str | None:
+    workload_identity_config: Final = resolve_openai_workload_identity_config(
+        api_key=static_api_key, api_base=api_base, litellm_params=litellm_params
+    )
+    if workload_identity_config is None:
+        return static_api_key
+    return await _workload_identity_auth(workload_identity_config).get_token_async()
+
+
+def _carries_deployment_identity(litellm_params: Mapping[str, object] | None) -> bool:
+    if litellm_params is None:
+        return False
+    return any(_param_str(litellm_params, key) is not None for key in OPENAI_WIF_KWARGS_KEYS)
+
+
+def _incomplete_identity_message(litellm_params: Mapping[str, object] | None) -> str:
+    missing: Final = ", ".join(
+        param_key
+        for param_key, env_name in _IDENTITY_PARAM_ENV_NAMES
+        if _config_value(litellm_params, param_key, env_name) is None
+    )
+    return (
+        f"OpenAI workload identity federation on this deployment is missing {missing}. "
+        "Set openai_identity_provider_id, openai_service_account_id, and openai_identity_token_file "
+        "on the deployment, or the OPENAI_IDENTITY_PROVIDER_ID / OPENAI_SERVICE_ACCOUNT_ID / "
+        "OPENAI_IDENTITY_TOKEN_FILE env vars they fall back to."
+    )
+
+
+def _param_str(litellm_params: Mapping[str, object], key: str) -> str | None:
+    value: Final = litellm_params.get(key)
+    return value if isinstance(value, str) and value else None
+
+
 def _config_value(litellm_params: Mapping[str, object] | None, param_key: str, env_name: str) -> str | None:
-    param_value: Final = litellm_params.get(param_key) if litellm_params is not None else None
-    if isinstance(param_value, str) and param_value:
-        return param_value
-    return normalize_nonempty_secret_str(get_secret_str(env_name))
+    param_value: Final = _param_str(litellm_params, param_key) if litellm_params is not None else None
+    return param_value or normalize_nonempty_secret_str(get_secret_str(env_name))
+
+
+def build_openai_client(
+    api_key: str | None,
+    api_base: str | None,
+    timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    max_retries: int | None = None,
+    organization: str | None = None,
+    litellm_params: Mapping[str, object] | None = None,
+    static_key_http_client_factory: Callable[[], httpx.Client | None] | None = None,
+) -> OpenAI:
+    workload_identity_config: Final = resolve_openai_workload_identity_config(
+        api_key=api_key, api_base=api_base, litellm_params=litellm_params
+    )
+    retries: Final = _max_retries_or_sdk_default(max_retries)
+    if workload_identity_config is None:
+        static_key_http_client: Final = (
+            None if static_key_http_client_factory is None else static_key_http_client_factory()
+        )
+        return OpenAI(
+            api_key=openai_static_api_key(api_key),
+            base_url=api_base,
+            timeout=timeout,
+            max_retries=retries,
+            organization=organization,
+            http_client=static_key_http_client or OpenAIHTTPClient(),
+        )
+    cache_params: Final = _client_cache_params(
+        is_async=False,
+        workload_identity_config=workload_identity_config,
+        api_base=api_base,
+        timeout=timeout,
+        max_retries=retries,
+        organization=organization,
+    )
+    cached: Final = BaseOpenAILLM.get_cached_openai_client(
+        client_initialization_params=cache_params, client_type="openai"
+    )
+    if isinstance(cached, OpenAI):
+        return cached
+    process_http_client: Final = BaseOpenAILLM.get_sync_http_client()
+    client: Final = OpenAI(
+        workload_identity=workload_identity_config.to_sdk_workload_identity(),
+        base_url=api_base,
+        timeout=timeout,
+        max_retries=retries,
+        organization=organization,
+        http_client=process_http_client,
+    )
+    BaseOpenAILLM.set_cached_openai_client(
+        openai_client=client,
+        client_type="openai",
+        client_initialization_params=cache_params,
+        litellm_owned_client=BaseOpenAILLM.owns_wrapped_http_client(process_http_client),
+    )
+    return client
+
+
+def build_async_openai_client(
+    api_key: str | None,
+    api_base: str | None,
+    timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN,
+    max_retries: int | None = None,
+    organization: str | None = None,
+    litellm_params: Mapping[str, object] | None = None,
+    static_key_http_client_factory: Callable[[], httpx.AsyncClient | None] | None = None,
+) -> AsyncOpenAI:
+    workload_identity_config: Final = resolve_openai_workload_identity_config(
+        api_key=api_key, api_base=api_base, litellm_params=litellm_params
+    )
+    retries: Final = _max_retries_or_sdk_default(max_retries)
+    if workload_identity_config is None:
+        static_key_http_client: Final = (
+            None if static_key_http_client_factory is None else static_key_http_client_factory()
+        )
+        return AsyncOpenAI(
+            api_key=openai_static_api_key(api_key),
+            base_url=api_base,
+            timeout=timeout,
+            max_retries=retries,
+            organization=organization,
+            http_client=static_key_http_client or OpenAIAsyncHTTPClient(),
+        )
+    cache_params: Final = _client_cache_params(
+        is_async=True,
+        workload_identity_config=workload_identity_config,
+        api_base=api_base,
+        timeout=timeout,
+        max_retries=retries,
+        organization=organization,
+    )
+    cached: Final = BaseOpenAILLM.get_cached_openai_client(
+        client_initialization_params=cache_params, client_type="openai"
+    )
+    if isinstance(cached, AsyncOpenAI):
+        return cached
+    process_http_client: Final = BaseOpenAILLM.get_async_http_client()
+    client: Final = AsyncOpenAI(
+        workload_identity=workload_identity_config.to_sdk_workload_identity(),
+        base_url=api_base,
+        timeout=timeout,
+        max_retries=retries,
+        organization=organization,
+        http_client=process_http_client,
+    )
+    BaseOpenAILLM.set_cached_openai_client(
+        openai_client=client,
+        client_type="openai",
+        client_initialization_params=cache_params,
+        litellm_owned_client=BaseOpenAILLM.owns_wrapped_http_client(process_http_client),
+    )
+    return client
+
+
+def _client_cache_params(
+    is_async: bool,
+    workload_identity_config: OpenAIWorkloadIdentityConfig,
+    api_base: str | None,
+    timeout: float | httpx.Timeout | None | NotGiven,
+    max_retries: int,
+    organization: str | None,
+) -> dict[str, object]:
+    return {
+        "api_key": None,
+        "is_async": is_async,
+        "workload_identity_config": workload_identity_config,
+        "api_base": api_base,
+        "timeout": timeout,
+        "max_retries": max_retries,
+        "organization": organization,
+    }
+
+
+def _max_retries_or_sdk_default(max_retries: int | None) -> int:
+    return OPENAI_SDK_DEFAULT_MAX_RETRIES if max_retries is None else max_retries
 
 
 def _targets_openai_api(api_base: str | None) -> bool:
@@ -95,7 +309,7 @@ def _targets_openai_api(api_base: str | None) -> bool:
     return parsed.scheme == "https" and is_openai_backed_api_base(api_base)
 
 
-@lru_cache(maxsize=16)
+@lru_cache(maxsize=DEFAULT_MAX_LRU_CACHE_SIZE)
 def _workload_identity_auth(config: OpenAIWorkloadIdentityConfig) -> WorkloadIdentityAuth:
     sdk_workload_identity_auth: Final = _load_sdk_workload_identity_auth()
     return sdk_workload_identity_auth(workload_identity=config.to_sdk_workload_identity())
diff --git a/litellm/main.py b/litellm/main.py
index ecdc0dffa79..0fdd29a5887 100644
--- a/litellm/main.py
+++ b/litellm/main.py
@@ -255,6 +255,7 @@ from .llms.openai.completion.handler import OpenAITextCompletion
 from .llms.openai.image_variations.handler import OpenAIImageVariationsHandler
 from .llms.openai.openai import OpenAIChatCompletion
 from .llms.openai.transcriptions.handler import OpenAIAudioTranscription
+from .llms.openai.workload_identity import build_openai_client
 from .llms.openai_like.chat.handler import OpenAILikeChatHandler
 from .llms.openai_like.embedding.handler import OpenAILikeEmbeddingHandler
 from .llms.ovhcloud.chat.transformation import OVHCloudChatConfig
@@ -1212,13 +1213,18 @@ def _register_custom_pricing_for_request(
         litellm.register_model({shared_key: entry}, persist_across_reloads=False)
         return
     litellm.register_model(
-        {
-            deployment_id: entry,
-            shared_key: CustomPricingLiteLLMParams.strip_custom_pricing_fields(entry),
-        },
+        {deployment_id: entry},
         persist_across_reloads=False,
         warning_display_name=shared_key,
         custom_llm_provider=custom_llm_provider,
+        add_to_provider_model_sets=False,
+    )
+    litellm.register_model(
+        {shared_key: CustomPricingLiteLLMParams.strip_custom_pricing_fields(entry)},
+        persist_across_reloads=False,
+        warning_display_name=shared_key,
+        custom_llm_provider=custom_llm_provider,
+        add_to_provider_model_sets=False,
     )
 
 
@@ -5785,6 +5791,7 @@ def completion(
                     "github_copilot_user_session",
                     PROVIDER_AFFINITY_HEADER_KWARG_KEY,
                     "fireworks_forward_user_id",
+                    "responses_api_version",
                 )
                 if key in kwargs
             },
@@ -7860,17 +7867,14 @@ def adapter_completion(*, adapter_id: str, **kwargs) -> BaseModel | AdapterCompl
 
 
 def moderation(input: str, model: str | None = None, api_key: str | None = None, **kwargs) -> OpenAIModerationResponse:
-    from litellm.llms.openai.common_utils import OpenAIHTTPClient
-
-    # only supports open ai for now
-    api_key = api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
-
-    # Extract api_base from kwargs
+    static_api_key: Final = api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
     api_base: Final = kwargs.get("api_base", None)
 
-    openai_client = kwargs.get("client", None)
-    if openai_client is None:
-        openai_client = openai.OpenAI(api_key=api_key, base_url=api_base, http_client=OpenAIHTTPClient())
+    openai_client: Final = kwargs.get("client", None) or build_openai_client(
+        api_key=static_api_key,
+        api_base=api_base,
+        litellm_params=kwargs,
+    )
 
     if model is not None:
         response = openai_client.moderations.create(input=input, model=model)
@@ -7893,8 +7897,7 @@ async def amoderation(
 ) -> OpenAIModerationResponse:
     from openai import AsyncOpenAI
 
-    # only supports open ai for now
-    api_key = api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
+    static_api_key: Final = api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
     optional_params: Final = GenericLiteLLMParams.model_validate(kwargs)
     litellm_logging_obj: Final[LiteLLMLoggingObj | None] = kwargs.get("litellm_logging_obj", None)
     _dynamic_api_base = None
@@ -7920,8 +7923,9 @@ async def amoderation(
         # _get_openai_client maintains in-memory caching logic for OpenAI clients
         _openai_client: AsyncOpenAI = openai_chat_completions.get_openai_client(
             is_async=True,
-            api_key=api_key,
+            api_key=static_api_key,
             api_base=optional_params.api_base or _dynamic_api_base,
+            litellm_params=optional_params.model_dump(exclude_none=True),
         )
     else:
         _openai_client = openai_client
@@ -7941,7 +7945,7 @@ async def amoderation(
         moderation_request: Final = {"input": input, "model": model}
         litellm_logging_obj.pre_call(
             input=input,
-            api_key=api_key,
+            api_key=static_api_key,
             additional_args={
                 "complete_input_dict": moderation_request,
                 "api_base": str(_openai_client.base_url),
@@ -8174,9 +8178,7 @@ def transcription(
             or get_secret("OPENAI_ORGANIZATION")
             or None  # default - https://github.com/openai/openai-python/blob/284c1799070c723c6a553337134148a7ab088dd8/openai/util.py#L105
         )
-        # set API KEY
-
-        api_key = api_key or litellm.api_key or litellm.openai_key or get_secret("OPENAI_API_KEY")
+        static_api_key: Final = api_key or litellm.api_key or litellm.openai_key or get_secret("OPENAI_API_KEY")
         response = openai_audio_transcriptions.audio_transcriptions(
             model=model,
             audio_file=file,
@@ -8188,7 +8190,7 @@ def transcription(
             logging_obj=litellm_logging_obj,
             max_retries=max_retries,
             api_base=api_base,
-            api_key=api_key,
+            api_key=static_api_key,
             provider_config=provider_config,
             litellm_params=litellm_params_dict,
             shared_session=shared_session,
@@ -8514,6 +8516,7 @@ def speech(
             aspeech=aspeech,
             shared_session=shared_session,
             stream=stream_audio,
+            litellm_params=litellm_params_dict,
         )
     elif custom_llm_provider in AZURE_OPENAI_AUDIO_PROVIDERS:
         # Check if this is Azure Speech Service (Cognitive Services TTS)
diff --git a/litellm/model_prices_and_context_window_backup.json b/litellm/model_prices_and_context_window_backup.json
index 49d2ce90af4..c3efaf168ab 100644
--- a/litellm/model_prices_and_context_window_backup.json
+++ b/litellm/model_prices_and_context_window_backup.json
@@ -342,26 +342,33 @@
     },
     "writer.palmyra-vision-7b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 4096,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_vision": true
     },
     "amazon.nova-lite-v1:0": {
         "cache_read_input_token_cost": 1.5e-08,
         "input_cost_per_token": 6e-08,
+        "input_cost_per_token_batches": 3e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 300000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 2.4e-07,
+        "output_cost_per_token_batches": 1.2e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -371,13 +378,19 @@
     },
     "amazon.nova-2-lite-v1:0": {
         "cache_read_input_token_cost": 7.5e-08,
+        "cache_read_input_token_cost_priority": 1.3125e-07,
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
+        "input_cost_per_token_priority": 5.25e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-06,
+        "output_cost_per_token_batches": 1.25e-06,
+        "output_cost_per_token_priority": 4.375e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -392,13 +405,17 @@
         "input_cost_per_token": 1.25e-06,
         "input_cost_per_image_token": 1.25e-06,
         "input_cost_per_audio_token": 1.25e-06,
+        "input_cost_per_token_batches": 6.25e-07,
+        "input_cost_per_token_priority": 2.1875e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1e-05,
-        "source": "https://aws.amazon.com/nova/pricing/",
+        "output_cost_per_token_batches": 5e-06,
+        "output_cost_per_token_priority": 1.75e-05,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -489,15 +506,21 @@
     "us.amazon.nova-2-lite-v1:0": {
         "cache_read_input_token_cost": 8.25e-08,
         "cache_read_input_token_cost_flex": 4.125e-08,
+        "cache_read_input_token_cost_priority": 1.44375e-07,
         "input_cost_per_token": 3.3e-07,
+        "input_cost_per_token_batches": 1.65e-07,
         "input_cost_per_token_flex": 1.65e-07,
+        "input_cost_per_token_priority": 5.775e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.75e-06,
+        "output_cost_per_token_batches": 1.375e-06,
         "output_cost_per_token_flex": 1.375e-06,
+        "output_cost_per_token_priority": 4.8125e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -512,13 +535,17 @@
         "input_cost_per_token": 1.375e-06,
         "input_cost_per_image_token": 1.375e-06,
         "input_cost_per_audio_token": 1.375e-06,
+        "input_cost_per_token_batches": 6.875e-07,
+        "input_cost_per_token_priority": 2.40625e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1.1e-05,
-        "source": "https://aws.amazon.com/nova/pricing/",
+        "output_cost_per_token_batches": 5.5e-06,
+        "output_cost_per_token_priority": 1.925e-05,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -548,12 +575,15 @@
     "amazon.nova-micro-v1:0": {
         "cache_read_input_token_cost": 8.75e-09,
         "input_cost_per_token": 3.5e-08,
+        "input_cost_per_token_batches": 1.75e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 1.4e-07,
+        "output_cost_per_token_batches": 7e-08,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_prompt_caching": true,
         "supports_response_schema": true,
@@ -561,13 +591,19 @@
     },
     "amazon.nova-premier-v1:0": {
         "cache_read_input_token_cost": 6.25e-07,
+        "cache_read_input_token_cost_priority": 1.09375e-06,
         "input_cost_per_token": 2.5e-06,
+        "input_cost_per_token_batches": 1.25e-06,
+        "input_cost_per_token_priority": 4.375e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 1.25e-05,
+        "output_cost_per_token_batches": 6.25e-06,
+        "output_cost_per_token_priority": 2.1875e-05,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -578,15 +614,21 @@
     "amazon.nova-pro-v1:0": {
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_flex": 1e-07,
+        "cache_read_input_token_cost_priority": 3.5e-07,
         "input_cost_per_token": 8e-07,
+        "input_cost_per_token_batches": 4e-07,
         "input_cost_per_token_flex": 4e-07,
+        "input_cost_per_token_priority": 1.4e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 300000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 3.2e-06,
+        "output_cost_per_token_batches": 1.6e-06,
         "output_cost_per_token_flex": 1.6e-06,
+        "output_cost_per_token_priority": 5.6e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -3987,7 +4029,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_cache_breakpoint": true,
@@ -8656,7 +8698,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -8705,7 +8747,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -8754,7 +8796,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -8803,7 +8845,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -8852,7 +8894,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -23756,19 +23798,23 @@
     },
     "deepseek.v3.2": {
         "input_cost_per_token": 6.2e-07,
+        "input_cost_per_token_batches": 3.1e-07,
         "input_cost_per_token_flex": 3.1e-07,
+        "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 164000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
+        "output_cost_per_token_batches": 9.25e-07,
         "output_cost_per_token_flex": 9.25e-07,
+        "output_cost_per_token_priority": 3.2375e-06,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_native_structured_output": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -33590,15 +33636,19 @@
     "google.gemma-3-12b-it": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 9e-08,
+        "input_cost_per_token_batches": 5e-08,
         "input_cost_per_token_flex": 5e-08,
+        "input_cost_per_token_priority": 1.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.9e-07,
+        "output_cost_per_token_batches": 1.5e-07,
         "output_cost_per_token_flex": 1.5e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-google-gemma-3-12b-it.html",
+        "output_cost_per_token_priority": 5.1e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_response_schema": true,
@@ -33608,15 +33658,19 @@
     "google.gemma-3-27b-it": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2.3e-07,
+        "input_cost_per_token_batches": 1.2e-07,
         "input_cost_per_token_flex": 1.2e-07,
+        "input_cost_per_token_priority": 4e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 3.8e-07,
+        "output_cost_per_token_batches": 1.9e-07,
         "output_cost_per_token_flex": 1.9e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-google-gemma-3-27b-pt.html",
+        "output_cost_per_token_priority": 6.7e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_response_schema": true,
@@ -33626,15 +33680,19 @@
     "google.gemma-3-4b-it": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 4e-08,
+        "input_cost_per_token_batches": 2e-08,
         "input_cost_per_token_flex": 2e-08,
+        "input_cost_per_token_priority": 7e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 8e-08,
+        "output_cost_per_token_batches": 4e-08,
         "output_cost_per_token_flex": 4e-08,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-google-gemma-3-4b-it.html",
+        "output_cost_per_token_priority": 1.4e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -33747,13 +33805,19 @@
     },
     "global.amazon.nova-2-lite-v1:0": {
         "cache_read_input_token_cost": 7.5e-08,
+        "cache_read_input_token_cost_priority": 1.3125e-07,
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
+        "input_cost_per_token_priority": 5.25e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-06,
+        "output_cost_per_token_batches": 1.25e-06,
+        "output_cost_per_token_priority": 4.375e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -40334,26 +40398,30 @@
     "meta.llama3-1-70b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7.2e-07,
+        "input_cost_per_token_batches": 3.6e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 7.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-1-70b-instruct.md",
+        "output_cost_per_token_batches": 3.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
     "meta.llama3-1-8b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2.2e-07,
+        "input_cost_per_token_batches": 1.1e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 2.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-1-8b-instruct.md",
+        "output_cost_per_token_batches": 1.1e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
@@ -40408,13 +40476,15 @@
     "meta.llama3-3-70b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7.2e-07,
+        "input_cost_per_token_batches": 3.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 7.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-3-70b-instruct.md",
+        "output_cost_per_token_batches": 3.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
@@ -40819,15 +40889,19 @@
     "minimax.minimax-m2": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
         "input_cost_per_token_flex": 1.5e-07,
+        "input_cost_per_token_priority": 5.2e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.2e-06,
+        "output_cost_per_token_batches": 6e-07,
         "output_cost_per_token_flex": 6e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-minimax-minimax-m2.html",
+        "output_cost_per_token_priority": 2.1e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -40838,25 +40912,31 @@
     "minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
         "input_cost_per_token_flex": 1.5e-07,
+        "input_cost_per_token_priority": 5.25e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 196000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.2e-06,
+        "output_cost_per_token_batches": 6e-07,
         "output_cost_per_token_flex": 6e-07,
+        "output_cost_per_token_priority": 2.1e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-minimax-minimax-m2-1.html",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
     },
     "minimax.minimax-m2.5": {
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
         "input_cost_per_token_flex": 1.5e-07,
+        "input_cost_per_token_priority": 5.25e-07,
         "output_cost_per_token": 1.2e-06,
         "output_cost_per_token_flex": 6e-07,
         "litellm_provider": "bedrock_converse",
@@ -40864,10 +40944,12 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 6e-07,
+        "output_cost_per_token_priority": 2.1e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -41052,33 +41134,41 @@
     "mistral.devstral-2-123b": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 4e-07,
+        "input_cost_per_token_batches": 2e-07,
         "input_cost_per_token_flex": 2e-07,
+        "input_cost_per_token_priority": 7e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 32000,
         "max_tokens": 32000,
         "mode": "chat",
         "output_cost_per_token": 2e-06,
+        "output_cost_per_token_batches": 1e-06,
         "output_cost_per_token_flex": 1e-06,
+        "output_cost_per_token_priority": 3.5e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-mistral-ai-devstral-2-123b.html",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
     },
     "mistral.magistral-small-2509": {
         "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "input_cost_per_token_flex": 2.5e-07,
+        "input_cost_per_token_priority": 8.8e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 40000,
         "max_tokens": 40000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-06,
+        "output_cost_per_token_batches": 7.5e-07,
         "output_cost_per_token_flex": 7.5e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 2.63e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_reasoning": true,
@@ -41088,15 +41178,19 @@
     },
     "mistral.ministral-3-14b-instruct": {
         "input_cost_per_token": 2e-07,
+        "input_cost_per_token_batches": 1e-07,
         "input_cost_per_token_flex": 1e-07,
+        "input_cost_per_token_priority": 3.5e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2e-07,
+        "output_cost_per_token_batches": 1e-07,
         "output_cost_per_token_flex": 1e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 3.5e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -41106,15 +41200,19 @@
     },
     "mistral.ministral-3-3b-instruct": {
         "input_cost_per_token": 1e-07,
+        "input_cost_per_token_batches": 5e-08,
         "input_cost_per_token_flex": 5e-08,
+        "input_cost_per_token_priority": 1.7e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1e-07,
+        "output_cost_per_token_batches": 5e-08,
         "output_cost_per_token_flex": 5e-08,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 1.7e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -41124,15 +41222,19 @@
     },
     "mistral.ministral-3-8b-instruct": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-07,
+        "output_cost_per_token_batches": 7e-08,
         "output_cost_per_token_flex": 7e-08,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 2.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -41177,15 +41279,19 @@
     },
     "mistral.mistral-large-3-675b-instruct": {
         "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "input_cost_per_token_flex": 2.5e-07,
+        "input_cost_per_token_priority": 8.8e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 32000,
         "max_tokens": 32000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-06,
+        "output_cost_per_token_batches": 7.5e-07,
         "output_cost_per_token_flex": 7.5e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 2.63e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -41221,15 +41327,19 @@
     "mistral.voxtral-mini-3b-2507": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 4e-08,
+        "input_cost_per_token_batches": 2e-08,
         "input_cost_per_token_flex": 2e-08,
+        "input_cost_per_token_priority": 7e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 32768,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 4e-08,
+        "output_cost_per_token_batches": 2e-08,
         "output_cost_per_token_flex": 2e-08,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-mistral-ai-voxtral-mini-3b-2507.html",
+        "output_cost_per_token_priority": 7e-08,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": true,
         "supports_system_messages": true,
         "supports_native_structured_output": true
@@ -41237,15 +41347,19 @@
     "mistral.voxtral-small-24b-2507": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 1e-07,
+        "input_cost_per_token_batches": 5e-08,
         "input_cost_per_token_flex": 5e-08,
+        "input_cost_per_token_priority": 1.7e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 32768,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 3e-07,
+        "output_cost_per_token_batches": 1.5e-07,
         "output_cost_per_token_flex": 1.5e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-mistral-ai-voxtral-small-24b-2507.html",
+        "output_cost_per_token_priority": 5.2e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": true,
         "supports_system_messages": true,
         "supports_native_structured_output": true
@@ -42056,13 +42170,17 @@
     "moonshot.kimi-k2-thinking": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 6e-07,
+        "input_cost_per_token_batches": 3e-07,
+        "input_cost_per_token_priority": 1.05e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-06,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-moonshot-ai-kimi-k2-thinking.html",
+        "output_cost_per_token_batches": 1.25e-06,
+        "output_cost_per_token_priority": 4.38e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_reasoning": true,
@@ -42073,19 +42191,23 @@
     },
     "moonshotai.kimi-k2.5": {
         "input_cost_per_token": 6e-07,
+        "input_cost_per_token_batches": 3e-07,
         "input_cost_per_token_flex": 3e-07,
+        "input_cost_per_token_priority": 1.05e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 3e-06,
+        "output_cost_per_token_batches": 1.5e-06,
         "output_cost_per_token_flex": 1.5e-06,
+        "output_cost_per_token_priority": 5.25e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true
     },
@@ -43177,15 +43299,19 @@
     "nvidia.nemotron-nano-12b-v2": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2e-07,
+        "input_cost_per_token_batches": 1e-07,
         "input_cost_per_token_flex": 1e-07,
+        "input_cost_per_token_priority": 3.5e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-nvidia-nvidia-nemotron-nano-12b-v2-vl-bf16.html",
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_response_schema": true,
@@ -43195,15 +43321,19 @@
     "nvidia.nemotron-nano-9b-v2": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 6e-08,
+        "input_cost_per_token_batches": 3e-08,
         "input_cost_per_token_flex": 3e-08,
+        "input_cost_per_token_priority": 1.1e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.3e-07,
+        "output_cost_per_token_batches": 1.2e-07,
         "output_cost_per_token_flex": 1.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-nvidia-nvidia-nemotron-nano-9b-v2.html",
+        "output_cost_per_token_priority": 4e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_response_schema": true,
@@ -43212,18 +43342,22 @@
     },
     "nvidia.nemotron-nano-3-30b": {
         "input_cost_per_token": 6e-08,
+        "input_cost_per_token_batches": 3e-08,
         "input_cost_per_token_flex": 3e-08,
+        "input_cost_per_token_priority": 1.1e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.4e-07,
+        "output_cost_per_token_batches": 1.2e-07,
         "output_cost_per_token_flex": 1.2e-07,
+        "output_cost_per_token_priority": 4.2e-07,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_native_structured_output": true,
         "supports_response_schema": true,
@@ -43231,15 +43365,19 @@
     },
     "nvidia.nemotron-super-3-120b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 32000,
         "max_tokens": 32000,
         "mode": "chat",
         "output_cost_per_token": 6.5e-07,
+        "output_cost_per_token_batches": 3.25e-07,
         "output_cost_per_token_flex": 3.25e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 1.1375e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_reasoning": true,
@@ -44731,6 +44869,7 @@
         "supports_bedrock_runtime_chat_completions_tools_with_reasoning": true,
         "supports_bedrock_runtime_chat_completions_inline_reasoning": true,
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
         "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
@@ -44739,9 +44878,10 @@
         "max_tokens": 16384,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
         "output_cost_per_token_priority": 1.05e-06,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -44754,6 +44894,7 @@
         "supports_bedrock_runtime_chat_completions_tools_with_reasoning": true,
         "supports_bedrock_runtime_chat_completions_inline_reasoning": true,
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3.5e-08,
         "input_cost_per_token_flex": 3.5e-08,
         "input_cost_per_token_priority": 1.225e-07,
         "litellm_provider": "bedrock_converse",
@@ -44762,9 +44903,10 @@
         "max_tokens": 16384,
         "mode": "chat",
         "output_cost_per_token": 3e-07,
+        "output_cost_per_token_batches": 1.5e-07,
         "output_cost_per_token_flex": 1.5e-07,
         "output_cost_per_token_priority": 5.25e-07,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -44772,15 +44914,19 @@
     },
     "openai.gpt-oss-safeguard-120b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_bedrock_runtime_chat_completions_inline_reasoning": true,
         "supports_function_calling": true,
@@ -44790,15 +44936,19 @@
     },
     "openai.gpt-oss-safeguard-20b": {
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3e-08,
         "input_cost_per_token_flex": 3e-08,
+        "input_cost_per_token_priority": 1.2e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 2e-07,
+        "output_cost_per_token_batches": 1e-07,
         "output_cost_per_token_flex": 1e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 3.5e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_bedrock_runtime_chat_completions_inline_reasoning": true,
         "supports_function_calling": true,
@@ -45654,13 +45804,17 @@
     "qwen.qwen3-coder-30b-a3b-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 262144,
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-coder-30b-a3b-instruct.html",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_tool_choice": true,
@@ -45668,15 +45822,19 @@
     },
     "qwen.qwen3-32b-v1:0": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 32768,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-32b.html",
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_tool_choice": true,
@@ -45796,13 +45954,17 @@
     },
     "qwen.qwen3-vl-235b-a22b": {
         "input_cost_per_token": 5.3e-07,
+        "input_cost_per_token_batches": 2.6e-07,
+        "input_cost_per_token_priority": 9.3e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.66e-06,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_batches": 1.33e-06,
+        "output_cost_per_token_priority": 4.66e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -45812,18 +45974,22 @@
     },
     "qwen.qwen3-coder-next": {
         "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "input_cost_per_token_flex": 2.5e-07,
+        "input_cost_per_token_priority": 8.75e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 1.2e-06,
+        "output_cost_per_token_batches": 6e-07,
         "output_cost_per_token_flex": 6e-07,
+        "output_cost_per_token_priority": 2.1e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -47842,12 +48008,15 @@
     "us.amazon.nova-lite-v1:0": {
         "cache_read_input_token_cost": 1.5e-08,
         "input_cost_per_token": 6e-08,
+        "input_cost_per_token_batches": 3e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 300000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 2.4e-07,
+        "output_cost_per_token_batches": 1.2e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -47858,12 +48027,15 @@
     "us.amazon.nova-micro-v1:0": {
         "cache_read_input_token_cost": 8.75e-09,
         "input_cost_per_token": 3.5e-08,
+        "input_cost_per_token_batches": 1.75e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 1.4e-07,
+        "output_cost_per_token_batches": 7e-08,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_prompt_caching": true,
         "supports_response_schema": true,
@@ -47872,15 +48044,21 @@
     "us.amazon.nova-pro-v1:0": {
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_flex": 1e-07,
+        "cache_read_input_token_cost_priority": 3.5e-07,
         "input_cost_per_token": 8e-07,
+        "input_cost_per_token_batches": 4e-07,
         "input_cost_per_token_flex": 4e-07,
+        "input_cost_per_token_priority": 1.4e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 300000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 3.2e-06,
+        "output_cost_per_token_batches": 1.6e-06,
         "output_cost_per_token_flex": 1.6e-06,
+        "output_cost_per_token_priority": 5.6e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -48599,14 +48777,19 @@
     },
     "us.deepseek.v3.2": {
         "input_cost_per_token": 6.2e-07,
+        "input_cost_per_token_batches": 3.1e-07,
         "input_cost_per_token_flex": 3.1e-07,
+        "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 163840,
         "max_output_tokens": 163840,
         "max_tokens": 163840,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
+        "output_cost_per_token_batches": 9.25e-07,
         "output_cost_per_token_flex": 9.25e-07,
+        "output_cost_per_token_priority": 3.2375e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_native_structured_output": true,
@@ -48648,26 +48831,30 @@
     "us.meta.llama3-1-70b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7.2e-07,
+        "input_cost_per_token_batches": 3.6e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 7.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-1-70b-instruct.md",
+        "output_cost_per_token_batches": 3.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
     "us.meta.llama3-1-8b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2.2e-07,
+        "input_cost_per_token_batches": 1.1e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 2.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-1-8b-instruct.md",
+        "output_cost_per_token_batches": 1.1e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
@@ -48722,13 +48909,15 @@
     "us.meta.llama3-3-70b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7.2e-07,
+        "input_cost_per_token_batches": 3.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 7.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-3-70b-instruct.md",
+        "output_cost_per_token_batches": 3.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
@@ -53430,37 +53619,45 @@
     "zai.glm-4.7": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 6e-07,
+        "input_cost_per_token_batches": 3e-07,
         "input_cost_per_token_flex": 3e-07,
+        "input_cost_per_token_priority": 1.05e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 203000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 2.2e-06,
+        "output_cost_per_token_batches": 1.1e-06,
         "output_cost_per_token_flex": 1.1e-06,
+        "output_cost_per_token_priority": 3.85e-06,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-zai-glm-4-7.md",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
     },
     "zai.glm-5": {
         "input_cost_per_token": 1e-06,
+        "input_cost_per_token_batches": 5e-07,
+        "input_cost_per_token_priority": 1.75e-06,
         "output_cost_per_token": 3.2e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 200000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
+        "output_cost_per_token_batches": 1.6e-06,
+        "output_cost_per_token_priority": 5.6e-06,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_native_structured_output": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -53468,19 +53665,23 @@
     "zai.glm-4.7-flash": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3.5e-08,
         "input_cost_per_token_flex": 3.5e-08,
+        "input_cost_per_token_priority": 1.225e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 203000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 4e-07,
+        "output_cost_per_token_batches": 2e-07,
         "output_cost_per_token_flex": 2e-07,
+        "output_cost_per_token_priority": 7e-07,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-zai-glm-4-7-flash.md",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -58851,7 +59052,9 @@
     },
     "bedrock_mantle/openai.gpt-oss-120b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "output_cost_per_token": 6e-07,
         "output_cost_per_token_flex": 3e-07,
         "litellm_provider": "bedrock_mantle",
@@ -58859,7 +59062,9 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-oss-120b.html",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/responses"
@@ -58872,7 +59077,9 @@
     },
     "bedrock_mantle/openai.gpt-oss-20b": {
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3.5e-08,
         "input_cost_per_token_flex": 3.5e-08,
+        "input_cost_per_token_priority": 1.225e-07,
         "output_cost_per_token": 3e-07,
         "output_cost_per_token_flex": 1.5e-07,
         "litellm_provider": "bedrock_mantle",
@@ -58880,7 +59087,9 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-oss-20b.html",
+        "output_cost_per_token_batches": 1.5e-07,
+        "output_cost_per_token_priority": 5.25e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/responses"
@@ -58893,7 +59102,9 @@
     },
     "bedrock_mantle/openai.gpt-oss-safeguard-120b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.6e-07,
         "output_cost_per_token": 6e-07,
         "output_cost_per_token_flex": 3e-07,
         "litellm_provider": "bedrock_mantle",
@@ -58901,7 +59112,9 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-oss-safeguard-120b.html",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
@@ -58912,7 +59125,9 @@
     },
     "bedrock_mantle/openai.gpt-oss-safeguard-20b": {
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3e-08,
         "input_cost_per_token_flex": 3e-08,
+        "input_cost_per_token_priority": 1.2e-07,
         "output_cost_per_token": 2e-07,
         "output_cost_per_token_flex": 1e-07,
         "litellm_provider": "bedrock_mantle",
@@ -58920,7 +59135,9 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-oss-safeguard-20b.html",
+        "output_cost_per_token_batches": 1e-07,
+        "output_cost_per_token_priority": 3.5e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
@@ -59553,7 +59770,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_prompt_caching": true,
         "supports_prompt_cache_breakpoint": true,
         "supports_reasoning": true,
@@ -59592,7 +59809,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_prompt_caching": true,
         "supports_prompt_cache_breakpoint": true,
         "supports_reasoning": true,
@@ -59675,7 +59892,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59714,7 +59931,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59799,7 +60016,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59834,7 +60051,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59872,7 +60089,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59907,7 +60124,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -60002,7 +60219,9 @@
     },
     "bedrock_mantle/google.gemma-4-31b": {
         "input_cost_per_token": 1.4e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.45e-07,
         "output_cost_per_token": 4e-07,
         "output_cost_per_token_flex": 2e-07,
         "litellm_provider": "bedrock_mantle",
@@ -60010,6 +60229,9 @@
         "max_output_tokens": 256000,
         "max_tokens": 256000,
         "mode": "chat",
+        "output_cost_per_token_batches": 2e-07,
+        "output_cost_per_token_priority": 7e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60023,7 +60245,9 @@
     },
     "bedrock_mantle/google.gemma-4-26b-a4b": {
         "input_cost_per_token": 1.3e-07,
+        "input_cost_per_token_batches": 6.5e-08,
         "input_cost_per_token_flex": 6.5e-08,
+        "input_cost_per_token_priority": 2.275e-07,
         "output_cost_per_token": 4e-07,
         "output_cost_per_token_flex": 2e-07,
         "litellm_provider": "bedrock_mantle",
@@ -60031,6 +60255,9 @@
         "max_output_tokens": 256000,
         "max_tokens": 256000,
         "mode": "chat",
+        "output_cost_per_token_batches": 2e-07,
+        "output_cost_per_token_priority": 7e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60044,7 +60271,9 @@
     },
     "bedrock_mantle/google.gemma-4-e2b": {
         "input_cost_per_token": 4e-08,
+        "input_cost_per_token_batches": 2e-08,
         "input_cost_per_token_flex": 2e-08,
+        "input_cost_per_token_priority": 7e-08,
         "output_cost_per_token": 8e-08,
         "output_cost_per_token_flex": 4e-08,
         "litellm_provider": "bedrock_mantle",
@@ -60052,6 +60281,9 @@
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
+        "output_cost_per_token_batches": 4e-08,
+        "output_cost_per_token_priority": 1.4e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60068,8 +60300,10 @@
         "input_cost_per_token": 1.25e-06,
         "output_cost_per_token": 2.5e-06,
         "cache_read_input_token_cost": 2e-07,
+        "cache_read_input_token_cost_batches": 1e-07,
         "cache_read_input_token_cost_flex": 1e-07,
         "cache_read_input_token_cost_priority": 3.5e-07,
+        "input_cost_per_token_batches": 6.25e-07,
         "input_cost_per_token_flex": 6.25e-07,
         "input_cost_per_token_priority": 2.1875e-06,
         "litellm_provider": "bedrock_mantle",
@@ -60077,6 +60311,7 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
+        "output_cost_per_token_batches": 1.25e-06,
         "output_cost_per_token_flex": 1.25e-06,
         "output_cost_per_token_priority": 4.375e-06,
         "supported_endpoints": [
@@ -60088,7 +60323,7 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/xai.grok-4.6": {
         "use_openai_responses_path": true,
@@ -67524,7 +67759,9 @@
     "bedrock_mantle/deepseek.v3.1": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 5.8e-07,
+        "input_cost_per_token_batches": 2.9e-07,
         "input_cost_per_token_flex": 2.9e-07,
+        "input_cost_per_token_priority": 1.015e-06,
         "output_cost_per_token": 1.68e-06,
         "output_cost_per_token_flex": 8.4e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67532,17 +67769,21 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 8.4e-07,
+        "output_cost_per_token_priority": 2.94e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-1.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/moonshotai.kimi-k2-thinking": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 6e-07,
+        "input_cost_per_token_batches": 3e-07,
         "input_cost_per_token_flex": 3e-07,
+        "input_cost_per_token_priority": 1.05e-06,
         "output_cost_per_token": 2.5e-06,
         "output_cost_per_token_flex": 1.25e-06,
         "litellm_provider": "bedrock_mantle",
@@ -67550,17 +67791,21 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
+        "output_cost_per_token_batches": 1.25e-06,
+        "output_cost_per_token_priority": 4.38e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_reasoning": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-moonshot-ai-kimi-k2-thinking.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-235b-a22b-2507": {
         "input_cost_per_token": 2.2e-07,
+        "input_cost_per_token_batches": 1.1e-07,
         "input_cost_per_token_flex": 1.1e-07,
+        "input_cost_per_token_priority": 3.85e-07,
         "output_cost_per_token": 8.8e-07,
         "output_cost_per_token_flex": 4.4e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67568,17 +67813,21 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 4.4e-07,
+        "output_cost_per_token_priority": 1.54e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_reasoning": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-235b-a22b-2507.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-32b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "output_cost_per_token": 6e-07,
         "output_cost_per_token_flex": 3e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67586,18 +67835,22 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_reasoning": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-32b.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-coder-30b-a3b-instruct": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "output_cost_per_token": 6e-07,
         "output_cost_per_token_flex": 3e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67605,17 +67858,21 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-coder-30b-a3b-instruct.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-coder-480b-a35b-instruct": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 4.5e-07,
+        "input_cost_per_token_batches": 2.25e-07,
         "input_cost_per_token_flex": 2.25e-07,
+        "input_cost_per_token_priority": 7.875e-07,
         "output_cost_per_token": 1.8e-06,
         "output_cost_per_token_flex": 9e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67623,16 +67880,20 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
+        "output_cost_per_token_batches": 9e-07,
+        "output_cost_per_token_priority": 3.15e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-coder-480b-a35b-instruct.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-next-80b-a3b-instruct": {
         "input_cost_per_token": 1.4e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.6e-07,
         "output_cost_per_token": 1.2e-06,
         "output_cost_per_token_flex": 6e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67640,17 +67901,21 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 6e-07,
+        "output_cost_per_token_priority": 2.1e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_reasoning": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-next-80b-a3b.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-vl-235b-a22b-instruct": {
         "input_cost_per_token": 5.3e-07,
+        "input_cost_per_token_batches": 2.6e-07,
         "input_cost_per_token_flex": 2.6e-07,
+        "input_cost_per_token_priority": 9.3e-07,
         "output_cost_per_token": 2.66e-06,
         "output_cost_per_token_flex": 1.33e-06,
         "litellm_provider": "bedrock_mantle",
@@ -67658,13 +67923,15 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 1.33e-06,
+        "output_cost_per_token_priority": 4.66e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-vl-235b-a22b.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "azure/us-gov/gpt-5.1": {
         "cache_read_input_token_cost": 1.71875e-07,
@@ -75218,5 +75485,45 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
+    },
+    "together_ai/reflection/Beam-1.0-501B-A23B": {
+        "cache_read_input_token_cost": 4e-08,
+        "input_cost_per_token": 4e-07,
+        "litellm_provider": "together_ai",
+        "max_input_tokens": 1048576,
+        "max_tokens": 1048576,
+        "mode": "chat",
+        "output_cost_per_token": 1.2e-06,
+        "source": "https://api.together.ai/v1/models",
+        "supports_function_calling": true,
+        "supports_prompt_caching": true,
+        "supports_response_schema": true
+    },
+    "baseten/reflection/Beam-1.0": {
+        "cache_read_input_token_cost": 1.3e-07,
+        "input_cost_per_token": 1.3e-06,
+        "litellm_provider": "baseten",
+        "max_input_tokens": 1048576,
+        "max_output_tokens": 131072,
+        "max_tokens": 131072,
+        "mode": "chat",
+        "output_cost_per_token": 4.3e-06,
+        "source": "https://inference.baseten.co/v1/models",
+        "supports_function_calling": true,
+        "supports_prompt_caching": true,
+        "supports_reasoning": true,
+        "supports_response_schema": true,
+        "supports_tool_choice": true
+    },
+    "nebius/reflection/beam": {
+        "input_cost_per_token": 2.5e-07,
+        "litellm_provider": "nebius",
+        "max_input_tokens": 1048576,
+        "max_tokens": 1048576,
+        "mode": "chat",
+        "output_cost_per_token": 1e-06,
+        "source": "https://tokenfactory.nebius.com/models/catalog/text2text/reflection%2Fbeam",
+        "supports_function_calling": true,
+        "supports_reasoning": true
     }
 }
diff --git a/litellm/proxy/_experimental/mcp_server/auth/user_api_key_auth_mcp.py b/litellm/proxy/_experimental/mcp_server/auth/user_api_key_auth_mcp.py
index 9c8890efd2b..4090666e16f 100644
--- a/litellm/proxy/_experimental/mcp_server/auth/user_api_key_auth_mcp.py
+++ b/litellm/proxy/_experimental/mcp_server/auth/user_api_key_auth_mcp.py
@@ -1345,7 +1345,9 @@ class MCPRequestHandler:
         if auth is None:
             return None
         refreshed = auth.model_copy()
-        if auth.mcp_admitted_user_subject and auth.user_id:
+        if (auth.mcp_admitted_user_subject or auth.is_session_token) and auth.user_id:
+            # A session credential (``lite login`` or a redeemed ID-JAG) has no key row, its authority is
+            # sealed in the token: refresh the live user policy and keep the token's team, routes and models.
             current = await MCPRequestHandler.reload_admitted_user(auth.user_id, requires_fresh_policy=True)
             refreshed.object_permission = current.object_permission
             refreshed.object_permission_id = current.object_permission_id
diff --git a/litellm/proxy/_experimental/mcp_server/discoverable_endpoints.py b/litellm/proxy/_experimental/mcp_server/discoverable_endpoints.py
index 6e5b5486696..449adaa73e9 100644
--- a/litellm/proxy/_experimental/mcp_server/discoverable_endpoints.py
+++ b/litellm/proxy/_experimental/mcp_server/discoverable_endpoints.py
@@ -56,6 +56,7 @@ from litellm.proxy._experimental.mcp_server.faults import (
     render_token_fault,
 )
 from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import (
+    JWT_BEARER_GRANT_TYPE,
     VendorCredentialState,
     aggregate_authorize,
     aggregate_token,
@@ -71,6 +72,11 @@ from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import (
     revoke_refresh_token,
     supported_grant_types,
 )
+from litellm.proxy._experimental.mcp_server.id_jag_grant import (
+    basic_client_id,
+    jwt_bearer_available,
+    redeem_id_jag_assertion,
+)
 from litellm.proxy._experimental.mcp_server.idp_token_exchange import (
     exchange_idp_subject_token,
     token_exchange_available,
@@ -2396,7 +2402,7 @@ async def token_endpoint(
     grant_type: str = Form(...),
     code: str = Form(None),
     redirect_uri: str = Form(None),
-    client_id: str = Form(...),
+    client_id: str | None = Form(None),
     client_secret: str | None = Form(None),
     code_verifier: str = Form(None),
     refresh_token: str | None = Form(None),
@@ -2405,6 +2411,7 @@ async def token_endpoint(
     subject_token: str | None = Form(None),
     subject_token_type: str | None = Form(None),
     requested_token_type: str | None = Form(None),
+    assertion: str | None = Form(None),
     mcp_server_name: str | None = None,
 ):
     """
@@ -2416,7 +2423,14 @@ async def token_endpoint(
     3. Return the token
     4. Return a virtual key in this response
     """
-    if mcp_server_name is None and is_gateway_dcr_client_id(client_id):
+    presented_client_id: Final = client_id or basic_client_id(request.headers.get("authorization"))
+    if presented_client_id is None:
+        raise HTTPException(
+            status_code=400, detail={"error": "invalid_request", "error_description": "client_id is required"}
+        )
+    if mcp_server_name is None and (
+        is_gateway_dcr_client_id(presented_client_id) or grant_type == JWT_BEARER_GRANT_TYPE
+    ):
         from litellm.proxy.proxy_server import (  # noqa: PLC0415  # circular import at module load
             master_key,
             user_api_key_cache,
@@ -2427,7 +2441,7 @@ async def token_endpoint(
             grant_type=grant_type,
             code=code,
             redirect_uri=redirect_uri,
-            client_id=client_id,
+            client_id=presented_client_id,
             code_verifier=code_verifier,
             refresh_token=refresh_token,
             master_key=master_key,
@@ -2439,9 +2453,12 @@ async def token_endpoint(
             subject_token_type=subject_token_type,
             requested_token_type=requested_token_type,
             exchange_subject_token=exchange_idp_subject_token,
+            assertion=assertion,
+            client_secret=client_secret,
+            redeem_assertion=redeem_id_jag_assertion,
         )
 
-    lookup_name: Final = mcp_server_name or client_id
+    lookup_name: Final = mcp_server_name or presented_client_id
     client_ip: Final = IPAddressUtils.get_mcp_client_ip(request)
     mcp_server = _resolve_mcp_server_by_name_or_id(lookup_name, client_ip)
     if mcp_server is None and mcp_server_name is None:
@@ -2454,7 +2471,7 @@ async def token_endpoint(
         grant_type=grant_type,
         code=code,
         redirect_uri=redirect_uri,
-        client_id=client_id,
+        client_id=presented_client_id,
         client_secret=client_secret,
         code_verifier=code_verifier,
         refresh_token=refresh_token,
@@ -2568,7 +2585,8 @@ async def native_client_auth_discovery(request: Request) -> JSONResponse:
     """The versioned contract a native client (``lite login --pkce``, or a CLI in any other
     language) reads to sign a user in through the browser and obtain a proxy credential."""
     return JSONResponse(
-        native_client_auth_contract(request, token_exchange_available()), headers=TOKEN_NO_CACHE_HEADERS
+        native_client_auth_contract(request, token_exchange_available(), jwt_bearer_available()),
+        headers=TOKEN_NO_CACHE_HEADERS,
     )
 
 
@@ -3135,7 +3153,7 @@ def _aggregate_header_scopes(request: Request) -> tuple[str, ...]:
 
 
 def _build_aggregate_authorization_server_response(
-    request: Request, token_exchange_available: bool
+    request: Request, token_exchange_available: bool, jwt_bearer_available: bool = False
 ) -> dict[str, object]:
     """RFC 8414 metadata for the gateway as the aggregate authorization server.
 
@@ -3155,9 +3173,13 @@ def _build_aggregate_authorization_server_response(
         "registration_endpoint": f"{request_base_url}/register",
         "response_types_supported": ["code"],
         "scopes_supported": [],
-        "grant_types_supported": supported_grant_types(token_exchange_available),
+        "grant_types_supported": supported_grant_types(token_exchange_available, jwt_bearer_available),
         "code_challenge_methods_supported": ["S256"],
-        "token_endpoint_auth_methods_supported": ["none", "client_secret_post"],
+        "token_endpoint_auth_methods_supported": (
+            ["none", "client_secret_post", "client_secret_basic"]
+            if jwt_bearer_available
+            else ["none", "client_secret_post"]
+        ),
     }
 
 
@@ -3193,7 +3215,7 @@ async def oauth_authorization_server_aggregate(request: Request):
     per-server row win here instead would serve an issuer of {base} against a resource that
     advertised {base}/mcp, which fails the RFC 8414 issuer check and breaks the front door.
     """
-    return _build_aggregate_authorization_server_response(request, token_exchange_available())
+    return _build_aggregate_authorization_server_response(request, token_exchange_available(), jwt_bearer_available())
 
 
 # Standard MCP pattern: /.well-known/oauth-protected-resource/mcp/{server_name}
@@ -3273,6 +3295,10 @@ def _build_oauth_authorization_server_response(
         if explicitly_named
         else request_base_url
     )
+    # With no upstream resolved the document is the gateway's own: its issuer is the bare origin
+    # and its /token serves every grant the gateway does, including the ID-JAG jwt-bearer grant.
+    gateway_owned: Final = mcp_server_name is None and issuer_path is None
+    jwt_bearer: Final = gateway_owned and jwt_bearer_available()
 
     return {
         "issuer": issuer,
@@ -3280,9 +3306,15 @@ def _build_oauth_authorization_server_response(
         "token_endpoint": token_endpoint,
         "response_types_supported": ["code"],
         "scopes_supported": (mcp_server.scopes if mcp_server and mcp_server.scopes else []),
-        "grant_types_supported": ["authorization_code", "refresh_token"],
+        "grant_types_supported": (
+            list(supported_grant_types(token_exchange_available(), jwt_bearer))
+            if gateway_owned
+            else ["authorization_code", "refresh_token"]
+        ),
         "code_challenge_methods_supported": ["S256"],
-        "token_endpoint_auth_methods_supported": ["client_secret_post"],
+        "token_endpoint_auth_methods_supported": (
+            ["none", "client_secret_post", "client_secret_basic"] if jwt_bearer else ["client_secret_post"]
+        ),
         # Claude expects a registration endpoint, even if we just fake it
         "registration_endpoint": (
             f"{request_base_url}/{mcp_server_name}/register" if mcp_server_name else f"{request_base_url}/register"
diff --git a/litellm/proxy/_experimental/mcp_server/gateway_dcr_flow.py b/litellm/proxy/_experimental/mcp_server/gateway_dcr_flow.py
index dd8c82a99fe..90289fd4c20 100644
--- a/litellm/proxy/_experimental/mcp_server/gateway_dcr_flow.py
+++ b/litellm/proxy/_experimental/mcp_server/gateway_dcr_flow.py
@@ -198,20 +198,26 @@ class MintProxyCredential(Protocol):
     and mints the same credential ``lite login`` mints."""
 
     def __call__(
-        self, user_id: str, team_id: str | None, /
+        self, user_id: str, team_id: str | None, /, *, allowed_routes: Sequence[str] | None = None
     ) -> Awaitable[MintedProxyCredential | ProxyCredentialMintFailure]: ...
 
 
 TOKEN_EXCHANGE_GRANT_TYPE: Final = "urn:ietf:params:oauth:grant-type:token-exchange"
+JWT_BEARER_GRANT_TYPE: Final = "urn:ietf:params:oauth:grant-type:jwt-bearer"
 
 
-def supported_grant_types(token_exchange_available: bool) -> tuple[str, ...]:
+def supported_grant_types(token_exchange_available: bool, jwt_bearer_available: bool = False) -> tuple[str, ...]:
     """The grants ``/token`` can serve on this deployment. The RFC 8693 exchange is listed
     only where the JWT auth that proves a subject token is on, backed by a database, and
-    licensed, so a client never selects a grant the gateway would then refuse."""
-    if token_exchange_available:
-        return ("authorization_code", "refresh_token", TOKEN_EXCHANGE_GRANT_TYPE)
-    return ("authorization_code", "refresh_token")
+    licensed, so a client never selects a grant the gateway would then refuse. The RFC 7523
+    jwt-bearer grant (an ID-JAG from the identity provider) is listed only where, on top of
+    that, the operator has allowlisted at least one requesting app."""
+    return (
+        "authorization_code",
+        "refresh_token",
+        *((TOKEN_EXCHANGE_GRANT_TYPE,) if token_exchange_available else ()),
+        *((JWT_BEARER_GRANT_TYPE,) if jwt_bearer_available else ()),
+    )
 
 
 """RFC 8693: a native client that already holds a token from the customer's identity
@@ -236,10 +242,29 @@ class SubjectIdentity(LiteLLMBaseModel):
 
 class SubjectTokenRefusal(LiteLLMBaseModel):
     model_config = ConfigDict(frozen=True)
-    error: Literal["unsupported_grant_type", "invalid_request", "temporarily_unavailable"]
+    error: Literal[
+        "unsupported_grant_type",
+        "invalid_request",
+        "invalid_grant",
+        "invalid_client",
+        "invalid_scope",
+        "temporarily_unavailable",
+    ]
     description: str = Field(min_length=1)
 
 
+class AssertionIdentity(SubjectIdentity):
+    """The litellm user an RFC 7523 assertion (an ID-JAG) stands for, plus what the grant
+    tail needs from the assertion itself: the single-use key for its ``jti``, how long that
+    marker must outlive it, the ``scope`` the credential is issued for, and the route groups that
+    scope narrows the credential to (``None`` leaves it the full ``lite login`` credential)."""
+
+    replay_key: str = Field(min_length=1)
+    replay_ttl_seconds: int = Field(gt=0)
+    scope: str | None = None
+    allowed_routes: tuple[str, ...] | None = None
+
+
 class ExchangeSubjectToken(Protocol):
     """Injected RFC 8693 subject-token verifier ``(subject_token, request)``: proves the
     IdP token the way the proxy's own JWT auth does and names the litellm user and team it
@@ -272,7 +297,9 @@ class LookupConsentTeams(Protocol):
     def __call__(self, user_id: str, /) -> Awaitable[tuple[ConsentTeam, ...] | ReloadUserFailure]: ...
 
 
-async def _refuse_proxy_credential(user_id: str, team_id: str | None) -> ProxyCredentialMintFailure:
+async def _refuse_proxy_credential(
+    user_id: str, team_id: str | None, *, allowed_routes: Sequence[str] | None = None
+) -> ProxyCredentialMintFailure:
     return "unresolvable"
 
 
@@ -282,6 +309,25 @@ async def _refuse_subject_token(subject_token: str, request: Request) -> Subject
     )
 
 
+class RedeemAssertion(Protocol):
+    """Injected RFC 7523 assertion verifier ``(assertion, client_id, client_secret, request)``:
+    proves an ID-JAG the identity provider minted for the requesting app ``client_id``,
+    authenticates that app, and names the litellm user the assertion stands for, or says why
+    this gateway will not take it."""
+
+    def __call__(
+        self, assertion: str, client_id: str, client_secret: str | None, request: Request, /
+    ) -> Awaitable[AssertionIdentity | SubjectTokenRefusal]: ...
+
+
+async def _refuse_assertion(
+    assertion: str, client_id: str, client_secret: str | None, request: Request
+) -> SubjectTokenRefusal:
+    return SubjectTokenRefusal(
+        error="unsupported_grant_type", description="this gateway is not configured to redeem identity assertions"
+    )
+
+
 async def _unavailable_vendor_credential(
     user_id: str, server_id: str, requested_scopes: tuple[str, ...] = ()
 ) -> VendorCredentialState:
@@ -797,7 +843,9 @@ class NativeClientAuthContract(TypedDict):
     revocation_endpoint_auth_methods_supported: ReadOnly[tuple[str, ...]]
 
 
-def native_client_auth_contract(request: Request, token_exchange_available: bool) -> NativeClientAuthContract:
+def native_client_auth_contract(
+    request: Request, token_exchange_available: bool, jwt_bearer_available: bool = False
+) -> NativeClientAuthContract:
     """The versioned discovery document at ``/.well-known/litellm-cli-auth``: everything a
     native client (in any language) needs to run the sign-in without reading LiteLLM
     source. ``resource`` is the exact value to send as the RFC 8707 ``resource`` parameter
@@ -812,7 +860,7 @@ def native_client_auth_contract(request: Request, token_exchange_available: bool
         "revocation_endpoint": f"{base_url}/revoke",
         "resource": base_url,
         "response_types_supported": ("code",),
-        "grant_types_supported": supported_grant_types(token_exchange_available),
+        "grant_types_supported": supported_grant_types(token_exchange_available, jwt_bearer_available),
         "code_challenge_methods_supported": ("S256",),
         "token_endpoint_auth_methods_supported": ("none",),
         "revocation_endpoint_auth_methods_supported": ("none",),
@@ -1403,10 +1451,11 @@ class _ProxyCredentialTokenResponse(TypedDict):
     access_token: ReadOnly[str]
     token_type: ReadOnly[Literal["Bearer"]]
     expires_in: ReadOnly[int]
-    refresh_token: ReadOnly[str]
+    refresh_token: NotRequired[ReadOnly[str]]
     user_id: ReadOnly[str]
     team_id: ReadOnly[str | None]
     issued_token_type: NotRequired[ReadOnly[_IssuedTokenType]]
+    scope: NotRequired[ReadOnly[str]]
 
 
 def proxy_credential_response(
@@ -1415,6 +1464,7 @@ def proxy_credential_response(
     signing: SessionSigning,
     issued_token_type: _IssuedTokenType | None = None,
     family: str | None = None,
+    scope: str | None = None,
 ) -> Response:
     """The proxy-API token response: the access token is the very credential ``lite
     login`` stores (accepted on every proxy route with user and team attribution), and
@@ -1426,7 +1476,7 @@ def proxy_credential_response(
     refresh: Final = mint_session_refresh_token(bound_principal, signing.keys, signing.now, family=family)
     if not isinstance(refresh, MintedSessionToken):
         return _oauth_error(500, "server_error", "failed to mint the session credential")
-    credential: Final[_ProxyCredentialTokenResponse] = {
+    renewable: Final[_ProxyCredentialTokenResponse] = {
         "access_token": minted.key,
         "token_type": "Bearer",
         "expires_in": minted.expires_in,
@@ -1434,12 +1484,27 @@ def proxy_credential_response(
         "user_id": minted.user_id,
         "team_id": minted.team_id,
     }
+    credential: Final[_ProxyCredentialTokenResponse] = renewable if scope is None else {**renewable, "scope": scope}
     if issued_token_type is None:
         return JSONResponse(status_code=200, content=credential, headers=TOKEN_NO_CACHE_HEADERS)
     exchanged: Final[_ProxyCredentialTokenResponse] = {**credential, "issued_token_type": issued_token_type}
     return JSONResponse(status_code=200, content=exchanged, headers=TOKEN_NO_CACHE_HEADERS)
 
 
+def assertion_credential_response(minted: MintedProxyCredential, scope: str | None) -> Response:
+    """The proxy-API token response for an assertion grant: the same access token, with the
+    scope the assertion carried, and no refresh token."""
+    unscoped: Final[_ProxyCredentialTokenResponse] = {
+        "access_token": minted.key,
+        "token_type": "Bearer",
+        "expires_in": minted.expires_in,
+        "user_id": minted.user_id,
+        "team_id": minted.team_id,
+    }
+    credential: Final[_ProxyCredentialTokenResponse] = unscoped if scope is None else {**unscoped, "scope": scope}
+    return JSONResponse(status_code=200, content=credential, headers=TOKEN_NO_CACHE_HEADERS)
+
+
 def _reload_failure_response(failure: ReloadUserFailure) -> Response:
     """Map the live-user revalidation failure onto its OAuth error, exhaustively, so a new
     ``ReloadUserFailure`` member is a type error here rather than silently 400ing."""
@@ -1460,7 +1525,9 @@ def _subject_token_refusal_response(refusal: SubjectTokenRefusal) -> Response:
     match refusal.error:
         case "temporarily_unavailable":
             return _oauth_error(503, refusal.error, refusal.description)
-        case "unsupported_grant_type" | "invalid_request":
+        case "invalid_client":
+            return _oauth_error(401, refusal.error, refusal.description)
+        case "unsupported_grant_type" | "invalid_request" | "invalid_grant" | "invalid_scope":
             return _oauth_error(400, refusal.error, refusal.description)
         case _:
             assert_never(refusal.error)
@@ -1515,6 +1582,9 @@ async def aggregate_token(
     subject_token_type: str | None = None,
     requested_token_type: str | None = None,
     exchange_subject_token: ExchangeSubjectToken = _refuse_subject_token,
+    assertion: str | None = None,
+    client_secret: str | None = None,
+    redeem_assertion: RedeemAssertion = _refuse_assertion,
 ) -> Response:
     """The aggregate token verb: authorization_code and refresh_token grants for the
     identity-only session pair, or for the proxy-API credential when the grant was issued
@@ -1561,10 +1631,19 @@ async def aggregate_token(
             exchange_subject_token=exchange_subject_token,
             issue=issue,
         )
+    if grant_type == JWT_BEARER_GRANT_TYPE:
+        return await _jwt_bearer_grant(
+            request=request,
+            assertion=assertion,
+            client_id=client_id,
+            client_secret=client_secret,
+            redeem_assertion=redeem_assertion,
+            issue=issue,
+        )
     return _oauth_error(
         400,
         "unsupported_grant_type",
-        f"grant_type must be authorization_code, refresh_token, or {TOKEN_EXCHANGE_GRANT_TYPE}",
+        f"grant_type must be authorization_code, refresh_token, {TOKEN_EXCHANGE_GRANT_TYPE}, or {JWT_BEARER_GRANT_TYPE}",
     )
 
 
@@ -1690,6 +1769,48 @@ class _GrantIssuer:
             return _mint_failure_response(minted)
         return proxy_credential_response(minted, principal, self._signing, issued_token_type=ACCESS_TOKEN_TOKEN_TYPE)
 
+    async def redeem_assertion(
+        self, assertion: str, client_id: str, client_secret: str | None, redeem_assertion: RedeemAssertion
+    ) -> Response:
+        """The RFC 7523 tail: prove the assertion and the requesting app, claim the assertion's
+        ``jti`` before anything is minted (RFC 7523 section 3 makes a replayed ``jti`` a
+        rejection, and the identity provider mints a fresh assertion cheaply, so a mint that
+        fails after the claim costs the client one more round trip, never a replay window),
+        then mint the proxy credential the user is revalidated for. No refresh token comes
+        with it (RFC 7521 section 4.1): the app renews by asking its identity provider for a
+        fresh assertion, which keeps the user's standing there in the loop."""
+        target_refusal: Final = self._assertion_target_refusal()
+        if target_refusal is not None:
+            return target_refusal
+        identity: Final = await redeem_assertion(assertion, client_id, client_secret, self._request)
+        if isinstance(identity, SubjectTokenRefusal):
+            return _subject_token_refusal_response(identity)
+        refused: Final = _claim_refusal(
+            await self._guard.claim(identity.replay_key, identity.replay_ttl_seconds),
+            _oauth_error(400, "invalid_grant", "the assertion has already been redeemed"),
+        )
+        if refused is not None:
+            return refused
+        minted: Final = await self._mint_proxy_credential(
+            identity.user_id, identity.team_id, allowed_routes=identity.allowed_routes
+        )
+        if not isinstance(minted, MintedProxyCredential):
+            return _mint_failure_response(minted)
+        return assertion_credential_response(minted, identity.scope)
+
+    def _assertion_target_refusal(self) -> Response | None:
+        """An ID-JAG names the proxy origin or its MCP resource (``{base}/mcp``) as ``aud``, and an RFC
+        8707 client sends that same value as ``resource``, so both are this grant's targets."""
+        if self._resource is None or is_proxy_api_resource(self._request, self._resource):
+            return None
+        if self._resource.rstrip("/") == f"{get_request_base_url(self._request)}/mcp":
+            return None
+        return _oauth_error(
+            400,
+            "invalid_target",
+            "resource does not match the proxy API or MCP resource this gateway issues credentials for",
+        )
+
     def _proxy_api_target_refusal(self) -> Response | None:
         if self._resource is None or is_proxy_api_resource(self._request, self._resource):
             return None
@@ -1807,6 +1928,19 @@ async def refresh_proxy_credential(
     )
 
 
+async def _jwt_bearer_grant(
+    request: Request,
+    assertion: str | None,
+    client_id: str,
+    client_secret: str | None,
+    redeem_assertion: RedeemAssertion,
+    issue: _GrantIssuer,
+) -> Response:
+    if not assertion:
+        return _oauth_error(400, "invalid_request", "assertion is required")
+    return await issue.redeem_assertion(assertion, client_id, client_secret, redeem_assertion)
+
+
 async def _token_exchange_grant(
     subject_token: str | None,
     subject_token_type: str | None,
diff --git a/litellm/proxy/_experimental/mcp_server/id_jag_grant.py b/litellm/proxy/_experimental/mcp_server/id_jag_grant.py
new file mode 100644
index 00000000000..155d5280f5a
--- /dev/null
+++ b/litellm/proxy/_experimental/mcp_server/id_jag_grant.py
@@ -0,0 +1,540 @@
+"""The RFC 7523 jwt-bearer grant on ``POST /token``: a requesting app that obtained an
+ID-JAG (Identity Assertion Authorization Grant, the cross-app access profile) from the
+customer's identity provider redeems it for the same proxy-API credential ``lite login``
+stores. The assertion is proven with the JWT auth issuer and JWKS plumbing the proxy
+already trusts, its claims are checked the way the ID-JAG draft prescribes, the requesting
+app must be one the operator allowlisted, and the ``jti`` is single-use until the
+assertion expires."""
+
+from __future__ import annotations
+
+import base64
+import binascii
+import hashlib
+import hmac
+import math
+from collections.abc import Awaitable, Iterator, Mapping, Sequence
+from dataclasses import dataclass
+from datetime import datetime, timezone
+from functools import partial
+from types import MappingProxyType
+from typing import Final, Protocol
+from urllib.parse import unquote_plus
+
+import jwt
+from fastapi import Request
+
+from litellm._logging import verbose_proxy_logger
+from litellm.models.user import LiteLLM_UserTable
+from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import (
+    AssertionIdentity,
+    ConsentTeam,
+    SubjectIdentity,
+    SubjectTokenRefusal,
+)
+from litellm.proxy._experimental.mcp_server.idp_token_exchange import (
+    gateway_outage_refusal,
+    log_line,
+    read_token_exchange_prerequisites,
+)
+from litellm.proxy._experimental.mcp_server.oauth_utils import proxy_base_url_from_env
+from litellm.proxy._types import IdJagRequestingApp
+from litellm.proxy.auth.handle_jwt import ID_JAG_TYP, AssertionRejection, JWTHandler
+
+ID_JAG_REQUIRED_CLAIMS: Final = ("iss", "sub", "aud", "exp", "iat", "jti", "client_id")
+REJECTED_ASSERTION: Final = "assertion was rejected"
+TEAM_HEADER: Final = "x-litellm-team-id"
+_INACTIVE_SUBJECT: Final = frozenset(("no_active_key", "unresolvable"))
+_REPLAY_KEY_PREFIX: Final = "mcp_gateway_dcr:id_jag:"
+SCOPE_MCP: Final = "litellm:mcp"
+SCOPE_LLM: Final = "litellm:llm"
+SCOPE_ROUTE_GROUPS: Final = MappingProxyType(
+    {SCOPE_MCP: ("mcp_inference_routes",), SCOPE_LLM: ("llm_api_routes_without_mcp",)}
+)
+
+
+@dataclass(frozen=True, slots=True)
+class GrantedScope:
+    """What an assertion's ``scope`` claim buys: the scope echoed in the token response, exactly the
+    tokens enforced, and the route groups the credential is narrowed to. No claim means the full
+    credential, so both are ``None``."""
+
+    scope: str | None
+    allowed_routes: tuple[str, ...] | None
+
+
+def granted_scope(claim: object, *, mcp_resource: bool) -> GrantedScope | SubjectTokenRefusal:
+    """The routes the assertion buys. With ``aud`` the bare origin the ``scope`` claim decides and
+    no claim is the full credential. With ``aud`` the MCP resource (``{base}/mcp``) the identity
+    provider named that resource, so the credential is ceilinged to the MCP routes whatever the
+    claim says: ``litellm:llm`` cannot be granted and is refused."""
+    if claim is not None and not isinstance(claim, str):
+        return SubjectTokenRefusal(error="invalid_scope", description=_SCOPE_DESCRIPTION)
+    requested: Final = frozenset(claim.split()) if claim else frozenset()
+    if not requested <= SCOPE_ROUTE_GROUPS.keys():
+        return SubjectTokenRefusal(error="invalid_scope", description=_SCOPE_DESCRIPTION)
+    if mcp_resource:
+        if SCOPE_LLM in requested:
+            return SubjectTokenRefusal(error="invalid_scope", description=_MCP_RESOURCE_DESCRIPTION)
+        return GrantedScope(scope=SCOPE_MCP, allowed_routes=SCOPE_ROUTE_GROUPS[SCOPE_MCP])
+    if not requested:
+        return GrantedScope(scope=None, allowed_routes=None)
+    granted: Final = tuple(scope for scope in SCOPE_ROUTE_GROUPS if scope in requested)
+    return GrantedScope(scope=" ".join(granted), allowed_routes=tuple(_route_groups(granted)))
+
+
+def names_mcp_resource(aud: object, base_url: str | None) -> bool:
+    """Whether the verified ``aud`` names only the MCP resource, ``{base}/mcp``, and not the
+    authorization server itself (the bare origin)."""
+    audiences: Final = frozenset((aud,) if isinstance(aud, str) else aud if isinstance(aud, list) else ())
+    return base_url is not None and f"{base_url}/mcp" in audiences and base_url not in audiences
+
+
+def _route_groups(scopes: Sequence[str]) -> Iterator[str]:
+    for scope in scopes:
+        yield from SCOPE_ROUTE_GROUPS[scope]
+
+
+_SCOPE_DESCRIPTION: Final = (
+    f"scope must be {SCOPE_MCP} (MCP gateway routes), {SCOPE_LLM} (LLM API routes), or both, space separated"
+)
+_MCP_RESOURCE_DESCRIPTION: Final = (
+    f"the /mcp audience only grants MCP routes ({SCOPE_MCP}); use the bare origin as audience for LLM routes"
+)
+
+
+@dataclass(frozen=True, slots=True)
+class IdJagPrerequisites:
+    """The deployment-level gates for redeeming an ID-JAG: the JWT auth whose issuer plumbing
+    proves the assertion must be on, backed by a database, and licensed, not mapping IdP tokens to
+    virtual keys (whose blocks and budgets a minted credential would sidestep), with a shared Redis
+    so an assertion is redeemed once across every worker and replica (the in-memory marker is per
+    process, so a second worker would mint again), ``PROXY_BASE_URL``
+    must fix the gateway URL the assertion's ``aud`` has to name (a request's ``Host`` is the
+    caller's to choose), and the operator must have allowlisted the requesting apps. Discovery advertises the grant only when every gate
+    holds, and a redemption is refused naming the first one that does not."""
+
+    jwt_auth_enabled: bool
+    has_database: bool
+    licensed: bool
+    maps_jwts_to_virtual_keys: bool
+    shared_replay_store: bool
+    base_url: str | None
+    requesting_apps: tuple[IdJagRequestingApp, ...]
+
+    @property
+    def available(self) -> bool:
+        return (
+            self.jwt_auth_enabled
+            and self.has_database
+            and self.licensed
+            and not self.maps_jwts_to_virtual_keys
+            and self.shared_replay_store
+            and self.base_url is not None
+            and bool(self.requesting_apps)
+        )
+
+    def refusal(self) -> SubjectTokenRefusal | None:
+        if not self.jwt_auth_enabled:
+            return SubjectTokenRefusal(
+                error="unsupported_grant_type",
+                description="JWT auth is not enabled on this gateway, so it cannot redeem identity assertions",
+            )
+        if not self.has_database:
+            return SubjectTokenRefusal(
+                error="unsupported_grant_type",
+                description="this gateway has no database, so it cannot redeem identity assertions",
+            )
+        if not self.licensed:
+            return SubjectTokenRefusal(
+                error="unsupported_grant_type",
+                description="JWT auth is an enterprise only feature; no license is set",
+            )
+        if self.maps_jwts_to_virtual_keys:
+            return SubjectTokenRefusal(
+                error="unsupported_grant_type",
+                description="this gateway maps IdP tokens to virtual keys, which the jwt-bearer grant does not serve",
+            )
+        if not self.shared_replay_store:
+            return SubjectTokenRefusal(
+                error="unsupported_grant_type",
+                description="configure Redis (cache_params or coordination_redis) so this gateway can redeem an identity assertion exactly once across its workers",
+            )
+        if self.base_url is None:
+            return SubjectTokenRefusal(
+                error="unsupported_grant_type",
+                description="set PROXY_BASE_URL to this gateway's public URL, the audience an identity assertion must name",
+            )
+        if not self.requesting_apps:
+            return SubjectTokenRefusal(
+                error="unsupported_grant_type",
+                description="this gateway has no requesting apps allowlisted for identity assertions",
+            )
+        return None
+
+
+def read_id_jag_prerequisites() -> IdJagPrerequisites:
+    from litellm.proxy.proxy_server import (  # noqa: PLC0415  # rebound after startup, so read them per call
+        jwt_handler,
+        redis_usage_cache,
+    )
+
+    shared: Final = read_token_exchange_prerequisites()
+    return IdJagPrerequisites(
+        jwt_auth_enabled=shared.jwt_auth_enabled,
+        has_database=shared.has_database,
+        licensed=shared.licensed,
+        maps_jwts_to_virtual_keys=shared.maps_jwts_to_virtual_keys,
+        shared_replay_store=redis_usage_cache is not None,
+        base_url=proxy_base_url_from_env(),
+        requesting_apps=_requesting_apps(jwt_handler),
+    )
+
+
+def _requesting_apps(jwt_handler: JWTHandler) -> tuple[IdJagRequestingApp, ...]:
+    if not hasattr(jwt_handler, "litellm_jwtauth"):
+        return ()
+    return tuple(jwt_handler.litellm_jwtauth.id_jag_requesting_apps or ())
+
+
+def jwt_bearer_available() -> bool:
+    return read_id_jag_prerequisites().available
+
+
+def gateway_audiences(base_url: str | None) -> tuple[str, ...]:
+    """The issuer values this gateway answers to, which an ID-JAG's ``aud`` must name: its MCP
+    resource and its authorization server, both under the fixed ``PROXY_BASE_URL``."""
+    return () if base_url is None else (f"{base_url}/mcp", base_url)
+
+
+class DecodeAssertion(Protocol):
+    """Injected signature and claim verification ``(assertion, audience, required_claims)``:
+    ``JWTHandler.decode_trusted_assertion`` in production, which returns the verified claims,
+    a rejection, or raises when the gateway could not reach the issuer's keys."""
+
+    def __call__(
+        self, assertion: str, audience: Sequence[str], required_claims: Sequence[str], /
+    ) -> Awaitable[Mapping[str, object] | AssertionRejection]: ...
+
+
+class ClaimReader(Protocol):
+    """The JWT auth user mapping as ``JWTHandler`` exposes it: the litellm user id and email the
+    verified claims name through ``user_id_jwt_field`` and ``user_email_jwt_field``."""
+
+    def get_user_id(self, token: dict[str, object], default_value: str | None) -> str | None: ...
+
+    def get_user_email(self, token: dict[str, object], default_value: str | None) -> str | None: ...
+
+    def get_all_jwt_team_ids(self, token: dict[str, object]) -> list[str]: ...
+
+    def is_allowed_domain(self, user_email: str) -> bool: ...
+
+
+class ResolveSubject(Protocol):
+    """Injected subject lookup ``(claims, team_header)``: the litellm user the verified claims
+    name through the JWT auth user mapping (``user_id_jwt_field`` or ``user_email_jwt_field``,
+    else ``sub``) and the team the credential is minted for (see ``select_team``), ``None`` when
+    the gateway knows no such user, or a refusal when the team cannot be settled. Raises on a
+    database outage."""
+
+    def __call__(
+        self, claims: Mapping[str, object], team_header: str | None, /
+    ) -> Awaitable[SubjectIdentity | SubjectTokenRefusal | None]: ...
+
+
+class LookupUser(Protocol):
+    """Injected ``(user_id, user_email)`` lookup: the stored id of the existing litellm user the
+    claims name, ``None`` when the gateway knows no such user. Raises on a database outage."""
+
+    def __call__(self, user_id: str, user_email: str | None, /) -> Awaitable[str | None]: ...
+
+
+class LookupTeams(Protocol):
+    """Injected lookup of the teams a user is on, or the failure text when they cannot be read."""
+
+    def __call__(self, user_id: str, /) -> Awaitable[Sequence[ConsentTeam] | str]: ...
+
+
+class GetUser(Protocol):
+    def __call__(
+        self, *, user_id: str, user_email: str | None, sso_user_id: str
+    ) -> Awaitable[LiteLLM_UserTable | None]: ...
+
+
+def proxy_user_lookup(get_user: GetUser) -> LookupUser:
+    """``LookupUser`` over the proxy's user table. The assertion's subject is matched as the
+    local ``user_id`` and as the ``sso_user_id`` an SSO login linked, the way the JWT and SSO
+    login paths match it, so a linked account needs no email claim."""
+
+    async def lookup_user(user_id: str, user_email: str | None) -> str | None:
+        user: Final = await get_user(user_id=user_id, user_email=user_email, sso_user_id=user_id)
+        return None if user is None else user.user_id
+
+    return lookup_user
+
+
+def subject_resolver(reader: ClaimReader, lookup_user: LookupUser, lookup_teams: LookupTeams) -> ResolveSubject:
+    """``ResolveSubject`` over the JWT auth claim mapping and the proxy's user and team lookups."""
+
+    async def resolve_subject(
+        claims: Mapping[str, object], team_header: str | None
+    ) -> SubjectIdentity | SubjectTokenRefusal | None:
+        token: Final = dict(claims)
+        subject: Final = claims.get("sub")
+        claimed_user_id: Final = reader.get_user_id(token=token, default_value=None) or (
+            subject if isinstance(subject, str) else None
+        )
+        if claimed_user_id is None:
+            return None
+        user_email: Final = reader.get_user_email(token=token, default_value=None)
+        if not reader.is_allowed_domain(user_email or ""):
+            return SubjectTokenRefusal(
+                error="invalid_grant",
+                description="the assertion's subject email is missing or outside the allowed domain",
+            )
+        user_id: Final = await lookup_user(claimed_user_id, user_email)
+        if user_id is None:
+            return None
+        teams: Final = await lookup_teams(user_id)
+        if teams in _INACTIVE_SUBJECT:
+            return SubjectTokenRefusal(
+                error="invalid_grant", description="the assertion's subject is not an active user"
+            )
+        if isinstance(teams, str):
+            return SubjectTokenRefusal(
+                error="temporarily_unavailable", description="the gateway could not read this user's teams; retry"
+            )
+        team: Final = select_team(team_header, tuple(reader.get_all_jwt_team_ids(token=token)), teams)
+        if isinstance(team, SubjectTokenRefusal):
+            return team
+        return SubjectIdentity(user_id=user_id, team_id=team)
+
+    return resolve_subject
+
+
+def select_team(
+    team_header: str | None, claim_teams: Sequence[str], teams: Sequence[ConsentTeam]
+) -> str | None | SubjectTokenRefusal:
+    """The team an ID-JAG redemption mints for, settled before the assertion is consumed since
+    the minter refuses a teamless credential for a user who has a team. The ``x-litellm-team-id``
+    header (a team id or alias) wins and must name one of the user's teams, then the assertion's
+    mapped team claim, then the user's only team. A user on several teams must name one."""
+    if team_header is not None:
+        named: Final = next((team for team in teams if team_header in (team.team_id, team.team_alias)), None)
+        if named is None:
+            return SubjectTokenRefusal(
+                error="invalid_request", description=f"{TEAM_HEADER} does not name one of this user's teams"
+            )
+        return named.team_id
+    asserted: Final = tuple(team.team_id for team in teams if team.team_id in claim_teams)
+    if len(asserted) == 1:
+        return asserted[0]
+    if len(asserted) > 1:
+        return SubjectTokenRefusal(
+            error="invalid_request",
+            description=f"the assertion names several of this user's teams; send the {TEAM_HEADER} header naming the team for this credential",
+        )
+    if len(teams) == 1:
+        return teams[0].team_id
+    if teams:
+        return SubjectTokenRefusal(
+            error="invalid_request",
+            description=f"this user belongs to several teams; send the {TEAM_HEADER} header naming the team for this credential",
+        )
+    return None
+
+
+@dataclass(frozen=True, slots=True)
+class AssertionRedemption:
+    """One ``jwt-bearer`` request as the grant sees it: the assertion, how the requesting app
+    identified and authenticated itself, the team the credential is asked for, the issuer
+    values this gateway answers to (what the assertion's ``aud`` must name), the clock, and the
+    leeway the verifier grants ``exp``, so the replay marker outlives every moment the assertion
+    would still verify."""
+
+    assertion: str
+    client_id: str
+    client_secret: str | None
+    authorization_header: str | None
+    team_id: str | None
+    audiences: tuple[str, ...]
+    now: float
+    leeway_seconds: float
+
+
+async def redeem_id_jag_assertion(
+    assertion: str, client_id: str, client_secret: str | None, request: Request
+) -> AssertionIdentity | SubjectTokenRefusal:
+    from litellm.proxy._experimental.mcp_server.proxy_api_credentials import (  # noqa: PLC0415  # circular import at module load
+        lookup_consent_teams_from_database,
+    )
+    from litellm.proxy.auth.auth_checks import get_user_object  # noqa: PLC0415  # circular import at module load
+    from litellm.proxy.proxy_server import (  # noqa: PLC0415  # rebound after startup, so read them per call
+        jwt_handler,
+        prisma_client,
+        proxy_logging_obj,
+        user_api_key_cache,
+    )
+
+    resolve_subject: Final = subject_resolver(
+        _claim_reader(jwt_handler),
+        proxy_user_lookup(
+            partial(
+                get_user_object,
+                prisma_client=prisma_client,
+                user_api_key_cache=user_api_key_cache,
+                user_id_upsert=False,
+                proxy_logging_obj=proxy_logging_obj,
+                check_db_only=True,
+            )
+        ),
+        lookup_consent_teams_from_database,
+    )
+    prerequisites: Final = read_id_jag_prerequisites()
+    return await identity_from_id_jag(
+        AssertionRedemption(
+            assertion=assertion,
+            client_id=client_id,
+            client_secret=client_secret,
+            authorization_header=request.headers.get("authorization"),
+            team_id=request.headers.get(TEAM_HEADER),
+            audiences=gateway_audiences(prerequisites.base_url),
+            now=datetime.now(timezone.utc).timestamp(),
+            leeway_seconds=jwt_handler.leeway,
+        ),
+        prerequisites=prerequisites,
+        decode=jwt_handler.decode_trusted_assertion,
+        resolve_subject=resolve_subject,
+    )
+
+
+def _claim_reader(handler: ClaimReader) -> ClaimReader:
+    return handler
+
+
+async def identity_from_id_jag(
+    redemption: AssertionRedemption,
+    prerequisites: IdJagPrerequisites,
+    decode: DecodeAssertion,
+    resolve_subject: ResolveSubject,
+) -> AssertionIdentity | SubjectTokenRefusal:
+    """Prove an ID-JAG for the grant tail. The requesting app is checked first, the way a token
+    endpoint authenticates its client before it looks at the grant, so an app the operator never
+    allowlisted learns nothing about the assertion. Everything wrong with the assertion itself is
+    ``invalid_grant`` (RFC 7523 section 3.1), a check the gateway could not complete is
+    ``temporarily_unavailable``, and the reason stays in the proxy log because this endpoint is
+    public and the verifier's wording can quote the assertion."""
+    unmet: Final = prerequisites.refusal()
+    if unmet is not None:
+        return unmet
+    app: Final = next((app for app in prerequisites.requesting_apps if app.client_id == redemption.client_id), None)
+    if app is None:
+        return SubjectTokenRefusal(error="invalid_client", description="client_id is not an allowlisted requesting app")
+    if not _client_authenticated(app, redemption.client_secret, redemption.authorization_header):
+        return SubjectTokenRefusal(error="invalid_client", description="client authentication failed")
+    try:
+        header: Final = jwt.get_unverified_header(redemption.assertion)
+    except jwt.PyJWTError:
+        return SubjectTokenRefusal(error="invalid_grant", description="assertion is not a JWT")
+    if header.get("typ") != ID_JAG_TYP:
+        return SubjectTokenRefusal(error="invalid_grant", description=f"assertion typ must be {ID_JAG_TYP}")
+    try:
+        verified: Final = await decode(redemption.assertion, redemption.audiences, ID_JAG_REQUIRED_CLAIMS)
+    except Exception as denied:  # noqa: BLE001  # the verifier raises its 503 for a JWKS outage, and anything else is a bad assertion
+        return gateway_outage_refusal(denied, denied, what="an assertion", parameter="assertion") or _rejected(
+            str(denied)
+        )
+    if isinstance(verified, AssertionRejection):
+        return _rejected(verified.reason)
+    marker: Final = _replay_marker(verified, redemption)
+    if isinstance(marker, SubjectTokenRefusal):
+        return marker
+    replay_key, replay_ttl_seconds = marker
+    scope: Final = granted_scope(
+        verified.get("scope"), mcp_resource=names_mcp_resource(verified.get("aud"), prerequisites.base_url)
+    )
+    if isinstance(scope, SubjectTokenRefusal):
+        return scope
+    try:
+        subject: Final = await resolve_subject(verified, redemption.team_id)
+    except Exception as failed:  # noqa: BLE001  # the user lookup raises for a missing user and for a database outage alike
+        return gateway_outage_refusal(
+            failed, failed, what="an assertion's subject", parameter="assertion"
+        ) or _rejected(f"subject lookup failed: {failed}")
+    if subject is None:
+        return _rejected("the assertion names no user the gateway knows")
+    if isinstance(subject, SubjectTokenRefusal):
+        return subject
+    return AssertionIdentity(
+        user_id=subject.user_id,
+        team_id=subject.team_id,
+        replay_key=replay_key,
+        replay_ttl_seconds=replay_ttl_seconds,
+        scope=scope.scope,
+        allowed_routes=scope.allowed_routes,
+    )
+
+
+def _replay_marker(
+    verified: Mapping[str, object], redemption: AssertionRedemption
+) -> tuple[str, int] | SubjectTokenRefusal:
+    """The single-use key and its lifetime for a verified assertion, once the assertion is bound to
+    the presenting app, carries no proof-of-possession the gateway cannot check, and is still alive."""
+    if verified.get("client_id") != redemption.client_id:
+        return _rejected("the assertion's client_id is not the requesting app that presented it")
+    if "cnf" in verified:
+        return _rejected("the assertion is proof-bound and this gateway does not check proof of possession")
+    issuer: Final = verified.get("iss")
+    jti: Final = verified.get("jti")
+    exp: Final = verified.get("exp")
+    if not isinstance(issuer, str) or not isinstance(jti, str) or not jti or not isinstance(exp, (int, float)):
+        return _rejected("the assertion's iss, jti, or exp claim has the wrong shape")
+    replay_ttl_seconds: Final = math.ceil(exp + redemption.leeway_seconds - redemption.now)
+    if replay_ttl_seconds <= 0:
+        return _rejected("the assertion has expired")
+    return _REPLAY_KEY_PREFIX + hashlib.sha256(f"{issuer}\n{jti}".encode()).hexdigest(), replay_ttl_seconds
+
+
+def _rejected(reason: str) -> SubjectTokenRefusal:
+    verbose_proxy_logger.warning("jwt-bearer grant refused an assertion: %s", log_line(reason))
+    return SubjectTokenRefusal(error="invalid_grant", description=REJECTED_ASSERTION)
+
+
+def _client_authenticated(app: IdJagRequestingApp, form_secret: str | None, authorization_header: str | None) -> bool:
+    """A public app (no secret configured) is identified by ``client_id`` alone. A confidential
+    app must present its secret, by HTTP Basic (RFC 6749 section 2.3.1, the credentials
+    form-urlencoded inside the base64) or the ``client_secret`` form field, compared in constant
+    time."""
+    if app.client_secret is None:
+        return True
+    basic: Final = _basic_credentials(authorization_header)
+    if basic is not None:
+        return basic[0] == app.client_id and _same_secret(basic[1], app.client_secret)
+    return form_secret is not None and _same_secret(form_secret, app.client_secret)
+
+
+def _same_secret(presented: str, expected: str) -> bool:
+    return hmac.compare_digest(presented.encode(), expected.encode())
+
+
+def basic_client_id(authorization_header: str | None) -> str | None:
+    """The ``client_id`` an HTTP Basic ``Authorization`` header carries, for a confidential app
+    that leaves the form field out as RFC 6749 section 2.3.1 allows."""
+    credentials: Final = _basic_credentials(authorization_header)
+    return None if credentials is None else credentials[0]
+
+
+def _basic_credentials(authorization_header: str | None) -> tuple[str, str] | None:
+    if authorization_header is None:
+        return None
+    scheme, _, encoded = authorization_header.strip().partition(" ")
+    if scheme.lower() != "basic" or not encoded:
+        return None
+    try:
+        decoded: Final = base64.b64decode(encoded.strip(), validate=True).decode()
+    except (binascii.Error, UnicodeDecodeError):
+        return None
+    client_id, separator, secret = decoded.partition(":")
+    if not separator:
+        return None
+    return unquote_plus(client_id), unquote_plus(secret)
diff --git a/litellm/proxy/_experimental/mcp_server/idp_token_exchange.py b/litellm/proxy/_experimental/mcp_server/idp_token_exchange.py
index 15632eb4783..5044a5bd3dc 100644
--- a/litellm/proxy/_experimental/mcp_server/idp_token_exchange.py
+++ b/litellm/proxy/_experimental/mcp_server/idp_token_exchange.py
@@ -20,13 +20,15 @@ from litellm.proxy.db.exception_handler import PrismaDBExceptionHandler
 
 EXCHANGE_ROUTE: Final = "/token"
 REJECTED_SUBJECT_TOKEN: Final = "subject_token was rejected by the gateway's JWT auth"
-SUBJECT_TOKEN_CHECK_UNAVAILABLE: Final = (
-    "the gateway could not verify subject_token because its identity provider or database is unavailable; retry"
+_CHECK_UNAVAILABLE: Final = (
+    "the gateway could not verify {parameter} because its identity provider or database is unavailable; retry"
 )
-SUBJECT_TOKEN_CHECK_FAULTED: Final = (
-    "the gateway could not verify subject_token because its database reported a fault that is not a transient "
+_CHECK_FAULTED: Final = (
+    "the gateway could not verify {parameter} because its database reported a fault that is not a transient "
     "outage; retrying will not help until the gateway deployment is repaired"
 )
+SUBJECT_TOKEN_CHECK_UNAVAILABLE: Final = _CHECK_UNAVAILABLE.format(parameter="subject_token")
+SUBJECT_TOKEN_CHECK_FAULTED: Final = _CHECK_FAULTED.format(parameter="subject_token")
 GatewayOutage = Literal["retryable", "faulted"]
 
 
@@ -182,20 +184,37 @@ async def identity_from_subject_token(
 
 
 def _refusal_for(denied: Exception, reason: object) -> SubjectTokenRefusal:
+    outage: Final = gateway_outage_refusal(denied, reason, what="a subject_token", parameter="subject_token")
+    if outage is not None:
+        return outage
+    verbose_proxy_logger.warning("token exchange refused a subject_token: %s", log_line(reason))
+    return SubjectTokenRefusal(error="invalid_request", description=REJECTED_SUBJECT_TOKEN)
+
+
+def gateway_outage_refusal(denied: Exception, reason: object, what: str, parameter: str) -> SubjectTokenRefusal | None:
+    """The ``temporarily_unavailable`` refusal when ``denied`` is the gateway failing to check
+    ``what`` (its database or the IdP's JWKS down), naming the grant ``parameter`` it could not verify,
+    else ``None`` because the token itself was bad."""
     outage: Final = _gateway_could_not_verify(denied)
     if outage is None:
-        verbose_proxy_logger.warning("token exchange refused a subject_token: %s", reason)
-        return SubjectTokenRefusal(error="invalid_request", description=REJECTED_SUBJECT_TOKEN)
-    verbose_proxy_logger.error("token exchange could not verify a subject_token, %s: %s", outage, reason)
-    return SubjectTokenRefusal(error="temporarily_unavailable", description=_check_unavailable_description(outage))
+        return None
+    verbose_proxy_logger.error("token endpoint could not verify %s, %s: %s", what, outage, log_line(reason))
+    return SubjectTokenRefusal(
+        error="temporarily_unavailable", description=_check_unavailable_description(outage, parameter)
+    )
 
 
-def _check_unavailable_description(outage: GatewayOutage) -> str:
+def log_line(reason: object) -> str:
+    """``reason`` as one log line, so text a caller controls cannot forge log entries."""
+    return str(reason).replace("\r", " ").replace("\n", " ")
+
+
+def _check_unavailable_description(outage: GatewayOutage, parameter: str) -> str:
     match outage:
         case "retryable":
-            return SUBJECT_TOKEN_CHECK_UNAVAILABLE
+            return _CHECK_UNAVAILABLE.format(parameter=parameter)
         case "faulted":
-            return SUBJECT_TOKEN_CHECK_FAULTED
+            return _CHECK_FAULTED.format(parameter=parameter)
         case _:
             assert_never(outage)
 
diff --git a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
index fe34e18aecd..b724a61cd94 100644
--- a/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
+++ b/litellm/proxy/_experimental/mcp_server/mcp_server_manager.py
@@ -455,6 +455,7 @@ class MCPServerConfig(TypedDict, total=False):
     upstream_token_header: ReadOnly[str]
     id_jag_resource_token_endpoint: str
     id_jag_resource: str
+    id_jag_subject_source: ReadOnly[str]
     id_jag_resource_client_id: ReadOnly[str]
     id_jag_resource_client_secret: ReadOnly[str]
     client_private_key: str
@@ -2789,6 +2790,7 @@ class MCPServerManager:
                 # ID-JAG fields
                 id_jag_resource_token_endpoint=server_config.get("id_jag_resource_token_endpoint", None),
                 id_jag_resource=server_config.get("id_jag_resource", None),
+                id_jag_subject_source=server_config.get("id_jag_subject_source", None),
                 id_jag_resource_client_id=server_config.get("id_jag_resource_client_id", None),
                 id_jag_resource_client_secret=server_config.get("id_jag_resource_client_secret", None),
                 client_private_key=server_config.get("client_private_key", None),
@@ -3380,6 +3382,7 @@ class MCPServerManager:
                 credentials_dict.get("id_jag_resource_token_endpoint") if credentials_dict else None
             ),
             id_jag_resource=(credentials_dict.get("id_jag_resource") if credentials_dict else None),
+            id_jag_subject_source=(credentials_dict.get("id_jag_subject_source") if credentials_dict else None),
             id_jag_resource_client_id=(credentials_dict.get("id_jag_resource_client_id") if credentials_dict else None),
             id_jag_resource_client_secret=self._decrypt_credential_field(
                 credentials_dict.get("id_jag_resource_client_secret") if credentials_dict else None,
diff --git a/litellm/proxy/_experimental/mcp_server/oauth_utils.py b/litellm/proxy/_experimental/mcp_server/oauth_utils.py
index b0448a62c9e..133bad780bf 100644
--- a/litellm/proxy/_experimental/mcp_server/oauth_utils.py
+++ b/litellm/proxy/_experimental/mcp_server/oauth_utils.py
@@ -19,6 +19,9 @@ from litellm.proxy._experimental.mcp_server.auth.token_endpoint_auth import (
     build_token_endpoint_client_auth,
     normalize_token_endpoint_auth_method,
 )
+from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+    GOOGLE_REFRESH_TOKEN_PARAMS,
+)
 from litellm.proxy.auth.ip_address_utils import IPAddressUtils
 from litellm.proxy.middleware.per_request_root_path_middleware import get_request_root_path
 
@@ -59,7 +62,7 @@ _DEFAULT_NATIVE_REDIRECT_URIS: Final[list[str]] = [
 ]
 
 _GOOGLE_AUTHORIZATION_HOSTS: Final = frozenset({"accounts.google.com"})
-_GOOGLE_OFFLINE_ACCESS_PARAMS: Final = MappingProxyType({"access_type": "offline", "prompt": "consent"})
+_GOOGLE_OFFLINE_ACCESS_PARAMS: Final = GOOGLE_REFRESH_TOKEN_PARAMS
 
 _warned_invalid_proxy_base_url: str | None = None
 
@@ -128,6 +131,11 @@ def build_upstream_authorize_url(authorization_url: str, params: Mapping[str, st
     return urlunparse(parsed._replace(query=urlencode(merged)))
 
 
+def proxy_base_url_from_env() -> str | None:
+    """The gateway's fixed public URL from ``PROXY_BASE_URL``, ``None`` when unset or malformed."""
+    return _resolve_proxy_base_url_env()
+
+
 def _resolve_proxy_base_url_env() -> str | None:
     global _warned_invalid_proxy_base_url
     configured: Final = os.environ.get("PROXY_BASE_URL", "").strip()
diff --git a/litellm/proxy/_experimental/mcp_server/outbound_credentials/__init__.py b/litellm/proxy/_experimental/mcp_server/outbound_credentials/__init__.py
index 20fac28a55b..3260603c3ca 100644
--- a/litellm/proxy/_experimental/mcp_server/outbound_credentials/__init__.py
+++ b/litellm/proxy/_experimental/mcp_server/outbound_credentials/__init__.py
@@ -39,6 +39,7 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.types import (
     HeaderCarrier,
     IdJagConfig,
     IdJagResourceClient,
+    IdJagSubjectSource,
     NoneConfig,
     PassthroughConfig,
     PrivateKeyJwtAuth,
@@ -71,6 +72,7 @@ __all__ = [
     "HeaderCarrier",
     "IdJagConfig",
     "IdJagResourceClient",
+    "IdJagSubjectSource",
     "NoOpAuth",
     "NoneConfig",
     "Ok",
diff --git a/litellm/proxy/_experimental/mcp_server/outbound_credentials/adapter.py b/litellm/proxy/_experimental/mcp_server/outbound_credentials/adapter.py
index 935d026b22c..f217072bd39 100644
--- a/litellm/proxy/_experimental/mcp_server/outbound_credentials/adapter.py
+++ b/litellm/proxy/_experimental/mcp_server/outbound_credentials/adapter.py
@@ -34,6 +34,7 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.types import (
     CredError,
     IdJagConfig,
     IdJagResourceClient,
+    IdJagSubjectSource,
     NoneConfig,
     PassthroughConfig,
     PrivateKeyJwtAuth,
@@ -236,7 +237,8 @@ def _id_jag_spec(server: MCPServer, resource: str) -> ServerSpec | None:
     if not org_token_endpoint or not resource_token_endpoint or not client_id or client_auth is None:
         return None
     resource_client: Final = _id_jag_resource_client(server, client_id, client_auth)
-    if resource_client is None:
+    subject_source: Final = _id_jag_subject_source(server)
+    if resource_client is None or subject_source is None:
         return None
     return ServerSpec(
         server_id=server.server_id,
@@ -249,6 +251,7 @@ def _id_jag_spec(server: MCPServer, resource: str) -> ServerSpec | None:
             client_auth=client_auth,
             resource_client=resource_client,
             subject_token_type=_id_jag_subject_token_type(server),
+            subject_source=subject_source,
             audience=server.audience,
             resource=server.id_jag_resource,
             scopes=tuple(server.scopes or ()),
@@ -282,6 +285,18 @@ def _id_jag_client_auth(server: MCPServer) -> ClientAuth | None:
     return None
 
 
+def _id_jag_subject_source(server: MCPServer) -> IdJagSubjectSource | None:
+    """``None`` for a value that names no source, so the half-configured server defers like a missing
+    endpoint does instead of silently presenting the wrong token."""
+    configured: Final = server.id_jag_subject_source
+    if not configured:
+        return IdJagSubjectSource.login_assertion
+    try:
+        return IdJagSubjectSource(configured)
+    except ValueError:
+        return None
+
+
 def _id_jag_subject_token_type(server: MCPServer) -> str:
     """ID-JAG asserts the user's id_token, so the token-exchange access_token default maps to id_token;
     an explicitly configured value (e.g. a SAML2 assertion type) is honored verbatim."""
diff --git a/litellm/proxy/_experimental/mcp_server/outbound_credentials/login_assertion_exchange.py b/litellm/proxy/_experimental/mcp_server/outbound_credentials/login_assertion_exchange.py
new file mode 100644
index 00000000000..224f956bcfd
--- /dev/null
+++ b/litellm/proxy/_experimental/mcp_server/outbound_credentials/login_assertion_exchange.py
@@ -0,0 +1,216 @@
+"""Exchange the identity assertion captured at SSO login for a refresh token, at login.
+
+An ``oauth2_id_jag`` server configured with ``id_jag_subject_source: refresh_token`` does not present the
+login assertion on ID-JAG leg 1. It presents a refresh token that the IdP issued for that assertion through
+one RFC 8693 exchange (``requested_token_type`` refresh_token), which is how a SAML requesting app works at
+an IdP whose ID-JAG exchange does not take a ``saml2`` subject directly. That exchange has to happen at
+login: a SAML assertion is valid for minutes, the first MCP call that needs it can come hours later, and
+the refresh token outlives the assertion by as long as the IdP decides.
+
+The servers consulted are the two configuration authorities, the pod-local config declaration and the DB
+rows, like the retention gate, not the in-memory registry, which is a per-process snapshot that can lag a
+server added on another pod. The exchange authenticates as the ID-JAG server's own IdP client, since the
+refresh token is bound to the client that later spends it. One row holds one refresh token per user, so every server in this mode has
+to share one IdP client; a second client is logged and skipped rather than silently handed a token it
+cannot redeem. A refused or unreachable IdP never fails the login, the row keeps the plain assertion and
+the ID-JAG call reports the missing refresh token as the precondition it is.
+"""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Iterable, Mapping, Sequence
+from datetime import datetime, timezone
+from typing import Final, Protocol
+
+from litellm._logging import verbose_proxy_logger
+from litellm.proxy._experimental.mcp_server.outbound_credentials.result import Error, Ok, Result
+from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+    SSOIdentityAssertion,
+    with_login_refresh_token,
+)
+from litellm.proxy._experimental.mcp_server.outbound_credentials.token_endpoint import ExchangedToken
+from litellm.proxy._experimental.mcp_server.outbound_credentials.types import (
+    ClientAuth,
+    CredError,
+    IdJagConfig,
+    IdJagSubjectSource,
+    ServerSpec,
+)
+from litellm.proxy._types import LiteLLM_MCPServerTable
+from litellm.types.mcp import MCPAuth
+from litellm.types.mcp_server.mcp_server_manager import MCPServer
+
+_TOKEN_EXCHANGE_GRANT_TYPE: Final = "urn:ietf:params:oauth:grant-type:token-exchange"
+REFRESH_TOKEN_TOKEN_TYPE: Final = "urn:ietf:params:oauth:token-type:refresh_token"
+_LOGIN_EXCHANGE_DEADLINE_SECONDS: Final = 15.0
+
+_REFRESH_TOKEN_SCOPE: Final = "openid offline_access"
+_RUNTIME_APPROVAL_STATES: Final = (None, "active", "approved")  # the states get_runtime_mcp_server_rows serves
+
+
+class LoginExchangeCatalog(Protocol):
+    """The slice of the MCP server manager the login-time exchange reads."""
+
+    @property
+    def config_mcp_servers(self) -> Mapping[str, MCPServer]: ...
+
+    async def build_mcp_server_from_table(
+        self,
+        mcp_server: LiteLLM_MCPServerTable,
+        *,
+        credentials_are_encrypted: bool = True,
+        env_vars_are_encrypted: bool | None = None,
+        register_oauth_discovery: bool = True,
+    ) -> MCPServer: ...
+
+
+class TokenExchangeEndpoint(Protocol):
+    async def fetch(
+        self, endpoint: str, client_id: str, grant_params: Mapping[str, str], client_auth: ClientAuth
+    ) -> Result[ExchangedToken, CredError]: ...
+
+
+def _is_runtime_id_jag_row(row: LiteLLM_MCPServerTable) -> bool:
+    """An ID-JAG row the runtime registry would serve. A pending or rejected submission never gets a
+    login assertion posted to the token endpoint it names."""
+    return row.auth_type == MCPAuth.oauth2_id_jag and row.approval_status in _RUNTIME_APPROVAL_STATES
+
+
+async def login_exchange_servers(
+    catalog: LoginExchangeCatalog, db_rows: Sequence[LiteLLM_MCPServerTable]
+) -> tuple[MCPServer, ...]:
+    """Every server the exchange has to consider: the config-declared ones plus the approved ID-JAG rows
+    in the DB, built the same way the catalog builds them so their credentials are decrypted. A DB row
+    hides a config server with the same ``server_id``, exactly as the live catalog serves them."""
+    id_jag_rows: Final = tuple(row for row in db_rows if _is_runtime_id_jag_row(row))
+    db_servers: Final = tuple([await _built_or_skipped(catalog, row) for row in id_jag_rows])
+    db_by_id: Final = {server.server_id: server for server in db_servers if server is not None}
+    return tuple({**catalog.config_mcp_servers, **db_by_id}.values())
+
+
+async def _built_or_skipped(catalog: LoginExchangeCatalog, row: LiteLLM_MCPServerTable) -> MCPServer | None:
+    """One row that cannot be built (undecryptable credentials, a half-configured submission) is skipped
+    with a warning. It must not cost every other refresh-token server its login exchange."""
+    try:
+        return await catalog.build_mcp_server_from_table(row, register_oauth_discovery=False)
+    except Exception as exc:  # noqa: BLE001  # a per-row build failure is logged and isolated, not propagated
+        verbose_proxy_logger.warning(
+            "ID-JAG: MCP server row server_id=%s could not be built for the login-time refresh token exchange "
+            "and is skipped: %s",
+            row.server_id,
+            exc,
+        )
+        return None
+
+
+def refresh_token_exchange_targets(specs: Iterable[ServerSpec | None]) -> tuple[IdJagConfig, ...]:
+    """The ID-JAG configs that present a login refresh token, one per IdP client, in registration order."""
+    configs: Final = tuple(
+        spec.config
+        for spec in specs
+        if spec is not None
+        and isinstance(spec.config, IdJagConfig)
+        and spec.config.subject_source is IdJagSubjectSource.refresh_token
+    )
+    clients: Final = tuple((config.org_token_endpoint, config.client_id) for config in configs)
+    return tuple(config for index, config in enumerate(configs) if clients.index(clients[index]) == index)
+
+
+async def exchange_login_assertion_for_refresh_token(
+    assertion: SSOIdentityAssertion,
+    targets: tuple[IdJagConfig, ...],
+    token_endpoint: TokenExchangeEndpoint,
+    now: datetime,
+    deadline_seconds: float = _LOGIN_EXCHANGE_DEADLINE_SECONDS,
+) -> SSOIdentityAssertion:
+    """The assertion as captured when no server wants a refresh token, otherwise the assertion plus the
+    refresh token the first target's IdP client exchanged it for. An OIDC login's own SSO refresh token
+    does not count, it is bound to the SSO client and the ID-JAG client cannot redeem it."""
+    if not targets or assertion.exchanged_refresh_token is not None:
+        return assertion
+    config: Final = targets[0]
+    if len(targets) > 1:
+        verbose_proxy_logger.warning(
+            "ID-JAG: %d IdP clients are configured with id_jag_subject_source refresh_token; the login refresh "
+            "token is minted for client_id=%s at %s and servers using another client cannot redeem it.",
+            len(targets),
+            config.client_id,
+            config.org_token_endpoint,
+        )
+    params: Final = {
+        "grant_type": _TOKEN_EXCHANGE_GRANT_TYPE,
+        "requested_token_type": REFRESH_TOKEN_TOKEN_TYPE,
+        "subject_token": assertion.id_token.get_secret_value(),
+        "subject_token_type": assertion.subject_token_type or config.subject_token_type,
+        "scope": _REFRESH_TOKEN_SCOPE,
+    }
+    try:
+        outcome: Final = await asyncio.wait_for(
+            token_endpoint.fetch(config.org_token_endpoint, config.client_id, params, config.client_auth),
+            timeout=deadline_seconds,
+        )
+    except (TimeoutError, asyncio.TimeoutError):
+        verbose_proxy_logger.warning(
+            "ID-JAG: the IdP at %s did not answer the login-time refresh token exchange within %.0fs, so the login "
+            "finishes with the captured assertion only. Servers with id_jag_subject_source: refresh_token will ask "
+            "this user to sign in again.",
+            config.org_token_endpoint,
+            deadline_seconds,
+        )
+        return assertion
+    match outcome:
+        case Error(err):
+            verbose_proxy_logger.warning(
+                "ID-JAG: the IdP at %s refused to exchange the login assertion for a refresh token (%s); the "
+                "login goes on with the assertion alone and servers presenting a refresh token will ask the "
+                "user to sign in again.",
+                config.org_token_endpoint,
+                err.summary,
+            )
+            return assertion
+        case Ok(token):
+            verbose_proxy_logger.info(
+                "ID-JAG: exchanged the login assertion for a refresh token at %s (expires_in=%s)",
+                config.org_token_endpoint,
+                token.expires_in,
+            )
+            return with_login_refresh_token(
+                assertion,
+                token.access_token,
+                token.expires_in,
+                now,
+                endpoint=config.org_token_endpoint,
+                client_id=config.client_id,
+            )
+
+
+async def exchange_login_assertion_if_configured(
+    assertion: SSOIdentityAssertion | None,
+) -> SSOIdentityAssertion | None:
+    """The SSO-callback hook: consults the configured and DB-declared MCP servers and performs the
+    exchange when one of them presents a login refresh token. Nothing here can fail the login."""
+    if assertion is None:
+        return None
+    from litellm.proxy._experimental.mcp_server.db import get_all_mcp_servers  # noqa: PLC0415  # import cycle
+    from litellm.proxy._experimental.mcp_server.mcp_server_manager import (  # noqa: PLC0415  # avoids import cycle
+        global_mcp_server_manager,
+    )
+    from litellm.proxy._experimental.mcp_server.outbound_credentials.adapter import (  # noqa: PLC0415  # import cycle
+        to_server_spec,
+    )
+    from litellm.proxy._experimental.mcp_server.outbound_credentials.token_endpoint import (  # noqa: PLC0415  # cycle
+        TokenEndpointClient,
+    )
+    from litellm.proxy.proxy_server import prisma_client  # noqa: PLC0415  # runtime global
+
+    try:
+        db_rows: Final = () if prisma_client is None else await get_all_mcp_servers(prisma_client)
+        servers: Final = await login_exchange_servers(global_mcp_server_manager, db_rows)
+        targets: Final = refresh_token_exchange_targets(to_server_spec(server) for server in servers)
+        return await exchange_login_assertion_for_refresh_token(
+            assertion, targets, TokenEndpointClient(), datetime.now(timezone.utc)
+        )
+    except Exception as exc:  # noqa: BLE001  # the login itself must not fail on an egress-side exchange
+        verbose_proxy_logger.warning("ID-JAG: the login-time refresh token exchange failed unexpectedly: %s", exc)
+        return assertion
diff --git a/litellm/proxy/_experimental/mcp_server/outbound_credentials/resolver.py b/litellm/proxy/_experimental/mcp_server/outbound_credentials/resolver.py
index 66b44e91fd7..bd0813dd966 100644
--- a/litellm/proxy/_experimental/mcp_server/outbound_credentials/resolver.py
+++ b/litellm/proxy/_experimental/mcp_server/outbound_credentials/resolver.py
@@ -20,6 +20,7 @@ v2: no imports from v1.
 from __future__ import annotations
 
 import hashlib
+from dataclasses import dataclass
 from datetime import datetime, timezone
 from functools import partial
 from typing import Final
@@ -53,7 +54,10 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_r
 from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
     AssertionStoreUnavailable,
     SSOAssertionStore,
+    SSOIdentityAssertion,
     assertion_expired,
+    exchanged_refresh_token_issued_for,
+    login_refresh_token_expired,
 )
 from litellm.proxy._experimental.mcp_server.outbound_credentials.token_endpoint import (
     ExchangedToken,
@@ -75,6 +79,7 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.types import (
     ClientSecretAuth,
     CredError,
     IdJagConfig,
+    IdJagSubjectSource,
     NoneConfig,
     PassthroughConfig,
     PrivateKeyJwtAuth,
@@ -88,6 +93,15 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.types import (
 _TOKEN_EXCHANGE_GRANT_TYPE: Final = "urn:ietf:params:oauth:grant-type:token-exchange"
 _JWT_BEARER_GRANT_TYPE: Final = "urn:ietf:params:oauth:grant-type:jwt-bearer"
 _ID_JAG_REQUESTED_TOKEN_TYPE: Final = "urn:ietf:params:oauth:token-type:id-jag"
+_REFRESH_TOKEN_SUBJECT_TOKEN_TYPE: Final = "urn:ietf:params:oauth:token-type:refresh_token"
+
+
+@dataclass(frozen=True, slots=True)
+class _IdJagSubjectToken:
+    """What ID-JAG leg 1 asserts and the RFC 8693 type it is declared as."""
+
+    value: str
+    token_type: str
 
 
 class _NullOAuthTokenStore:
@@ -200,13 +214,15 @@ class UpstreamCredentialProvider:
     async def _id_jag(
         self, subject: Subject, server: ServerSpec, config: IdJagConfig
     ) -> Result[httpx2.Auth, CredError]:
-        match await self._id_jag_subject_token(subject):
+        match await self._id_jag_subject_token(subject, config):
             case Error(err):
                 return Error(err)
             case Ok(subject_token):
                 return await self._id_jag_exchange(subject, subject_token, server, config)
 
-    async def _id_jag_subject_token(self, subject: Subject) -> Result[str, CredError]:
+    async def _id_jag_subject_token(
+        self, subject: Subject, config: IdJagConfig
+    ) -> Result[_IdJagSubjectToken, CredError]:
         """The identity token ID-JAG leg 1 asserts, from the request or from the SSO login it was captured at.
 
         A caller that presents its own IdP identity token wins: that is the strongest available
@@ -223,7 +239,7 @@ class UpstreamCredentialProvider:
         a raised error so a DB blip cannot 500 the egress or the upstream-401 retry.
         """
         if subject.inbound_token is not None:
-            return Ok(subject.inbound_token.get_secret_value())
+            return Ok(_IdJagSubjectToken(subject.inbound_token.get_secret_value(), config.subject_token_type))
         if not subject.subject_id:
             return Error(
                 CredError.of_precondition_required(
@@ -232,7 +248,11 @@ class UpstreamCredentialProvider:
                 )
             )
         try:
-            assertion: Final = await self._sso_assertion_store.fetch(subject.subject_id)
+            assertion: Final = await (
+                self._sso_assertion_store.fetch_stored(subject.subject_id)
+                if config.subject_source is IdJagSubjectSource.refresh_token
+                else self._sso_assertion_store.fetch(subject.subject_id)
+            )
         except AssertionStoreUnavailable as exc:
             # The driver's message can name hosts, schemas or connection details, and this summary
             # is returned to the caller verbatim as a 503 body. Operators get it from the log.
@@ -253,6 +273,8 @@ class UpstreamCredentialProvider:
                     "Sign in through LiteLLM SSO so the gateway captures one."
                 )
             )
+        if config.subject_source is IdJagSubjectSource.refresh_token:
+            return _login_refresh_token_subject(assertion, config, datetime.now(timezone.utc))
         if assertion_expired(assertion, datetime.now(timezone.utc)):
             return Error(
                 CredError.of_precondition_required(
@@ -260,20 +282,24 @@ class UpstreamCredentialProvider:
                     "LiteLLM SSO again to capture a current one."
                 )
             )
-        return Ok(assertion.id_token.get_secret_value())
+        return Ok(
+            _IdJagSubjectToken(
+                assertion.id_token.get_secret_value(), assertion.subject_token_type or config.subject_token_type
+            )
+        )
 
     async def _id_jag_exchange(
-        self, subject: Subject, token: str, server: ServerSpec, config: IdJagConfig
+        self, subject: Subject, token: _IdJagSubjectToken, server: ServerSpec, config: IdJagConfig
     ) -> Result[httpx2.Auth, CredError]:
         slot: Final = _id_jag_slot_key(subject, server)
-        fingerprint: Final = _id_jag_fingerprint(token, server.server_id, config)
+        fingerprint: Final = _id_jag_fingerprint(token.value, server.server_id, config)
 
         async def _exchange() -> Result[ExchangedToken, CredError]:
             leg1_params: Final = {
                 "grant_type": _TOKEN_EXCHANGE_GRANT_TYPE,
                 "requested_token_type": _ID_JAG_REQUESTED_TOKEN_TYPE,
-                "subject_token": token,
-                "subject_token_type": config.subject_token_type,
+                "subject_token": token.value,
+                "subject_token_type": token.token_type,
                 **({"audience": config.audience} if config.audience else {}),
                 **({"resource": config.resource} if config.resource else {}),
                 **({"scope": " ".join(config.scopes)} if config.scopes else {}),
@@ -399,6 +425,41 @@ class UpstreamCredentialProvider:
             return None
 
 
+def _login_refresh_token_subject(
+    assertion: SSOIdentityAssertion, config: IdJagConfig, now: datetime
+) -> Result[_IdJagSubjectToken, CredError]:
+    """The subject for a server configured with ``id_jag_subject_source: refresh_token``: the refresh
+    token the ID-JAG client exchanged the login assertion for when the user signed in. Never the SSO
+    refresh token an OIDC login holds, that one is bound to the SSO client. The assertion's own expiry
+    does not apply here, a SAML assertion is spent minutes after login while the refresh token it
+    bought lives as long as the IdP said."""
+    if assertion.exchanged_refresh_token is None:
+        return Error(
+            CredError.of_precondition_required(
+                "This server mints its ID-JAG from a refresh token exchanged at SSO login and none is stored "
+                "for this user. Sign in through LiteLLM SSO again; if the login log shows the IdP refused the "
+                "exchange, the IdP client has to allow a refresh token for this requesting app."
+            )
+        )
+    if not exchanged_refresh_token_issued_for(assertion, config.org_token_endpoint, config.client_id):
+        return Error(
+            CredError.of_precondition_required(
+                "The refresh token exchanged at SSO login was minted for a different IdP client than this server "
+                "uses, so it cannot be presented here. Point every id_jag_subject_source: refresh_token server at "
+                "the same IdP client, then sign in through LiteLLM SSO again."
+            )
+        )
+    if login_refresh_token_expired(assertion, now):
+        return Error(
+            CredError.of_precondition_required(
+                "The refresh token exchanged at SSO login for this user has expired. Sign in through LiteLLM SSO again."
+            )
+        )
+    return Ok(
+        _IdJagSubjectToken(assertion.exchanged_refresh_token.get_secret_value(), _REFRESH_TOKEN_SUBJECT_TOKEN_TYPE)
+    )
+
+
 def _id_jag_slot_key(subject: Subject, server: ServerSpec) -> str:
     """Which cache slot this caller's bearer for this upstream lives in.
 
diff --git a/litellm/proxy/_experimental/mcp_server/outbound_credentials/sso_assertion_refresher.py b/litellm/proxy/_experimental/mcp_server/outbound_credentials/sso_assertion_refresher.py
index bca5848febe..ae5e9d0417e 100644
--- a/litellm/proxy/_experimental/mcp_server/outbound_credentials/sso_assertion_refresher.py
+++ b/litellm/proxy/_experimental/mcp_server/outbound_credentials/sso_assertion_refresher.py
@@ -12,15 +12,18 @@ not the size of the user table) and single-flighted per user through the same ``
 the ``authorization_code`` arm uses, because an IdP that rotates refresh tokens treats two concurrent
 redemptions of one token as replay and can revoke the whole grant chain.
 
-The refresh is redeemed against the generic-OIDC client the login itself used
-(``GENERIC_TOKEN_ENDPOINT`` / ``GENERIC_CLIENT_ID`` / ``GENERIC_CLIENT_SECRET``, which the proxy
-reconciles from the stored SSO row into the process environment at startup), authenticated the way
-that login authenticated: the non-PKCE path always sends HTTP Basic, while the PKCE path sends the
-credentials in the body when ``GENERIC_INCLUDE_CLIENT_ID`` is set, and an IdP application may accept
-only one of the two. An assertion can only exist if that client minted it, so no other client could
-redeem its refresh token, and no other method is known to be accepted. A deployment whose
-``GENERIC_SCOPE`` omits ``offline_access`` captures no refresh token at all, which is why that miss
-logs the scope by name rather than failing silently.
+The refresh is redeemed against the SSO client the login itself used, resolved in the same order
+the login callback dispatches (Google, then Microsoft, then generic OIDC, from the client ids the
+proxy reconciles from the stored SSO row into the process environment at startup), authenticated the
+way that login authenticated: the Google and Microsoft logins and the non-PKCE generic path send
+HTTP Basic, while the PKCE generic path sends the credentials in the body when
+``GENERIC_INCLUDE_CLIENT_ID`` is set, and an IdP application may accept only one of the two. An
+assertion can only exist if that client minted it, so no other client could redeem its refresh
+token, and no other method is known to be accepted. A login whose authorization request never asked
+for a refresh token captures none at all: the Google and Microsoft logins ask (``access_type=offline``,
+``offline_access``) only while an ``oauth2_id_jag`` server exists, and generic OIDC asks only when
+``GENERIC_SCOPE`` carries ``offline_access``, which is why that miss names the cause rather than
+failing silently.
 
 Failures are values internally (``Result[_, RefreshFailure]``). At the store boundary they collapse
 onto the protocol's existing two-outcome contract: a refusal returns the expired assertion unchanged
@@ -77,7 +80,9 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_s
     SSOIdentityAssertion,
     assertion_expired,
     assertion_from_sso_login,
+    carry_exchanged_refresh_token,
     fetch_sso_identity_assertion,
+    is_saml_assertion,
     persist_sso_identity_assertion,
 )
 from litellm.types.llms.custom_http import httpxSpecialProvider
@@ -92,6 +97,10 @@ _SINGLE_FLIGHT_KEY: Final = "sso_identity_assertion"
 # Renew this far ahead of ``exp`` so a token that would die between resolution and the second leg of
 # the exchange is replaced first. Matches the sibling per-user token store's skew.
 _DEFAULT_EXPIRY_SKEW_SECONDS: Final = 60.0
+# Where fastapi-sso's Google login redeemed the authorization code, read from Google's discovery
+# document; Microsoft's mirrors ``CustomMicrosoftSSO``, override first, tenant template second.
+_GOOGLE_TOKEN_ENDPOINT: Final = "https://oauth2.googleapis.com/token"
+_MICROSOFT_TOKEN_ENDPOINT_TEMPLATE: Final = "https://login.microsoftonline.com/{tenant}/oauth2/v2.0/token"
 
 
 class AssertionRead(Protocol):
@@ -122,7 +131,7 @@ class FormPost(Protocol):
 
 @dataclass(frozen=True, slots=True)
 class SSOClientConfig:
-    """The generic-OIDC client credentials a refresh_token grant has to authenticate as, and how."""
+    """The SSO client credentials a refresh_token grant has to authenticate as, and how."""
 
     token_endpoint: str
     client_id: str
@@ -131,32 +140,58 @@ class SSOClientConfig:
 
 
 def sso_client_config(env: Mapping[str, str]) -> SSOClientConfig | None:
-    """The configured generic-OIDC client, or ``None`` when the deployment has none.
+    """The configured SSO client the login used, or ``None`` when the deployment has none.
 
-    Read from the process environment because that is where the login path reads it
-    (``_setup_generic_sso_env_vars``) and where the proxy materializes the stored ``sso_config`` row
-    at startup, so this resolves to the same client that minted the assertion. ``None`` is an
-    ordinary state, not an error: a deployment signing in through a provider that captures no
+    Read from the process environment because that is where the login callback reads it and where
+    the proxy materializes the stored ``sso_config`` row at startup, and resolved in the callback's
+    own order (``GOOGLE_CLIENT_ID``, then ``MICROSOFT_CLIENT_ID``, then ``GENERIC_CLIENT_ID``, each
+    selecting its branch when set at all), so this is the same client that minted the assertion: a
+    deployment carrying both a Google and a generic client signed the user in through Google. ``None``
+    is an ordinary state, not an error: a deployment signing in through a provider that captures no
     assertion has nothing here to renew, and a client with no secret is not a confidential client
     that could redeem one.
 
-    ``auth_method`` is derived from the same ``GENERIC_INCLUDE_CLIENT_ID`` the login reads, because
-    the two login paths do not agree: the non-PKCE path always authenticates with HTTP Basic, while
-    the PKCE path puts the credentials in the body when that flag is set. Both capture assertions, so
-    a constant here would authenticate the renewal differently from the sign-in that produced the
+    ``auth_method`` follows how each login authenticated at the token endpoint. The Google and
+    Microsoft logins (fastapi-sso) and the non-PKCE generic path send HTTP Basic, while the PKCE
+    generic path puts the credentials in the body when ``GENERIC_INCLUDE_CLIENT_ID`` is set. A
+    constant here would authenticate the renewal differently from the sign-in that produced the
     refresh token and 401 against an IdP application registered for only one of the two.
     """
-    token_endpoint: Final = env.get("GENERIC_TOKEN_ENDPOINT")
-    client_id: Final = env.get("GENERIC_CLIENT_ID")
-    client_secret: Final = env.get("GENERIC_CLIENT_SECRET")
+    if env.get("GOOGLE_CLIENT_ID") is not None:
+        return _confidential_client(
+            _GOOGLE_TOKEN_ENDPOINT, env.get("GOOGLE_CLIENT_ID"), env.get("GOOGLE_CLIENT_SECRET"), "client_secret_basic"
+        )
+    if env.get("MICROSOFT_CLIENT_ID") is not None:
+        tenant: Final = env.get("MICROSOFT_TENANT")
+        return _confidential_client(
+            env.get("MICROSOFT_TOKEN_ENDPOINT")
+            or (_MICROSOFT_TOKEN_ENDPOINT_TEMPLATE.format(tenant=tenant) if tenant else None),
+            env.get("MICROSOFT_CLIENT_ID"),
+            env.get("MICROSOFT_CLIENT_SECRET"),
+            "client_secret_basic",
+        )
+    includes_client_id: Final = env.get("GENERIC_INCLUDE_CLIENT_ID", "false").lower() == "true"
+    return _confidential_client(
+        env.get("GENERIC_TOKEN_ENDPOINT"),
+        env.get("GENERIC_CLIENT_ID"),
+        env.get("GENERIC_CLIENT_SECRET"),
+        "client_secret_post" if includes_client_id else "client_secret_basic",
+    )
+
+
+def _confidential_client(
+    token_endpoint: str | None,
+    client_id: str | None,
+    client_secret: str | None,
+    auth_method: MCPTokenEndpointAuthMethod,
+) -> SSOClientConfig | None:
     if not token_endpoint or not client_id or not client_secret:
         return None
-    includes_client_id: Final = env.get("GENERIC_INCLUDE_CLIENT_ID", "false").lower() == "true"
     return SSOClientConfig(
         token_endpoint=token_endpoint,
         client_id=client_id,
         client_secret=SecretStr(client_secret),
-        auth_method="client_secret_post" if includes_client_id else "client_secret_basic",
+        auth_method=auth_method,
     )
 
 
@@ -260,11 +295,19 @@ class SSOAssertionRefresher:
     async def refresh(
         self, user_id: str, assertion: SSOIdentityAssertion
     ) -> Result[SSOIdentityAssertion, RefreshFailure]:
+        if is_saml_assertion(assertion):
+            verbose_proxy_logger.warning(
+                "ID-JAG: the stored SAML assertion for user_id=%s has reached its NotOnOrAfter. A SAML assertion "
+                "cannot be renewed, so the user has to sign in through SAML SSO again.",
+                user_id,
+            )
+            return Error(RefreshFailure.of_rejected("a SAML assertion cannot be renewed; sign in again"))
         if assertion.refresh_token is None:
             verbose_proxy_logger.warning(
                 "ID-JAG: the stored IdP identity assertion for user_id=%s has expired and no refresh token was "
-                "captured with it, so it cannot be renewed without another interactive sign-in. Add "
-                "'offline_access' to GENERIC_SCOPE so the SSO login captures one.",
+                "captured with it, so it cannot be renewed without another interactive sign-in. Google and Microsoft "
+                "logins ask for one once an oauth2_id_jag MCP server is registered, so a user who signed in before "
+                "that has to sign in again. Generic OIDC asks only with 'offline_access' in GENERIC_SCOPE.",
                 user_id,
             )
             return Error(RefreshFailure.of_rejected("no refresh token was captured at sign-in"))
@@ -272,11 +315,12 @@ class SSOAssertionRefresher:
         if config is None:
             verbose_proxy_logger.warning(
                 "ID-JAG: the stored IdP identity assertion for user_id=%s has expired and cannot be renewed "
-                "because the generic SSO client is not configured (GENERIC_TOKEN_ENDPOINT, GENERIC_CLIENT_ID, "
-                "GENERIC_CLIENT_SECRET).",
+                "because the active SSO provider has no confidential client configured (GOOGLE_CLIENT_ID and "
+                "GOOGLE_CLIENT_SECRET, MICROSOFT_CLIENT_ID with MICROSOFT_CLIENT_SECRET and MICROSOFT_TENANT, or "
+                "GENERIC_TOKEN_ENDPOINT with GENERIC_CLIENT_ID and GENERIC_CLIENT_SECRET).",
                 user_id,
             )
-            return Error(RefreshFailure.of_rejected("the generic SSO client is not configured"))
+            return Error(RefreshFailure.of_rejected("the SSO client is not configured"))
 
         carried_refresh_token: Final = assertion.refresh_token.get_secret_value()
         # Whichever method the SSO login used for this client, since that is the one the IdP
@@ -323,10 +367,11 @@ class SSOAssertionRefresher:
                 user_id,
             )
             return Error(RefreshFailure.of_rejected("the IdP's refresh response carried no usable id_token"))
-        failure: Final = await self._store_renewal(user_id, previous, renewed)
+        carried: Final = carry_exchanged_refresh_token(previous, renewed)
+        failure: Final = await self._store_renewal(user_id, previous, carried)
         if failure is not None:
             return Error(failure)
-        return Ok(renewed)
+        return Ok(carried)
 
     async def _store_renewal(
         self, user_id: str, previous: SSOIdentityAssertion, renewed: SSOIdentityAssertion
@@ -401,9 +446,12 @@ class RefreshingSSOAssertionStore:
         self._skew = timedelta(seconds=expiry_skew_seconds)
         self._clock = clock
 
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+        return await self._inner.fetch(user_id)
+
     async def fetch(self, user_id: str) -> SSOIdentityAssertion | None:
         assertion: Final = await self._inner.fetch(user_id)
-        if not self._expiring(assertion):
+        if assertion is None or is_saml_assertion(assertion) or not self._expiring(assertion):
             return assertion
         await self._coordinator().run(
             user_id,
diff --git a/litellm/proxy/_experimental/mcp_server/outbound_credentials/sso_assertion_store.py b/litellm/proxy/_experimental/mcp_server/outbound_credentials/sso_assertion_store.py
index 0bc17d94165..58494654082 100644
--- a/litellm/proxy/_experimental/mcp_server/outbound_credentials/sso_assertion_store.py
+++ b/litellm/proxy/_experimental/mcp_server/outbound_credentials/sso_assertion_store.py
@@ -1,9 +1,9 @@
 """Store for the enterprise IdP identity assertion captured at SSO login (EMA).
 
-The ``oauth2_id_jag`` egress arm needs the user's IdP ``id_token`` as its RFC 8693
-``subject_token``. A front-door client holds an identity-only ``llm_session_`` bearer, not an
-IdP assertion, so the assertion captured at the one SSO login is the only usable subject
-source for it. This module owns both sides of that state: the SSO callback persists here
+The ``oauth2_id_jag`` egress arm needs the user's IdP identity assertion as its RFC 8693
+``subject_token``: the OIDC ``id_token``, or the signed SAML assertion when the login was SAML.
+A front-door client holds an identity-only ``llm_session_`` bearer, not an IdP assertion, so
+the assertion captured at the one SSO login is the only usable subject source for it. This module owns both sides of that state: the SSO callback persists here
 (write-through to the DB so a login on one pod is visible to every pod) and the resolver
 seam reads back by ``user_id``. Retention is gated on an ``oauth2_id_jag`` server actually
 being registered, so a gateway with no EMA upstream never stores bearer material.
@@ -17,9 +17,11 @@ TTL ``MCP_SSO_ASSERTION_CACHE_TTL_SECONDS``; invalidation also guards against st
 
 from __future__ import annotations
 
+import base64
 import json
 from collections.abc import Mapping, Sequence
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
+from types import MappingProxyType
 from typing import TYPE_CHECKING, Final, Protocol
 
 import jwt
@@ -35,7 +37,15 @@ if TYPE_CHECKING:
 
     from litellm.proxy.utils import PrismaClient
 
+"""What a Google or Microsoft authorization request has to carry for the IdP to issue a refresh token
+beside the id_token. Asked for only while an ``oauth2_id_jag`` server exists to renew an assertion for, so
+a deployment without one sees no extra consent."""
+MICROSOFT_REFRESH_TOKEN_SCOPE: Final = "offline_access"
+GOOGLE_REFRESH_TOKEN_PARAMS: Final = MappingProxyType({"access_type": "offline", "prompt": "consent"})
+
+
 _ASSERTION_DECRYPT_LOG_KEY: Final = "sso_identity_assertion"
+SAML2_SUBJECT_TOKEN_TYPE: Final = "urn:ietf:params:oauth:token-type:saml2"
 _STR_ADAPTER: Final[TypeAdapter[str]] = TypeAdapter(str)
 _MAYBE_STR_ADAPTER: Final[TypeAdapter[str | None]] = TypeAdapter(str | None)
 
@@ -69,8 +79,10 @@ def _mcp_server_table(prisma_client: PrismaClient) -> _MCPServerTable:
 
 
 class SSOIdentityAssertion(LiteLLMBaseModel):
-    """The IdP material an EMA exchange needs: ``id_token`` is the RFC 8693 subject token,
-    ``expires_at`` bounds its usefulness, and the refresh token renews it without re-login."""
+    """The IdP material an EMA exchange needs: ``id_token`` is the RFC 8693 subject token (the OIDC
+    id_token, or the base64 signed ``<saml:Assertion>`` when ``subject_token_type`` names SAML),
+    ``expires_at`` bounds its usefulness, and the refresh token renews it without re-login.
+    ``subject_token_type`` is ``None`` when the exchange should send the operator-configured type."""
 
     model_config = ConfigDict(frozen=True)
 
@@ -78,6 +90,11 @@ class SSOIdentityAssertion(LiteLLMBaseModel):
     refresh_token: SecretStr | None = None
     issuer: str | None = None
     expires_at: datetime | None = None
+    subject_token_type: str | None = None
+    exchanged_refresh_token: SecretStr | None = None
+    exchanged_refresh_token_expires_at: datetime | None = None
+    exchanged_refresh_token_endpoint: str | None = None
+    exchanged_refresh_token_client_id: str | None = None
 
 
 class SSOAssertionCache:
@@ -130,6 +147,11 @@ class _StoredAssertionPayload(LiteLLMBaseModel):
     refresh_token: str | None = None
     issuer: str | None = None
     expires_at: datetime | None = None
+    subject_token_type: str | None = None
+    exchanged_refresh_token: str | None = None
+    exchanged_refresh_token_expires_at: datetime | None = None
+    exchanged_refresh_token_endpoint: str | None = None
+    exchanged_refresh_token_client_id: str | None = None
 
 
 def assertion_from_sso_login(id_token: object, refresh_token: object) -> SSOIdentityAssertion | None:
@@ -159,6 +181,85 @@ def assertion_from_sso_login(id_token: object, refresh_token: object) -> SSOIden
     )
 
 
+def assertion_from_saml_login(
+    assertion_xml: bytes, not_on_or_after: int | None, issuer: str | None
+) -> SSOIdentityAssertion:
+    """The carrier for a SAML login: the signed ``<saml:Assertion>`` element the IdP issued, base64
+    encoded the way RFC 8693 carries a ``saml2`` subject token, with its own validity window as
+    the expiry and no refresh token, since SAML has none and the user has to sign in again."""
+    return SSOIdentityAssertion(
+        id_token=SecretStr(base64.urlsafe_b64encode(assertion_xml).rstrip(b"=").decode("ascii")),
+        issuer=issuer,
+        expires_at=datetime.fromtimestamp(not_on_or_after, tz=timezone.utc) if not_on_or_after is not None else None,
+        subject_token_type=SAML2_SUBJECT_TOKEN_TYPE,
+    )
+
+
+def is_saml_assertion(assertion: SSOIdentityAssertion) -> bool:
+    return assertion.subject_token_type == SAML2_SUBJECT_TOKEN_TYPE
+
+
+def with_login_refresh_token(
+    assertion: SSOIdentityAssertion,
+    refresh_token: str,
+    expires_in: int | None,
+    now: datetime,
+    *,
+    endpoint: str | None = None,
+    client_id: str | None = None,
+) -> SSOIdentityAssertion:
+    """The same login, now also carrying the refresh token the ID-JAG client exchanged the assertion
+    for, with the lifetime the IdP gave that token. It is kept apart from ``refresh_token``, which an
+    OIDC login holds for the SSO client and which only that client can redeem. The assertion and its
+    own expiry stay as they were, so a server that presents the login assertion directly is unaffected."""
+    return assertion.model_copy(
+        update={
+            "exchanged_refresh_token": SecretStr(refresh_token),
+            "exchanged_refresh_token_expires_at": now + timedelta(seconds=expires_in)
+            if expires_in is not None
+            else None,
+            "exchanged_refresh_token_endpoint": endpoint,
+            "exchanged_refresh_token_client_id": client_id,
+        }
+    )
+
+
+def carry_exchanged_refresh_token(
+    previous: SSOIdentityAssertion, renewed: SSOIdentityAssertion
+) -> SSOIdentityAssertion:
+    """The renewed OIDC assertion still carrying the refresh token the ID-JAG client exchanged at login.
+    Renewal only replaces the id_token and the SSO refresh token, the exchanged one is unrelated to
+    them and stays valid for as long as the IdP said."""
+    return renewed.model_copy(
+        update={
+            "exchanged_refresh_token": previous.exchanged_refresh_token,
+            "exchanged_refresh_token_expires_at": previous.exchanged_refresh_token_expires_at,
+            "exchanged_refresh_token_endpoint": previous.exchanged_refresh_token_endpoint,
+            "exchanged_refresh_token_client_id": previous.exchanged_refresh_token_client_id,
+        }
+    )
+
+
+def exchanged_refresh_token_issued_for(assertion: SSOIdentityAssertion, endpoint: str, client_id: str) -> bool:
+    """Whether the exchanged refresh token was minted at this token endpoint for this client. A refresh
+    token is bound to the client that received it, so one minted for another server's IdP client must
+    never be posted to this server's endpoint."""
+    return (
+        assertion.exchanged_refresh_token_endpoint == endpoint
+        and assertion.exchanged_refresh_token_client_id == client_id
+    )
+
+
+def login_refresh_token_expired(assertion: SSOIdentityAssertion, now: datetime) -> bool:
+    """Whether the refresh token exchanged at login has passed the lifetime the IdP gave it. One
+    with no recorded lifetime is left for the IdP to judge, like an assertion with no ``exp``."""
+    expires_at: Final = assertion.exchanged_refresh_token_expires_at
+    if expires_at is None:
+        return False
+    normalized: Final = expires_at if expires_at.tzinfo is not None else expires_at.replace(tzinfo=timezone.utc)
+    return normalized <= now
+
+
 def assertion_expired(assertion: SSOIdentityAssertion, now: datetime) -> bool:
     """Whether the assertion's ``exp`` has passed at ``now``. An assertion carrying no expiry is
     treated as usable and left for the IdP to reject, since the store records what the id_token
@@ -212,6 +313,27 @@ async def persist_sso_identity_assertion(
         **({"refresh_token": assertion.refresh_token.get_secret_value()} if assertion.refresh_token else {}),
         **({"issuer": assertion.issuer} if assertion.issuer else {}),
         **({"expires_at": assertion.expires_at.isoformat()} if assertion.expires_at else {}),
+        **({"subject_token_type": assertion.subject_token_type} if assertion.subject_token_type else {}),
+        **(
+            {"exchanged_refresh_token": assertion.exchanged_refresh_token.get_secret_value()}
+            if assertion.exchanged_refresh_token
+            else {}
+        ),
+        **(
+            {"exchanged_refresh_token_expires_at": assertion.exchanged_refresh_token_expires_at.isoformat()}
+            if assertion.exchanged_refresh_token_expires_at
+            else {}
+        ),
+        **(
+            {"exchanged_refresh_token_endpoint": assertion.exchanged_refresh_token_endpoint}
+            if assertion.exchanged_refresh_token_endpoint
+            else {}
+        ),
+        **(
+            {"exchanged_refresh_token_client_id": assertion.exchanged_refresh_token_client_id}
+            if assertion.exchanged_refresh_token_client_id
+            else {}
+        ),
     }
     encoded: Final = _STR_ADAPTER.validate_python(encrypt_value_helper(json.dumps(payload)))
     await _assertion_table(prisma_client).upsert(
@@ -250,6 +372,11 @@ async def _read_assertion_from_db(user_id: str) -> SSOIdentityAssertion | None:
         refresh_token=SecretStr(payload.refresh_token) if payload.refresh_token else None,
         issuer=payload.issuer,
         expires_at=payload.expires_at,
+        subject_token_type=payload.subject_token_type,
+        exchanged_refresh_token=SecretStr(payload.exchanged_refresh_token) if payload.exchanged_refresh_token else None,
+        exchanged_refresh_token_expires_at=payload.exchanged_refresh_token_expires_at,
+        exchanged_refresh_token_endpoint=payload.exchanged_refresh_token_endpoint,
+        exchanged_refresh_token_client_id=payload.exchanged_refresh_token_client_id,
     )
 
 
@@ -290,6 +417,12 @@ class SSOAssertionStore(Protocol):
 
     async def fetch(self, user_id: str) -> SSOIdentityAssertion | None: ...
 
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+        """The row as stored, never renewed on the way out. For a server that presents the refresh
+        token exchanged at login, the SSO id_token's own lifetime is irrelevant and an SSO renewal
+        failing must not stand between that server and a still valid refresh token."""
+        ...
+
 
 class DbSSOAssertionStore:
     """The live store: the row the SSO callback wrote, read back by ``user_id``.
@@ -308,6 +441,9 @@ class DbSSOAssertionStore:
         except Exception as exc:  # noqa: BLE001  # any driver/storage failure is an outage, not an absence
             raise AssertionStoreUnavailable(str(exc)) from exc
 
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+        return await self.fetch(user_id)
+
     async def fetch_uncached(self, user_id: str) -> SSOIdentityAssertion | None:
         try:
             return await _read_assertion_from_db(user_id)
diff --git a/litellm/proxy/_experimental/mcp_server/outbound_credentials/types.py b/litellm/proxy/_experimental/mcp_server/outbound_credentials/types.py
index 71745a560f3..45c53af9349 100644
--- a/litellm/proxy/_experimental/mcp_server/outbound_credentials/types.py
+++ b/litellm/proxy/_experimental/mcp_server/outbound_credentials/types.py
@@ -349,6 +349,14 @@ class IdJagResourceClient(LiteLLMBaseModel):
     client_auth: ClientAuth
 
 
+class IdJagSubjectSource(str, Enum):
+    """What ID-JAG leg 1 presents as the RFC 8693 subject_token: the identity assertion captured at SSO
+    login, or the refresh token that assertion was exchanged for at the IdP when the user logged in."""
+
+    login_assertion = "login_assertion"
+    refresh_token = "refresh_token"
+
+
 class IdJagConfig(HeaderCarrier):
     """draft-ietf-oauth-identity-assertion-authz-grant (Okta "AI agent token exchange").
 
@@ -368,6 +376,7 @@ class IdJagConfig(HeaderCarrier):
     client_auth: ClientAuth
     resource_client: IdJagResourceClient
     subject_token_type: str = "urn:ietf:params:oauth:token-type:id_token"
+    subject_source: IdJagSubjectSource = IdJagSubjectSource.login_assertion
     audience: str | None = None
     resource: str | None = None
     scopes: tuple[str, ...] = ()
diff --git a/litellm/proxy/_experimental/mcp_server/proxy_api_credentials.py b/litellm/proxy/_experimental/mcp_server/proxy_api_credentials.py
index 2f7fcaef645..fd637a2f187 100644
--- a/litellm/proxy/_experimental/mcp_server/proxy_api_credentials.py
+++ b/litellm/proxy/_experimental/mcp_server/proxy_api_credentials.py
@@ -25,7 +25,16 @@ from litellm.proxy.management_endpoints.ui_sso import (
 
 
 async def lookup_consent_teams(user_id: str) -> tuple[ConsentTeam, ...] | ReloadUserFailure:
-    user: Final = await load_active_user_by_id(user_id)
+    return await _consent_teams(await load_active_user_by_id(user_id))
+
+
+async def lookup_consent_teams_from_database(user_id: str) -> tuple[ConsentTeam, ...] | ReloadUserFailure:
+    """The same teams read from the database row, for a grant that is consumed once it is settled: the
+    membership the minter will re-check must be the membership the team was picked from."""
+    return await _consent_teams(await load_active_user_by_id(user_id, source="database"))
+
+
+async def _consent_teams(user: LiteLLM_UserTable | ReloadUserFailure) -> tuple[ConsentTeam, ...] | ReloadUserFailure:
     if isinstance(user, str):
         return user
     details: Final = await _team_details(user.teams)
@@ -39,7 +48,7 @@ async def lookup_consent_teams(user_id: str) -> tuple[ConsentTeam, ...] | Reload
 
 
 async def mint_proxy_credential(
-    user_id: str, team_id: str | None
+    user_id: str, team_id: str | None, *, allowed_routes: Sequence[str] | None = None
 ) -> MintedProxyCredential | ProxyCredentialMintFailure:
     """Mint the ``lite login`` credential for a consented grant. Membership is checked
     live against the database row, so a team the user left between consent and redemption (or between refreshes)
@@ -53,7 +62,9 @@ async def mint_proxy_credential(
     user row handed to the minter carries no team list, exactly like ``lite login``'s, so
     the minter's own first-team fallback stays inert. The credential carries the role the
     proxy already enforces for the user on every request, so a row with no role (JWT auth's
-    upsert writes none) mints as an internal user instead of being refused."""
+    upsert writes none) mints as an internal user instead of being refused. ``allowed_routes``
+    narrows the credential to those route groups, the way a virtual key's ``allowed_routes`` does,
+    for a grant whose scope asked for less than the full credential."""
     user: Final = await load_active_user_by_id(user_id, source="database")
     if isinstance(user, str):
         return user
@@ -75,6 +86,7 @@ async def mint_proxy_credential(
         team_alias=selected.team_alias,
         team_models=selected.team_models,
         team_model_aliases=selected.team_model_aliases,
+        allowed_routes=allowed_routes,
     )
     return MintedProxyCredential(
         key=key,
diff --git a/litellm/proxy/_experimental/mcp_server/subscriptions.py b/litellm/proxy/_experimental/mcp_server/subscriptions.py
index dcf24f974fe..db622ea3cbf 100644
--- a/litellm/proxy/_experimental/mcp_server/subscriptions.py
+++ b/litellm/proxy/_experimental/mcp_server/subscriptions.py
@@ -55,6 +55,7 @@ from litellm.proxy._experimental.mcp_server.catalog import (
 )
 from litellm.proxy._experimental.mcp_server.contracts import OperationContext
 from litellm.proxy._types import UserAPIKeyAuth
+from litellm.proxy.common_utils.proxy_rate_limit_error import ProxyRateLimitError
 from litellm.types.mcp import MCP_LEGACY_VERSIONS
 from litellm.types.mcp_server.mcp_server_manager import MCPServer
 
@@ -300,6 +301,29 @@ async def _listing(event: ServerEvent, context: OperationContext) -> str | None:
     raise MCPError(code=-32603, message="Subscription catalog exceeds the pagination limit")
 
 
+async def _enforce_rate_limit(context: OperationContext, server: MCPServer) -> None:
+    await operations._enforce_mcp_server_rate_limit(context.user_api_key_auth, server)  # pyright: ignore[reportPrivateUsage]  # same admission policy as other gateway operations
+
+
+async def _unmetered(_: OperationContext, __: MCPServer) -> None:
+    return None
+
+
+async def _admitted() -> ProxyRateLimitError | None:
+    return None
+
+
+@asynccontextmanager
+async def _listener_admission(targets: tuple[SubscriptionTarget, ...]) -> AsyncGenerator[None]:
+    scope: Final = operations._mcp_server_admission_memo.set(  # pyright: ignore[reportPrivateUsage]  # the listener's own catalog refreshes reuse its admission
+        {target.server.server_id: asyncio.create_task(_admitted()) for target in targets}
+    )
+    try:
+        yield
+    finally:
+        operations._mcp_server_admission_memo.reset(scope)  # pyright: ignore[reportPrivateUsage]  # restore the caller's admission scope
+
+
 async def _recheck_authorization(check: Callable[[], Awaitable[OperationContext]]) -> None:
     while True:
         await asyncio.sleep(15)
@@ -361,7 +385,7 @@ class GatewaySubscriptions:
         if ctx.protocol_version != "2026-07-28":
             raise MCPError(code=-32601, message="Subscriptions require the modern MCP protocol")
         async with self._capacity(owner):
-            return await self._listen(ctx, params, authorize)
+            return await self._listen(ctx, params, authorize, _enforce_rate_limit)
 
     @asynccontextmanager
     async def _capacity(self, owner: str) -> AsyncGenerator[None]:
@@ -414,6 +438,7 @@ class GatewaySubscriptions:
                     ctx,
                     SubscriptionFilter(tools_list_changed=True, prompts_list_changed=True, resources_list_changed=True),
                     authorization,
+                    _unmetered,
                 )
                 if (ready := self._initializing.get(key)) is not None:
                     ready.set()
@@ -427,6 +452,7 @@ class GatewaySubscriptions:
         ctx: ServerRequestContext,
         notifications: SubscriptionFilter,
         authorization: SubscriptionAuthorization,
+        admit: Callable[[OperationContext, MCPServer], Awaitable[None]],
         scope: anyio.CancelScope | None = None,
         *,
         task_status: TaskStatus[None],
@@ -443,7 +469,7 @@ class GatewaySubscriptions:
 
             async with self._capacity(authorization.owner):
                 await self._listen(
-                    ctx, SubscriptionsListenRequestParams(notifications=notifications), authorization, ready
+                    ctx, SubscriptionsListenRequestParams(notifications=notifications), authorization, admit, ready
                 )
 
     async def legacy_resource(self, ctx: ServerRequestContext, uri: str, *, subscribe: bool) -> None:
@@ -464,6 +490,7 @@ class GatewaySubscriptions:
                     ctx,
                     SubscriptionFilter(resource_subscriptions=[uri]),
                     state.authorization,
+                    _enforce_rate_limit,
                     scope,
                 )
                 state.resources = {**state.resources, uri: scope}
@@ -476,6 +503,7 @@ class GatewaySubscriptions:
         ctx: ServerRequestContext,
         params: SubscriptionsListenRequestParams,
         authorize: Callable[[], Awaitable[OperationContext]],
+        admit: Callable[[OperationContext, MCPServer], Awaitable[None]],
         ready: Callable[[SubscriptionFilter], None] | None = None,
     ) -> SubscriptionsListenResult:
         context: Final = await authorize()
@@ -501,7 +529,7 @@ class GatewaySubscriptions:
             return fresh
 
         async def relay(target: SubscriptionTarget, *, task_status: TaskStatus[SubscriptionFilter]) -> None:
-            await operations._enforce_mcp_server_rate_limit(context.user_api_key_auth, target.server)  # pyright: ignore[reportPrivateUsage]  # same admission policy as other gateway operations
+            await admit(context, target.server)
 
             legacy: Final = LegacyNotifications()
 
@@ -567,7 +595,7 @@ class GatewaySubscriptions:
             finally:
                 self._upstream_slots.release()
 
-        async with anyio.create_task_group() as group:
+        async with _listener_admission(targets), anyio.create_task_group() as group:
             honored: Final = tuple(
                 [SubscriptionFilter.model_validate(await group.start(relay, target)) for target in targets]
             )
diff --git a/litellm/proxy/_lazy_features.py b/litellm/proxy/_lazy_features.py
index a909a7a993a..a7adb5c1bf5 100644
--- a/litellm/proxy/_lazy_features.py
+++ b/litellm/proxy/_lazy_features.py
@@ -155,18 +155,13 @@ LAZY_FEATURES: Final[tuple[LazyFeature, ...]] = (
         module_path="litellm.proxy.management_endpoints.mcp_management_endpoints",
         path_prefixes=("/v1/mcp/",),
     ),
-    LazyFeature(
-        # Also serves /.well-known/oauth-* (OAuth metadata discovery).
-        # No /mcp/oauth prefix here: the mounted /mcp sub-app would
-        # shadow it, and there are no actual routes there anyway.
-        name="mcp_byok_oauth",
-        module_path="litellm.proxy._experimental.mcp_server.byok_oauth_endpoints",
-        path_prefixes=("/v1/mcp/oauth", "/.well-known/oauth-"),
-    ),
     LazyFeature(
         # Serves OAuth dance endpoints (/authorize, /token, /callback,
         # /register) plus several /.well-known/ discovery URLs at the proxy
         # root — needed for MCP-over-OAuth flows even before /mcp is hit.
+        # Registered before mcp_byok_oauth, which also claims the root
+        # /.well-known/oauth-authorization-server: the root document is the
+        # gateway's own authorization server metadata (token endpoint /token).
         name="mcp_discoverable",
         module_path="litellm.proxy._experimental.mcp_server.discoverable_endpoints",
         path_prefixes=(
@@ -185,6 +180,14 @@ LAZY_FEATURES: Final[tuple[LazyFeature, ...]] = (
         # Catches the /{mcp_server_name}/authorize|token|register variants.
         path_suffixes=("/authorize", "/token", "/register"),
     ),
+    LazyFeature(
+        # Also serves /.well-known/oauth-* (OAuth metadata discovery).
+        # No /mcp/oauth prefix here: the mounted /mcp sub-app would
+        # shadow it, and there are no actual routes there anyway.
+        name="mcp_byok_oauth",
+        module_path="litellm.proxy._experimental.mcp_server.byok_oauth_endpoints",
+        path_prefixes=("/v1/mcp/oauth", "/.well-known/oauth-"),
+    ),
     LazyFeature(
         name="mcp_rest",
         module_path="litellm.proxy._experimental.mcp_server.rest_endpoints",
diff --git a/litellm/proxy/_lazy_openapi_snapshot.json b/litellm/proxy/_lazy_openapi_snapshot.json
index 20819a59a43..961d32ab664 100644
--- a/litellm/proxy/_lazy_openapi_snapshot.json
+++ b/litellm/proxy/_lazy_openapi_snapshot.json
@@ -14261,6 +14261,19 @@
               "description": "Whether to fail the request if the guardrail encounters an error. Implemented by guardrail='model_armor', 'generic_guardrail_api' and 'crowdstrike_aidr'. True (default) raises the error. False logs a critical error and lets the request proceed, so only a valid guardrail response can block or modify it.",
               "title": "Fail On Error"
             },
+            "forward_messages_as_sent": {
+              "anyOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "default": false,
+              "description": "Only honored by guardrail='generic_guardrail_api'. When True, structured_messages reaches the guardrail exactly as the client sent it, so rows can carry provider-native content blocks and keys the OpenAI chat types do not declare. Default False sends OpenAI-format chat rows with undeclared keys removed.",
+              "title": "Forward Messages As Sent"
+            },
             "guard_name": {
               "anyOf": [
                 {
@@ -16612,6 +16625,19 @@
               "description": "HTTP timeout in seconds for checking attached files. Default: 10.",
               "title": "File Guardrail Timeout"
             },
+            "forward_messages_as_sent": {
+              "anyOf": [
+                {
+                  "type": "boolean"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "default": false,
+              "description": "Only honored by guardrail='generic_guardrail_api'. When True, structured_messages reaches the guardrail exactly as the client sent it, so rows can carry provider-native content blocks and keys the OpenAI chat types do not declare. Default False sends OpenAI-format chat rows with undeclared keys removed.",
+              "title": "Forward Messages As Sent"
+            },
             "gateway_name": {
               "anyOf": [
                 {
@@ -34541,6 +34567,17 @@
               ],
               "title": "Id Jag Resource Token Endpoint"
             },
+            "id_jag_subject_source": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "title": "Id Jag Subject Source"
+            },
             "redirect_uris": {
               "anyOf": [
                 {
@@ -35771,7 +35808,7 @@
       "/.well-known/oauth-authorization-server": {
         "get": {
           "description": "OAuth authorization server discovery endpoint.\n\nSupports both legacy pattern (/{server_name}) and root endpoint.",
-          "operationId": "oauth_authorization_server_mcp__well_known_oauth_authorization_server_get",
+          "operationId": "oauth_authorization_server_mcp__well_known_oauth_authorization_server_get_2",
           "parameters": [
             {
               "in": "query",
@@ -35819,7 +35856,7 @@
       "/.well-known/oauth-authorization-server/mcp": {
         "get": {
           "description": "OAuth authorization server discovery for the aggregate /mcp endpoint, the RFC 8414\npath-inserted form for a client that treats {base}/mcp as its authorization base URL.\n\nThe single-segment /mcp is reserved for the aggregate so the discovery chain stays\nconsistent: the aggregate protected-resource document advertises {base}/mcp as its\nauthorization server, so the document served here must have issuer {base}/mcp. A server\nliterally named ``mcp`` therefore does not take this route; it keeps its standard\ntwo-segment discovery at /.well-known/oauth-authorization-server/mcp/mcp. Letting the\nper-server row win here instead would serve an issuer of {base} against a resource that\nadvertised {base}/mcp, which fails the RFC 8414 issuer check and breaks the front door.",
-          "operationId": "oauth_authorization_server_aggregate__well_known_oauth_authorization_server_mcp_get",
+          "operationId": "oauth_authorization_server_aggregate__well_known_oauth_authorization_server_mcp_get_2",
           "responses": {
             "200": {
               "content": {
@@ -35839,7 +35876,7 @@
       "/.well-known/oauth-authorization-server/mcp/{mcp_server_name}": {
         "get": {
           "description": "OAuth authorization server discovery endpoint using standard MCP URL pattern.\n\nStandard pattern: /mcp/{server_name}\nDiscovery path: /.well-known/oauth-authorization-server/mcp/{server_name}",
-          "operationId": "oauth_authorization_server_mcp_standard__well_known_oauth_authorization_server_mcp__mcp_server_name__get",
+          "operationId": "oauth_authorization_server_mcp_standard__well_known_oauth_authorization_server_mcp__mcp_server_name__get_2",
           "parameters": [
             {
               "in": "path",
@@ -35880,7 +35917,7 @@
       "/.well-known/oauth-authorization-server/{mcp_server_name}": {
         "get": {
           "description": "OAuth authorization server discovery endpoint.\n\nSupports both legacy pattern (/{server_name}) and root endpoint.",
-          "operationId": "oauth_authorization_server_mcp__well_known_oauth_authorization_server__mcp_server_name__get",
+          "operationId": "oauth_authorization_server_mcp__well_known_oauth_authorization_server__mcp_server_name__get_2",
           "parameters": [
             {
               "in": "path",
@@ -35928,7 +35965,7 @@
       "/.well-known/oauth-authorization-server/{mcp_server_name}/mcp": {
         "get": {
           "description": "OAuth authorization server discovery for legacy /{server_name}/mcp pattern.",
-          "operationId": "oauth_authorization_server_legacy__well_known_oauth_authorization_server__mcp_server_name__mcp_get",
+          "operationId": "oauth_authorization_server_legacy__well_known_oauth_authorization_server__mcp_server_name__mcp_get_2",
           "parameters": [
             {
               "in": "path",
@@ -35968,7 +36005,7 @@
       },
       "/.well-known/oauth-protected-resource": {
         "get": {
-          "operationId": "oauth_protected_resource_root__well_known_oauth_protected_resource_get",
+          "operationId": "oauth_protected_resource_root__well_known_oauth_protected_resource_get_2",
           "responses": {
             "200": {
               "content": {
@@ -36004,7 +36041,7 @@
       "/.well-known/oauth-protected-resource/mcp": {
         "get": {
           "description": "OAuth protected resource discovery for the aggregate /mcp endpoint.\n\nThe single-segment ``/mcp`` path does not collide with any per-server PRM pattern\n(those are two-segment: ``/mcp/{server}`` or ``/{server}/mcp``), so this unambiguously\ndescribes the aggregate resource.",
-          "operationId": "oauth_protected_resource_aggregate__well_known_oauth_protected_resource_mcp_get",
+          "operationId": "oauth_protected_resource_aggregate__well_known_oauth_protected_resource_mcp_get_2",
           "responses": {
             "200": {
               "content": {
@@ -36024,7 +36061,7 @@
       "/.well-known/oauth-protected-resource/mcp/{mcp_server_name}": {
         "get": {
           "description": "OAuth protected resource discovery endpoint using standard MCP URL pattern.\n\nStandard pattern: /mcp/{server_name}\nDiscovery path: /.well-known/oauth-protected-resource/mcp/{server_name}\n\nThis endpoint is compliant with MCP specification and works with standard\nMCP clients like mcp-inspector and VSCode Copilot.",
-          "operationId": "oauth_protected_resource_mcp_standard__well_known_oauth_protected_resource_mcp__mcp_server_name__get",
+          "operationId": "oauth_protected_resource_mcp_standard__well_known_oauth_protected_resource_mcp__mcp_server_name__get_2",
           "parameters": [
             {
               "in": "path",
@@ -36065,7 +36102,7 @@
       "/.well-known/oauth-protected-resource/{mcp_server_name}/mcp": {
         "get": {
           "description": "OAuth protected resource discovery endpoint using LiteLLM legacy URL pattern.\n\nLegacy pattern: /{server_name}/mcp\nDiscovery path: /.well-known/oauth-protected-resource/{server_name}/mcp\n\nThis endpoint is kept for backward compatibility. New integrations should\nuse the standard MCP pattern (/mcp/{server_name}) instead.",
-          "operationId": "oauth_protected_resource_mcp__well_known_oauth_protected_resource__mcp_server_name__mcp_get",
+          "operationId": "oauth_protected_resource_mcp__well_known_oauth_protected_resource__mcp_server_name__mcp_get_2",
           "parameters": [
             {
               "in": "path",
@@ -36194,9 +36231,27 @@
         },
         "Body_token_endpoint__mcp_server_name__token_post": {
           "properties": {
+            "assertion": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "title": "Assertion"
+            },
             "client_id": {
-              "title": "Client Id",
-              "type": "string"
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "title": "Client Id"
             },
             "client_secret": {
               "anyOf": [
@@ -36293,17 +36348,34 @@
             }
           },
           "required": [
-            "grant_type",
-            "client_id"
+            "grant_type"
           ],
           "title": "Body_token_endpoint__mcp_server_name__token_post",
           "type": "object"
         },
         "Body_token_endpoint_token_post": {
           "properties": {
+            "assertion": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "title": "Assertion"
+            },
             "client_id": {
-              "title": "Client Id",
-              "type": "string"
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "title": "Client Id"
             },
             "client_secret": {
               "anyOf": [
@@ -36400,8 +36472,7 @@
             }
           },
           "required": [
-            "grant_type",
-            "client_id"
+            "grant_type"
           ],
           "title": "Body_token_endpoint_token_post",
           "type": "object"
@@ -37324,6 +37395,17 @@
               ],
               "title": "Id Jag Resource Token Endpoint"
             },
+            "id_jag_subject_source": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "title": "Id Jag Subject Source"
+            },
             "redirect_uris": {
               "anyOf": [
                 {
@@ -38151,7 +38233,7 @@
       "/.well-known/oauth-authorization-server": {
         "get": {
           "description": "OAuth authorization server discovery endpoint.\n\nSupports both legacy pattern (/{server_name}) and root endpoint.",
-          "operationId": "oauth_authorization_server_mcp__well_known_oauth_authorization_server_get_2",
+          "operationId": "oauth_authorization_server_mcp__well_known_oauth_authorization_server_get",
           "parameters": [
             {
               "in": "query",
@@ -38199,7 +38281,7 @@
       "/.well-known/oauth-authorization-server/mcp": {
         "get": {
           "description": "OAuth authorization server discovery for the aggregate /mcp endpoint, the RFC 8414\npath-inserted form for a client that treats {base}/mcp as its authorization base URL.\n\nThe single-segment /mcp is reserved for the aggregate so the discovery chain stays\nconsistent: the aggregate protected-resource document advertises {base}/mcp as its\nauthorization server, so the document served here must have issuer {base}/mcp. A server\nliterally named ``mcp`` therefore does not take this route; it keeps its standard\ntwo-segment discovery at /.well-known/oauth-authorization-server/mcp/mcp. Letting the\nper-server row win here instead would serve an issuer of {base} against a resource that\nadvertised {base}/mcp, which fails the RFC 8414 issuer check and breaks the front door.",
-          "operationId": "oauth_authorization_server_aggregate__well_known_oauth_authorization_server_mcp_get_2",
+          "operationId": "oauth_authorization_server_aggregate__well_known_oauth_authorization_server_mcp_get",
           "responses": {
             "200": {
               "content": {
@@ -38219,7 +38301,7 @@
       "/.well-known/oauth-authorization-server/mcp/{mcp_server_name}": {
         "get": {
           "description": "OAuth authorization server discovery endpoint using standard MCP URL pattern.\n\nStandard pattern: /mcp/{server_name}\nDiscovery path: /.well-known/oauth-authorization-server/mcp/{server_name}",
-          "operationId": "oauth_authorization_server_mcp_standard__well_known_oauth_authorization_server_mcp__mcp_server_name__get_2",
+          "operationId": "oauth_authorization_server_mcp_standard__well_known_oauth_authorization_server_mcp__mcp_server_name__get",
           "parameters": [
             {
               "in": "path",
@@ -38260,7 +38342,7 @@
       "/.well-known/oauth-authorization-server/{mcp_server_name}": {
         "get": {
           "description": "OAuth authorization server discovery endpoint.\n\nSupports both legacy pattern (/{server_name}) and root endpoint.",
-          "operationId": "oauth_authorization_server_mcp__well_known_oauth_authorization_server__mcp_server_name__get_2",
+          "operationId": "oauth_authorization_server_mcp__well_known_oauth_authorization_server__mcp_server_name__get",
           "parameters": [
             {
               "in": "path",
@@ -38308,7 +38390,7 @@
       "/.well-known/oauth-authorization-server/{mcp_server_name}/mcp": {
         "get": {
           "description": "OAuth authorization server discovery for legacy /{server_name}/mcp pattern.",
-          "operationId": "oauth_authorization_server_legacy__well_known_oauth_authorization_server__mcp_server_name__mcp_get_2",
+          "operationId": "oauth_authorization_server_legacy__well_known_oauth_authorization_server__mcp_server_name__mcp_get",
           "parameters": [
             {
               "in": "path",
@@ -38348,7 +38430,7 @@
       },
       "/.well-known/oauth-protected-resource": {
         "get": {
-          "operationId": "oauth_protected_resource_root__well_known_oauth_protected_resource_get_2",
+          "operationId": "oauth_protected_resource_root__well_known_oauth_protected_resource_get",
           "responses": {
             "200": {
               "content": {
@@ -38384,7 +38466,7 @@
       "/.well-known/oauth-protected-resource/mcp": {
         "get": {
           "description": "OAuth protected resource discovery for the aggregate /mcp endpoint.\n\nThe single-segment ``/mcp`` path does not collide with any per-server PRM pattern\n(those are two-segment: ``/mcp/{server}`` or ``/{server}/mcp``), so this unambiguously\ndescribes the aggregate resource.",
-          "operationId": "oauth_protected_resource_aggregate__well_known_oauth_protected_resource_mcp_get_2",
+          "operationId": "oauth_protected_resource_aggregate__well_known_oauth_protected_resource_mcp_get",
           "responses": {
             "200": {
               "content": {
@@ -38404,7 +38486,7 @@
       "/.well-known/oauth-protected-resource/mcp/{mcp_server_name}": {
         "get": {
           "description": "OAuth protected resource discovery endpoint using standard MCP URL pattern.\n\nStandard pattern: /mcp/{server_name}\nDiscovery path: /.well-known/oauth-protected-resource/mcp/{server_name}\n\nThis endpoint is compliant with MCP specification and works with standard\nMCP clients like mcp-inspector and VSCode Copilot.",
-          "operationId": "oauth_protected_resource_mcp_standard__well_known_oauth_protected_resource_mcp__mcp_server_name__get_2",
+          "operationId": "oauth_protected_resource_mcp_standard__well_known_oauth_protected_resource_mcp__mcp_server_name__get",
           "parameters": [
             {
               "in": "path",
@@ -38445,7 +38527,7 @@
       "/.well-known/oauth-protected-resource/{mcp_server_name}/mcp": {
         "get": {
           "description": "OAuth protected resource discovery endpoint using LiteLLM legacy URL pattern.\n\nLegacy pattern: /{server_name}/mcp\nDiscovery path: /.well-known/oauth-protected-resource/{server_name}/mcp\n\nThis endpoint is kept for backward compatibility. New integrations should\nuse the standard MCP pattern (/mcp/{server_name}) instead.",
-          "operationId": "oauth_protected_resource_mcp__well_known_oauth_protected_resource__mcp_server_name__mcp_get_2",
+          "operationId": "oauth_protected_resource_mcp__well_known_oauth_protected_resource__mcp_server_name__mcp_get",
           "parameters": [
             {
               "in": "path",
@@ -40729,6 +40811,17 @@
               ],
               "title": "Id Jag Resource Token Endpoint"
             },
+            "id_jag_subject_source": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "title": "Id Jag Subject Source"
+            },
             "redirect_uris": {
               "anyOf": [
                 {
@@ -44809,6 +44902,17 @@
               ],
               "title": "Id Jag Resource Token Endpoint"
             },
+            "id_jag_subject_source": {
+              "anyOf": [
+                {
+                  "type": "string"
+                },
+                {
+                  "type": "null"
+                }
+              ],
+              "title": "Id Jag Subject Source"
+            },
             "redirect_uris": {
               "anyOf": [
                 {
diff --git a/litellm/proxy/_types.py b/litellm/proxy/_types.py
index d62c6b0d51f..2c98cfeb33d 100644
--- a/litellm/proxy/_types.py
+++ b/litellm/proxy/_types.py
@@ -551,6 +551,7 @@ class LiteLLMRoutes(enum.Enum):
         + list(agent_inference_routes)
         + model_info_routes
     )
+    llm_api_routes_without_mcp = sorted(set(llm_api_routes) - set(mcp_inference_routes))
     info_routes = [
         "/key/info",
         "/key/health",
@@ -4762,6 +4763,26 @@ class JWTIssuerConfig(LiteLLMBaseModel):
 DEFAULT_JWKS_STALE_TTL: Final = 3600
 
 
+class IdJagRequestingApp(LiteLLMBaseModel):
+    """A requesting application the operator lets redeem an ID-JAG (Identity Assertion
+    Authorization Grant) at the MCP gateway's ``POST /token``. ``client_id`` is the value
+    the identity provider puts in the assertion's ``client_id`` claim and the app sends as
+    the ``client_id`` form field. A ``client_secret`` makes the app a confidential client
+    that must authenticate with it (HTTP Basic or the ``client_secret`` form field); without
+    one the app is a public client."""
+
+    model_config = ConfigDict(frozen=True)
+
+    client_id: str = Field(
+        min_length=1, description="The requesting app's client_id as the identity provider asserts it."
+    )
+    client_secret: str | None = Field(
+        default=None,
+        min_length=1,
+        description="Shared secret the app must present at the gateway's token endpoint. Omit for a public client.",
+    )
+
+
 class LiteLLM_JWTAuth(LiteLLMPydanticObjectBase):
     """
     A class to define the roles and permissions for a LiteLLM Proxy w/ JWT Auth.
@@ -4942,6 +4963,10 @@ class LiteLLM_JWTAuth(LiteLLMPydanticObjectBase):
         default=None,
         description="Optional issuer-bound JWT validation rules. When a token's `iss` matches a configured issuer, validation uses that issuer's JWKS, audience, and claim mappings. Tokens with an unlisted `iss` fall back to the global JWT_AUDIENCE/JWT_ISSUER validation path — this is additive routing, not an allow-list.",
     )
+    id_jag_requesting_apps: tuple[IdJagRequestingApp, ...] | None = Field(
+        default=None,
+        description="Requesting apps allowed to redeem an ID-JAG at the MCP gateway's POST /token with the RFC 7523 jwt-bearer grant. Unset or empty turns that grant off.",
+    )
     #########################################################
 
     def __init__(self, **kwargs: Any) -> None:
diff --git a/litellm/proxy/anthropic_endpoints/endpoints.py b/litellm/proxy/anthropic_endpoints/endpoints.py
index a11268ad432..1fa276d9ab2 100644
--- a/litellm/proxy/anthropic_endpoints/endpoints.py
+++ b/litellm/proxy/anthropic_endpoints/endpoints.py
@@ -6,9 +6,9 @@ from collections.abc import Mapping
 from types import MappingProxyType
 from typing import Final
 
-from fastapi import APIRouter, Depends, HTTPException, Request, Response
+from fastapi import APIRouter, Depends, HTTPException, Request, Response, status
 from fastapi.responses import JSONResponse
-from pydantic import JsonValue
+from pydantic import JsonValue, ValidationError
 from typing_extensions import ReadOnly, TypedDict
 
 import litellm
@@ -18,6 +18,7 @@ from litellm.anthropic_interface.exceptions import (
     AnthropicExceptionMapping,
 )
 from litellm.integrations.custom_guardrail import ModifyResponseException
+from litellm.litellm_core_utils.tool_fields import first_validation_error
 from litellm.llms.anthropic.pass_through.context_management import (
     AnthropicContextManagementError,
 )
@@ -32,6 +33,7 @@ from litellm.proxy.common_request_processing import (
     log_llm_api_exception,
     proxy_exception_from_http_exception,
     proxy_exception_from_route_error,
+    resolve_counted_tool_fields,
     resolve_litellm_call_id,
 )
 from litellm.proxy.common_utils.error_body_call_id import error_body_call_id
@@ -47,6 +49,7 @@ from litellm.proxy.common_utils.openai_error_payload import (
     with_litellm_call_id,
 )
 from litellm.proxy.litellm_pre_call_utils import should_auto_drop_params_for_agentic_cli
+from litellm.router import Router
 
 router: Final = APIRouter()
 
@@ -91,6 +94,31 @@ def _anthropic_error_json_response(exc: ProxyException, request: Request) -> JSO
     return JSONResponse(status_code=status_code, content=content, headers=exc.headers)
 
 
+_TOKEN_COUNT_FIELDS: Final = ("model", "messages", "tools", "system")
+
+
+def _token_count_request(fields: Mapping[str, object]) -> TokenCountRequest | ProxyException:
+    try:
+        return TokenCountRequest.model_validate({name: fields[name] for name in _TOKEN_COUNT_FIELDS if name in fields})
+    except ValidationError as e:
+        return ProxyException(
+            message=first_validation_error(e),
+            type="invalid_request_error",
+            param=str(e.errors(include_url=False)[0]["loc"][0]),
+            code=status.HTTP_400_BAD_REQUEST,
+        )
+
+
+def _token_count_fields(
+    data: Mapping[str, object], auto_drop_params: bool, llm_router: Router | None, team_id: str | None
+) -> Mapping[str, object] | ProxyException:
+    fields: Final = {
+        name: data[name] for name in (*_TOKEN_COUNT_FIELDS, "drop_params", "additional_drop_params") if name in data
+    }
+    resolving: Final = {**fields, "drop_params": True} if auto_drop_params else fields
+    return resolve_counted_tool_fields(resolving, llm_router, team_id)
+
+
 def _strip_total_tokens_from_anthropic_response(response: object) -> None:
     """Remove the OpenAI-flavored `usage.total_tokens` field that LiteLLM
     injects into Anthropic /v1/messages responses.
@@ -351,7 +379,7 @@ async def count_tokens(
     
     Returns: {"input_tokens": <number>}
     """
-    from litellm.proxy.proxy_server import count_request_tokens, proxy_config
+    from litellm.proxy.proxy_server import count_request_tokens, llm_router, proxy_config
 
     litellm_call_id: Final = resolve_litellm_call_id(request.headers.get("x-litellm-call-id"))
     try:
@@ -368,26 +396,21 @@ async def count_tokens(
         if not messages:
             raise HTTPException(status_code=400, detail="messages parameter is required")
 
-        # Create TokenCountRequest for the internal endpoint
-        from litellm.proxy._types import TokenCountRequest
-
-        token_request: Final = TokenCountRequest(
-            model=model_name,
-            messages=messages,
-            tools=data.get("tools"),
-            system=data.get("system"),
+        auto_drop_params: Final = should_auto_drop_params_for_agentic_cli(
+            request.headers.get("user-agent", ""), "drop_params" in data, proxy_config
         )
+        token_fields: Final = _token_count_fields(data, auto_drop_params, llm_router, user_api_key_dict.team_id)
+        token_request: Final = (
+            token_fields if isinstance(token_fields, ProxyException) else _token_count_request(token_fields)
+        )
+        if isinstance(token_request, ProxyException):
+            return _anthropic_error_json_response(token_request, request)
 
         token_response: Final = await count_request_tokens(
             request=token_request,
             call_endpoint=True,
             messages_format="anthropic",
-            **_count_tokens_body_options(
-                data,
-                should_auto_drop_params_for_agentic_cli(
-                    request.headers.get("user-agent", ""), "drop_params" in data, proxy_config
-                ),
-            ),
+            **_count_tokens_body_options(data, auto_drop_params),
         )
     except HTTPException as e:
         return _anthropic_error_json_response(proxy_exception_from_http_exception(e, {}), request)
diff --git a/litellm/proxy/auth/auth_checks.py b/litellm/proxy/auth/auth_checks.py
index 8b32eb450e8..b395a826625 100644
--- a/litellm/proxy/auth/auth_checks.py
+++ b/litellm/proxy/auth/auth_checks.py
@@ -3960,6 +3960,7 @@ class ExperimentalUIJWTToken:
         team_models: Sequence[str] | None = None,
         team_model_aliases: Mapping[str, str] | None = None,
         max_budget: float | None = None,
+        allowed_routes: Sequence[str] | None = None,
     ) -> str:
         """
         Generate a JWT token for CLI authentication with configurable expiration.
@@ -3973,6 +3974,8 @@ class ExperimentalUIJWTToken:
             team_alias: Team alias for the selected team, if available
             team_models: Model allowlist granted by the selected team
             team_model_aliases: Team model aliases for the selected team
+            allowed_routes: Route groups the session may call, enforced like a virtual key's
+                ``allowed_routes`` on every route; None leaves every route the role allows
 
         Returns:
             Encrypted JWT token string
@@ -4017,6 +4020,7 @@ class ExperimentalUIJWTToken:
             max_parallel_requests=None,
             user_role=LitellmUserRoles(user_info.user_role),
             is_session_token=True,
+            allowed_routes=list(allowed_routes) if allowed_routes is not None else None,
         )
 
         return encrypt_bearer_token(valid_token.model_dump_json(exclude_none=True), prefix=LITELLM_SESSION_TOKEN_PREFIX)
diff --git a/litellm/proxy/auth/auth_utils.py b/litellm/proxy/auth/auth_utils.py
index 98bb0985f4a..94cf7ff4dbe 100644
--- a/litellm/proxy/auth/auth_utils.py
+++ b/litellm/proxy/auth/auth_utils.py
@@ -551,6 +551,29 @@ def _iter_fallback_targets(value: object, depth: int) -> Iterator[str | Mapping[
                     yield from _iter_fallback_targets(target_list, depth + 1)
 
 
+def _reject_client_chosen_federation(litellm_params: Mapping[str, object], *, manages_deployments: bool) -> None:
+    reject_server_owned_wif_params(litellm_params)
+    if not manages_deployments:
+        reject_federated_credential_reference(litellm_params)
+
+
+def _iter_user_config_litellm_params(user_config: object) -> Iterator[Mapping[str, object]]:
+    config: Final = _coerce_metadata_to_dict(user_config)
+    if config is None:
+        return
+    if (defaults := _coerce_metadata_to_dict(config.get("default_litellm_params"))) is not None:
+        yield defaults
+    model_list: Final = config.get("model_list")
+    if not isinstance(model_list, list):
+        return
+    for deployment in model_list:
+        if (
+            isinstance(deployment, Mapping)
+            and (params := _coerce_metadata_to_dict(deployment.get("litellm_params"))) is not None
+        ):
+            yield params
+
+
 def iter_request_fallback_targets(request_body: Mapping[str, object]) -> Iterator[str | Mapping[str, object]]:
     for value in _iter_fallback_field_values(request_body):
         yield from _iter_fallback_targets(value, 0)
@@ -658,11 +681,11 @@ def is_request_body_safe(
                 _reject_url_valued_fallback_target(target_model)
         elif isinstance(target, str):
             _reject_url_valued_fallback_target(target)
+    for user_config_params in _iter_user_config_litellm_params(request_body.get("user_config")):
+        _reject_client_chosen_federation(user_config_params, manages_deployments=manages_deployments)
     litellm_params: Final = _coerce_metadata_to_dict(request_body.get("litellm_params"))
     if litellm_params is not None:
-        reject_server_owned_wif_params(litellm_params)
-        if not manages_deployments:
-            reject_federated_credential_reference(litellm_params)
+        _reject_client_chosen_federation(litellm_params, manages_deployments=manages_deployments)
         litellm_params_metadata: Final = _coerce_metadata_to_dict(litellm_params.get("metadata"))
         if litellm_params_metadata is not None:
             _check_banned_params(
diff --git a/litellm/proxy/auth/handle_jwt.py b/litellm/proxy/auth/handle_jwt.py
index 2421eb10c41..05b8cca19af 100644
--- a/litellm/proxy/auth/handle_jwt.py
+++ b/litellm/proxy/auth/handle_jwt.py
@@ -35,6 +35,7 @@ from litellm.llms.custom_httpx.httpx_handler import HTTPHandler
 from litellm.proxy._types import (
     DEFAULT_JWKS_STALE_TTL,
     RBAC_ROLES,
+    IdJagRequestingApp,
     JWKKeyValue,
     JWTAuthBuilderResult,
     JWTIssuerConfig,
@@ -99,6 +100,10 @@ class NoMatchingJWTPublicKeyError(Exception):
     """Raised when a JWKS endpoint returns no key matching the requested ``kid``."""
 
 
+class IdJagIsNotABearerTokenError(Exception):
+    """Raised when bearer auth is handed an ID-JAG, which only the token endpoint may redeem."""
+
+
 class JWKSUnreachableError(Exception):
     """Raised when an IdP's JWKS / OIDC discovery endpoint is unreachable and no cached copy is left to fall back on."""
 
@@ -114,9 +119,23 @@ _CACHED_VALUE: Final = TypeAdapter(object)
 _CachedValueT = TypeVar("_CachedValueT", bound=JWKKeyValue | str)
 
 
+ID_JAG_TYP: Final = "oauth-id-jag+jwt"
+
+
+@dataclass(frozen=True, slots=True)
+class AssertionRejection:
+    """Why a JWT assertion failed verification. The reason is for the proxy log only, since
+    PyJWT's wording can quote the token's claims."""
+
+    reason: str
+
+
 class _JWTAuthSettings(Protocol):
     """The JWT auth settings block this handler reads back through ``getattr``, when one is configured."""
 
+    @property
+    def id_jag_requesting_apps(self) -> Sequence[IdJagRequestingApp] | None: ...
+
     @property
     def issuers(self) -> Sequence[JWTIssuerConfig] | None: ...
 
@@ -282,7 +301,7 @@ class JWTHandler:
         return is_jwt_token(token=token)
 
     @staticmethod
-    def get_unverified_claims(token: str) -> dict | None:
+    def get_unverified_claims(token: str) -> dict[str, object] | None:
         """
         Decode JWT claims without signature verification.
         Used for routing decisions before selecting validation path.
@@ -949,7 +968,7 @@ class JWTHandler:
         keys: Final = response_json["keys"] if "keys" in response_json else response_json
         return cast(JWKKeyValue, keys)  # cast-ok: JWTKeyItem declares only `kid`, validating would drop key material
 
-    async def _get_public_key_from_jwks_url(self, jwks_url: str, kid: str | None) -> dict:
+    async def _get_public_key_from_jwks_url(self, jwks_url: str, kid: str | None) -> JWTKeyItem:
         resolved_jwks_url: Final = await self._resolve_jwks_url(jwks_url)
         keys: Final = await self._cached_with_stale_fallback(
             cache_key=f"litellm_jwt_auth_keys_{resolved_jwks_url}",
@@ -960,11 +979,11 @@ class JWTHandler:
 
         public_key: Final = self.parse_keys(keys=keys, kid=kid)
         if public_key is not None:
-            return cast(dict, public_key)
+            return public_key
 
         raise NoMatchingJWTPublicKeyError(f"No matching public key found. keys={resolved_jwks_url}, kid={kid}")
 
-    async def get_public_key(self, kid: str | None) -> dict:
+    async def get_public_key(self, kid: str | None) -> JWTKeyItem:
         keys_url: Final = os.getenv("JWT_PUBLIC_KEY_URL")
 
         if keys_url is None:
@@ -1151,7 +1170,7 @@ class JWTHandler:
         # its jwks_uri, matching JWTIssuerConfig.jwks_url's documented fallback.
         return f"{issuer_config.issuer.rstrip('/')}/.well-known/openid-configuration"
 
-    def _get_claim_value_for_issuer_mapping(self, token: dict, claim_field: str) -> object:
+    def _get_claim_value_for_issuer_mapping(self, token: Mapping[str, object], claim_field: str) -> object:
         """Resolve a mapped claim from ``token``.
 
         Returns ``None`` when the field is absent or empty so that mapped claims
@@ -1168,8 +1187,10 @@ class JWTHandler:
             return None
         return claim_value
 
-    def _apply_issuer_claim_mappings(self, token: dict, issuer_config: JWTIssuerConfig) -> dict:
-        normalized: Final[dict] = {k: v for k, v in token.items() if k not in self.LITELLM_INTERNAL_CLAIMS}
+    def _apply_issuer_claim_mappings(
+        self, token: Mapping[str, object], issuer_config: JWTIssuerConfig
+    ) -> dict[str, object]:
+        normalized: Final[dict[str, object]] = {k: v for k, v in token.items() if k not in self.LITELLM_INTERNAL_CLAIMS}
         normalized[self.LITELLM_JWT_ISSUER_CLAIM] = issuer_config.issuer
         claim_mappings: Final = [
             (issuer_config.user_id_jwt_field, self.LITELLM_USER_ID_CLAIM),
@@ -1192,8 +1213,8 @@ class JWTHandler:
 
         return normalized
 
-    def _get_jwk_from_public_key(self, public_key: dict) -> dict:
-        jwk: Final = {}
+    def _get_jwk_from_public_key(self, public_key: Mapping[str, object]) -> dict[str, object]:
+        jwk: Final[dict[str, object]] = {}
         for key in ["kty", "kid", "n", "e", "x", "y", "crv"]:
             if key in public_key:
                 jwk[key] = public_key[key]
@@ -1223,12 +1244,12 @@ class JWTHandler:
     def _decode_jwt_with_public_key(
         self,
         token: str,
-        public_key: dict | str,
+        public_key: JWTKeyItem | str,
         audience: str | list[str] | None,
         issuer: str | None = None,
         options: dict | None = None,
         disable_audience_validation: bool = False,
-    ) -> dict:
+    ) -> dict[str, object]:
         decode_options: Final = (
             options
             if options is not None
@@ -1298,11 +1319,64 @@ class JWTHandler:
             issuer_config=issuer_config,
         )
 
+    async def decode_trusted_assertion(
+        self, token: str, audience: Sequence[str], required_claims: Sequence[str]
+    ) -> Mapping[str, object] | AssertionRejection:
+        """Verify a JWT assertion handed to the gateway's token endpoint with the issuer plumbing
+        JWT auth already trusts, a matching ``issuers`` entry or ``JWT_ISSUER`` with
+        ``JWT_PUBLIC_KEY_URL``, but against the caller's audience instead of the API audience.
+        An assertion whose ``iss`` nothing trusts is refused rather than checked unscoped. A JWKS
+        outage propagates as the 503 ``ProxyException`` so the caller does not call the token bad."""
+        try:
+            header: Final = jwt.get_unverified_header(token)
+        except jwt.PyJWTError as malformed:
+            return AssertionRejection(reason=f"malformed assertion: {malformed}")
+        claims: Final = self.get_unverified_claims(token=token)
+        issuer_config: Final = self._get_configured_issuer(token=token)
+        trusted_issuer: Final = issuer_config.issuer if issuer_config is not None else os.getenv("JWT_ISSUER")
+        if not trusted_issuer or claims is None or claims.get("iss") != trusted_issuer:
+            return AssertionRejection(reason="iss is not an issuer this gateway trusts")
+        kid: Final = header.get("kid")
+        try:
+            public_key: Final = (
+                await self._get_public_key_from_jwks_url(self._get_jwks_url_for_issuer(issuer_config), kid)
+                if issuer_config is not None
+                else await self.get_public_key(kid=kid)
+            )
+        except JWKSUnreachableError as e:
+            raise jwks_unavailable_exception(e) from e
+        except Exception as no_key:  # noqa: BLE001  # the key lookups raise plain Exceptions for a missing key
+            return AssertionRejection(reason=f"no signing key for the assertion: {no_key}")
+        try:
+            payload: Final = self._decode_jwt_with_public_key(
+                token=token,
+                public_key=public_key,
+                audience=list(audience),
+                issuer=trusted_issuer,
+                options={"require": list(required_claims)},
+            )
+        except jwt.PyJWTError as invalid:
+            return AssertionRejection(reason=f"assertion failed verification: {invalid}")
+        verified: Final = (
+            payload
+            if issuer_config is None
+            else self._apply_issuer_claim_mappings(token=payload, issuer_config=issuer_config)
+        )
+        validate: Final = self.litellm_jwtauth.custom_validate
+        if validate is not None and not validate(dict(verified)):
+            return AssertionRejection(reason="custom_validate rejected the assertion's claims")
+        return verified
+
     async def auth_jwt(self, token: str) -> dict:
         header: Final = jwt.get_unverified_header(token)
 
         verbose_proxy_logger.debug("header: %s", header)
 
+        if header.get("typ") == ID_JAG_TYP:
+            raise IdJagIsNotABearerTokenError(
+                "an ID-JAG is an authorization grant, not a bearer token; redeem it at the token endpoint"
+            )
+
         kid: Final = header.get("kid", None)
 
         issuer_config: Final = self._get_configured_issuer(token=token)
diff --git a/litellm/proxy/auth/model_checks.py b/litellm/proxy/auth/model_checks.py
index b70cdb08b96..8a7b6dab419 100644
--- a/litellm/proxy/auth/model_checks.py
+++ b/litellm/proxy/auth/model_checks.py
@@ -332,7 +332,7 @@ def get_known_models_from_wildcard(wildcard_model: str, litellm_params: LiteLLM_
             else:
                 model = f"{wildcard_provider_prefix}/{model}"
         suffix_appended_wildcard_models.append(model)
-    return suffix_appended_wildcard_models or []
+    return list(dict.fromkeys(suffix_appended_wildcard_models))
 
 
 def expand_wildcard_deployments_for_model_info(
diff --git a/litellm/proxy/auth/route_checks.py b/litellm/proxy/auth/route_checks.py
index ae129ca47b5..8dab693cd58 100644
--- a/litellm/proxy/auth/route_checks.py
+++ b/litellm/proxy/auth/route_checks.py
@@ -69,7 +69,8 @@ _PROXY_ADMIN_VIEW_ONLY_BLOCKED_ROUTES: Final = frozenset(
 # paths directly because the request route carries the resolved key id.
 _PROXY_ADMIN_VIEW_ONLY_BLOCKED_KEY_SUFFIXES: Final = ("/regenerate", "/reset_spend")
 
-_AUTH_ENFORCED_PASS_THROUGH_ROUTE_GROUPS: Final = frozenset(("openai_routes", "llm_api_routes"))
+_LLM_API_ROUTE_GROUPS: Final = frozenset(("llm_api_routes", "llm_api_routes_without_mcp"))
+_AUTH_ENFORCED_PASS_THROUGH_ROUTE_GROUPS: Final = frozenset(("openai_routes", *_LLM_API_ROUTE_GROUPS))
 
 # Method-scoped because the generic credential CRUD handlers share these paths:
 # the route check cannot admit PATCH/DELETE on a name like "user_connections"
@@ -154,7 +155,7 @@ class RouteChecks:
                     ################################################
                     #  For llm_api_routes, also check registered pass-through endpoints
                     ################################################
-                    if allowed_route == "llm_api_routes":
+                    if allowed_route in _LLM_API_ROUTE_GROUPS:
                         if route == "/auto_router/session" and RouteChecks.get_request_method(request) == "GET":
                             return True
 
@@ -185,7 +186,9 @@ class RouteChecks:
                         # headers, env, credentials). POST/PUT/DELETE on
                         # these paths are admin-only management writes and
                         # are intentionally not covered.
-                        if RouteChecks._is_get_mcp_server_discovery_route(route=route, request=request):
+                        if allowed_route == "llm_api_routes" and RouteChecks._is_get_mcp_server_discovery_route(
+                            route=route, request=request
+                        ):
                             return True
 
                         # Agent registry CRUD moved from llm_api_routes into
@@ -195,7 +198,7 @@ class RouteChecks:
                         # could reach these paths, so keep them reachable here;
                         # the handlers in agent_endpoints/endpoints.py still
                         # enforce proxy-admin on writes and scope reads by role.
-                        if RouteChecks.check_route_access(
+                        if allowed_route == "llm_api_routes" and RouteChecks.check_route_access(
                             route=route,
                             allowed_routes=LiteLLMRoutes.agent_management_routes.value,
                         ):
diff --git a/litellm/proxy/batches_endpoints/endpoints.py b/litellm/proxy/batches_endpoints/endpoints.py
index 8bf39b7a17a..ead1cd8e2ca 100644
--- a/litellm/proxy/batches_endpoints/endpoints.py
+++ b/litellm/proxy/batches_endpoints/endpoints.py
@@ -17,6 +17,7 @@ import litellm
 from litellm._logging import verbose_proxy_logger
 from litellm.batches.main import CancelBatchRequest, RetrieveBatchRequest
 from litellm.litellm_core_utils.hidden_params import get_hidden_params, set_hidden_param
+from litellm.llms.openai.workload_identity import resolve_openai_workload_identity_config
 from litellm.proxy._types import *
 from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
 from litellm.proxy.batches_endpoints.common_utils import validate_batch_list_limit
@@ -171,6 +172,8 @@ def _raise_not_found_when_openai_fallback_unservable(
         return
     if data.get("api_key") or litellm.api_key or litellm.openai_key or os.getenv("OPENAI_API_KEY"):
         return
+    if resolve_openai_workload_identity_config(api_key=None, api_base=None, litellm_params=data) is not None:
+        return
     raise ProxyException(
         message=not_found_message,
         type="invalid_request_error",
diff --git a/litellm/proxy/common_request_processing.py b/litellm/proxy/common_request_processing.py
index 5f798fce6cf..2d387b43aa8 100644
--- a/litellm/proxy/common_request_processing.py
+++ b/litellm/proxy/common_request_processing.py
@@ -80,6 +80,7 @@ from litellm.litellm_core_utils.served_output_texts import (
 from litellm.litellm_core_utils.streaming_handler import (
     backfill_missing_cache_usage_fields,
 )
+from litellm.litellm_core_utils.tool_fields import DropPolicy, MalformedField, drop_policy, resolve_tool_fields
 from litellm.proxy._types import LiteLLMRoutes, ProxyErrorTypes, ProxyException, UserAPIKeyAuth
 from litellm.proxy.auth.auth_checks import (
     can_key_call_resolved_model,
@@ -129,6 +130,7 @@ from litellm.proxy.utils import (  # noqa: F401  # legacy module exports
 )
 from litellm.router import Router
 from litellm.router_utils.add_retry_fallback_headers import get_hidden_params_dict
+from litellm.router_utils.auto_router_model_naming import AUTO_ROUTER_MODEL_PREFIX
 from litellm.router_utils.common_utils import resolve_model_group_alias, resolve_served_model
 from litellm.types.guardrails import GuardrailEventHooks
 from litellm.types.router import RouterRateLimitError
@@ -633,6 +635,63 @@ def serialize_http_exception_detail(
     return str(detail), None
 
 
+_REQUEST_FIELDS: Final = TypeAdapter(Mapping[str, object], config=ConfigDict(strict=True))
+_UNSEEN_DEPLOYMENT: Final = DropPolicy(drop_params=True, additional_drop_params=frozenset())
+
+
+def _is_auto_router(params: Mapping[str, object]) -> bool:
+    model: Final = params.get("model")
+    return isinstance(model, str) and model.startswith(AUTO_ROUTER_MODEL_PREFIX)
+
+
+def _named_deployments(llm_router: Router, model: str, team_id: str | None) -> tuple[Mapping[str, object], ...]:
+    by_id: Final = None if model in llm_router.model_names else llm_router.get_deployment(model_id=model)
+    if by_id is not None:
+        return (_REQUEST_FIELDS.validate_python(by_id.litellm_params.model_dump(exclude_none=True)),)
+    group: Final = llm_router.get_model_from_alias(model=model) or model
+    if group not in llm_router.model_names or llm_router.get_model_list_from_routing_groups(model_name=group):
+        return ()
+    deployments: Final = tuple(
+        _REQUEST_FIELDS.validate_python(deployment["litellm_params"])
+        for deployment in llm_router.get_all_deployments(model_name=group, team_id=team_id)
+    )
+    return () if any(_is_auto_router(params) for params in deployments) else deployments
+
+
+def _router_defaults(llm_router: Router | None) -> Mapping[str, object]:
+    configured: Final[object] = getattr(llm_router, "default_litellm_params", None)
+    if configured is None:
+        return {}
+    return {name: value for name, value in _REQUEST_FIELDS.validate_python(configured).items() if value is not None}
+
+
+def _counted_drop_policies(
+    data: Mapping[str, object], llm_router: Router | None, team_id: str | None
+) -> tuple[DropPolicy, ...]:
+    requested: Final = {**_router_defaults(llm_router), **data}
+    model: Final = data.get("model")
+    deployments: Final = (
+        _named_deployments(llm_router, model, team_id) if llm_router is not None and isinstance(model, str) else ()
+    )
+    if not deployments:
+        return (drop_policy(requested), _UNSEEN_DEPLOYMENT)
+    return tuple(drop_policy({**deployment, **requested}) for deployment in deployments)
+
+
+def resolve_counted_tool_fields(
+    data: Mapping[str, object], llm_router: Router | None, team_id: str | None
+) -> Mapping[str, object] | ProxyException:
+    resolved: Final = resolve_tool_fields(data, lambda: _counted_drop_policies(data, llm_router, team_id))
+    if isinstance(resolved, MalformedField):
+        return ProxyException(
+            message=resolved.message,
+            type="invalid_request_error",
+            param=resolved.field,
+            code=status.HTTP_400_BAD_REQUEST,
+        )
+    return resolved
+
+
 def proxy_exception_from_http_exception(exc: HTTPException, headers: dict[str, str]) -> ProxyException:
     raw_detail: Final = attribute_of(exc, "detail", str(exc))
     message, structured_fields = serialize_http_exception_detail(raw_detail)
diff --git a/litellm/proxy/db/db_transaction_queue/spend_update_queue.py b/litellm/proxy/db/db_transaction_queue/spend_update_queue.py
index 2b8535cb113..e88b9fc2bfb 100644
--- a/litellm/proxy/db/db_transaction_queue/spend_update_queue.py
+++ b/litellm/proxy/db/db_transaction_queue/spend_update_queue.py
@@ -29,6 +29,7 @@ class SpendUpdateQueue(BaseUpdateQueue):
     ) -> DBSpendUpdateTransactions:
         """Flush all updates from the queue and return all updates aggregated by entity type."""
         updates: Final = await self.flush_all_updates_from_in_memory_queue()
+        await self._emit_new_item_added_to_queue_event(queue_size=self.update_queue.qsize())
         if len(updates) > 0:
             verbose_proxy_logger.info(
                 "Spend tracking - flushed %d spend update items from in-memory queue",
@@ -48,6 +49,7 @@ class SpendUpdateQueue(BaseUpdateQueue):
                 "Spend update queue is full. Aggregating all entries in queue to concatenate entries."
             )
             await self.aggregate_queue_updates()
+        await self._emit_new_item_added_to_queue_event(queue_size=self.update_queue.qsize())
 
     async def aggregate_queue_updates(self):
         """Concatenate all updates in the queue to reduce the size of in-memory queue"""
@@ -55,6 +57,7 @@ class SpendUpdateQueue(BaseUpdateQueue):
         aggregated_updates: Final = self._get_aggregated_spend_update_queue_item(updates)
         for update in aggregated_updates:
             await self.update_queue.put(update)
+        await self._emit_new_item_added_to_queue_event(queue_size=self.update_queue.qsize())
 
     def _get_aggregated_spend_update_queue_item(
         self, updates: list[SpendUpdateQueueItem]
diff --git a/litellm/proxy/guardrails/guardrail_hooks/generic_guardrail_api/__init__.py b/litellm/proxy/guardrails/guardrail_hooks/generic_guardrail_api/__init__.py
index 320d687b3aa..242354ac417 100644
--- a/litellm/proxy/guardrails/guardrail_hooks/generic_guardrail_api/__init__.py
+++ b/litellm/proxy/guardrails/guardrail_hooks/generic_guardrail_api/__init__.py
@@ -32,6 +32,7 @@ def initialize_guardrail(litellm_params: "LitellmParams", guardrail: "Guardrail"
         additional_provider_specific_params=getattr(litellm_params, "additional_provider_specific_params", {}),
         unreachable_fallback=getattr(litellm_params, "unreachable_fallback", "fail_closed"),
         fail_on_error=getattr(litellm_params, "fail_on_error", True),
+        forward_messages_as_sent=getattr(litellm_params, "forward_messages_as_sent", False),
         extra_headers=getattr(litellm_params, "extra_headers", None),
         guardrail_name=guardrail.get("guardrail_name", ""),
         event_hook=litellm_params.mode,
diff --git a/litellm/proxy/guardrails/guardrail_hooks/generic_guardrail_api/generic_guardrail_api.py b/litellm/proxy/guardrails/guardrail_hooks/generic_guardrail_api/generic_guardrail_api.py
index 25df7a20e14..93b08831d84 100644
--- a/litellm/proxy/guardrails/guardrail_hooks/generic_guardrail_api/generic_guardrail_api.py
+++ b/litellm/proxy/guardrails/guardrail_hooks/generic_guardrail_api/generic_guardrail_api.py
@@ -7,10 +7,12 @@
 
 import fnmatch
 import os
-from collections.abc import Mapping, Sequence
+from collections.abc import Callable, Mapping, Sequence
 from typing import TYPE_CHECKING, Final, Literal, Optional
 
 import httpx
+from pydantic import JsonValue, TypeAdapter, ValidationError
+from pydantic_core import PydanticSerializationError
 
 from litellm._logging import verbose_proxy_logger
 from litellm._version import version as litellm_version
@@ -38,6 +40,10 @@ if TYPE_CHECKING:
     from litellm.types.proxy.guardrails.guardrail_hooks.base import GuardrailConfigModel
 
 GUARDRAIL_NAME: Final = "generic_guardrail_api"
+_CHAT_ROW: Final[TypeAdapter[AllMessageValues]] = TypeAdapter(AllMessageValues)
+_SENT_ROW: Final = TypeAdapter(Mapping[str, object])
+_SENT_ROWS: Final = TypeAdapter(Sequence[Mapping[str, object]])
+_JSON: Final[TypeAdapter[JsonValue]] = TypeAdapter(JsonValue)
 
 # Headers whose values are forwarded as-is (case-insensitive). Glob patterns supported (e.g. x-stainless-*, x-litellm*).
 _HEADER_VALUE_ALLOWLIST: Final = frozenset(
@@ -150,23 +156,65 @@ def _extract_inbound_headers(
     return None
 
 
+def _is_contained_in(part: JsonValue, whole: JsonValue) -> bool:
+    pending: Final[list[tuple[JsonValue, JsonValue]]] = [(part, whole)]  # mutable-ok: worklist, recursion is banned
+    while pending:
+        match pending.pop():
+            case dict() as part_dict, dict() as whole_dict:
+                if not part_dict.keys() <= whole_dict.keys():
+                    return False
+                pending.extend((value, whole_dict[key]) for key, value in part_dict.items())
+            case list() as part_list, list() as whole_list:
+                if len(part_list) != len(whole_list):
+                    return False
+                pending.extend(zip(part_list, whole_list, strict=True))
+            case part_leaf, whole_leaf if part_leaf != whole_leaf:
+                return False
+            case _:
+                pass
+    return True
+
+
+def _is_shown_row(shown: AllMessageValues, returned: AllMessageValues) -> bool:
+    return returned == shown
+
+
+def _is_echo(original: AllMessageValues, returned: AllMessageValues) -> bool:
+    """A server that parses rows with its own message types and echoes them back drops the
+    keys those types do not declare. That is still an echo as long as nothing changed and
+    every key the chat completion types declare is kept."""
+    if returned == original:
+        return True
+    try:
+        sent: Final[JsonValue] = _JSON.validate_json(_SENT_ROW.dump_json(original))
+        declared: Final[JsonValue] = _JSON.validate_json(
+            _CHAT_ROW.dump_json(_CHAT_ROW.validate_python(original), warnings="error")
+        )
+        echoed: Final[JsonValue] = _JSON.validate_python(returned)
+    except (ValidationError, PydanticSerializationError):
+        return False
+    return _is_contained_in(echoed, sent) and _is_contained_in(declared, echoed)
+
+
 def _structured_rows_to_write_back(
     original_rows: Sequence[AllMessageValues] | None,
-    shown_rows: Sequence[AllMessageValues] | None,
+    compared_rows: Sequence[AllMessageValues] | None,
     returned_rows: Sequence[AllMessageValues],
+    is_echo: Callable[[AllMessageValues, AllMessageValues], bool],
 ) -> tuple[AllMessageValues, ...] | None:
-    """The request model drops row keys its message types do not declare, so a
-    row the server echoes back verbatim is restored to the original row object.
-    A server that echoes every row back unchanged has not rewritten anything
-    per row, so its answer is read from texts, as it was before rows could be
-    returned at all."""
-    if original_rows is None or shown_rows is None or len(returned_rows) != len(original_rows):
+    """A row the server echoes back is restored to the original row object. A server
+    that echoes every row back has not rewritten anything per row, so its answer is
+    read from texts, as it was before rows could be returned at all."""
+    if original_rows is None or compared_rows is None or len(returned_rows) != len(original_rows):
         return tuple(returned_rows)
-    if all(returned == shown for shown, returned in zip(shown_rows, returned_rows)):
+    echoed: Final = tuple(
+        is_echo(compared, returned) for compared, returned in zip(compared_rows, returned_rows, strict=True)
+    )
+    if all(echoed):
         return None
     return tuple(
-        original if returned == shown else returned
-        for original, shown, returned in zip(original_rows, shown_rows, returned_rows)
+        original if was_echoed else returned
+        for original, returned, was_echoed in zip(original_rows, returned_rows, echoed, strict=True)
     )
 
 
@@ -200,6 +248,7 @@ class GenericGuardrailAPI(CustomGuardrail):
         additional_provider_specific_params: Mapping[str, object] | None = None,
         unreachable_fallback: Literal["fail_closed", "fail_open"] = "fail_closed",
         fail_on_error: bool | None = True,
+        forward_messages_as_sent: bool | None = False,
         extra_headers: list | None = None,
         streaming_end_of_stream_only: bool | None = None,
         streaming_sampling_rate: int | None = None,
@@ -235,6 +284,7 @@ class GenericGuardrailAPI(CustomGuardrail):
         self.unreachable_fallback: Literal["fail_closed", "fail_open"] = unreachable_fallback
 
         self.fail_on_error: bool = True if fail_on_error is None else fail_on_error
+        self.forward_messages_as_sent: bool = bool(forward_messages_as_sent)
 
         # Read by UnifiedLLMGuardrails.async_post_call_streaming_iterator_hook
         # via getattr(guardrail_to_apply, "streaming_*", default).
@@ -316,15 +366,17 @@ class GenericGuardrailAPI(CustomGuardrail):
         http_status_code: int | None = None,
     ) -> GenericGuardrailAPIInputs:
         status_suffix: Final = f" http_status_code={http_status_code}" if http_status_code else ""
+        error_type: Final = "HTTPStatusError" if isinstance(error, httpx.HTTPStatusError) else type(error).__name__
         verbose_proxy_logger.critical(
             "Generic Guardrail API error (fail-open). Proceeding without guardrail.%s "
-            "guardrail_name=%s api_base=%s input_type=%s litellm_call_id=%s litellm_trace_id=%s",
+            "guardrail_name=%s api_base=%s input_type=%s litellm_call_id=%s litellm_trace_id=%s error_type=%s",
             status_suffix,
             getattr(self, "guardrail_name", None),
             getattr(self, "api_base", None),
             input_type,
             getattr(logging_obj, "litellm_call_id", None) if logging_obj else None,
             getattr(logging_obj, "litellm_trace_id", None) if logging_obj else None,
+            error_type,
             exc_info=error,
         )
         # Keep flow going - treat as action=NONE (no modifications)
@@ -339,10 +391,23 @@ class GenericGuardrailAPI(CustomGuardrail):
             headers.update(self.headers)
         return headers
 
+    def _request_body(
+        self,
+        guardrail_request: GenericGuardrailAPIRequest,
+        structured_messages: Sequence[AllMessageValues] | None,
+    ) -> Mapping[str, object]:
+        body: Final[Mapping[str, object]] = guardrail_request.model_dump(mode="json")
+        if not self.forward_messages_as_sent or structured_messages is None:
+            return body
+        return {
+            **body,
+            "structured_messages": _SENT_ROWS.dump_python(_SENT_ROWS.validate_python(structured_messages), mode="json"),
+        }
+
     def _build_guardrail_return_inputs(
         self,
         *,
-        texts: list,
+        texts: list[str],
         images: list[str] | None,
         tools: list[ChatCompletionToolParam] | None,
         structured_messages: Sequence[AllMessageValues] | None,
@@ -361,8 +426,13 @@ class GenericGuardrailAPI(CustomGuardrail):
             return_inputs["tools"] = guardrail_response.tools
         elif tools:
             return_inputs["tools"] = tools
+        compared_rows, is_echo = (
+            (structured_messages, _is_echo) if self.forward_messages_as_sent else (shown_messages, _is_shown_row)
+        )
         rows_to_write_back: Final = (
-            _structured_rows_to_write_back(structured_messages, shown_messages, guardrail_response.structured_messages)
+            _structured_rows_to_write_back(
+                structured_messages, compared_rows, guardrail_response.structured_messages, is_echo
+            )
             if guardrail_response.structured_messages
             else None
         )
@@ -465,7 +535,7 @@ class GenericGuardrailAPI(CustomGuardrail):
                 litellm_version=litellm_version,
                 images=images,
                 tools=([GuardrailToolParam.model_validate(t) for t in tools] if tools else None),
-                structured_messages=structured_messages,
+                structured_messages=None if self.forward_messages_as_sent else structured_messages,
                 tool_calls=tool_calls,
                 additional_provider_specific_params=additional_params,
                 input_type=input_type,
@@ -478,7 +548,7 @@ class GenericGuardrailAPI(CustomGuardrail):
             # Use mode="json" to ensure all iterables are converted to lists
             response: Final = await self.async_handler.post(
                 url=self.api_base,
-                json=guardrail_request.model_dump(mode="json"),
+                json=dict(self._request_body(guardrail_request, structured_messages)),
                 headers=headers,
                 timeout=self.timeout,
             )
diff --git a/litellm/proxy/guardrails/guardrail_hooks/openai/__init__.py b/litellm/proxy/guardrails/guardrail_hooks/openai/__init__.py
index 74bba5c33da..fe526b72ac3 100644
--- a/litellm/proxy/guardrails/guardrail_hooks/openai/__init__.py
+++ b/litellm/proxy/guardrails/guardrail_hooks/openai/__init__.py
@@ -5,6 +5,7 @@ from litellm.proxy.guardrails.guardrail_hooks.openai.moderations import (
     OpenAIModerationGuardrail,
 )
 from litellm.types.guardrails import SupportedGuardrailIntegrations
+from litellm.types.workload_identity import OPENAI_WIF_KWARGS_KEYS
 
 if TYPE_CHECKING:
     from litellm.types.guardrails import Guardrail, LitellmParams
@@ -19,6 +20,7 @@ def initialize_guardrail(litellm_params: "LitellmParams", guardrail: "Guardrail"
 
     openai_moderation_guardrail: Final = OpenAIModerationGuardrail(
         guardrail_name=guardrail_name,
+        workload_identity_params=litellm_params.model_dump(include=set(OPENAI_WIF_KWARGS_KEYS), exclude_none=True),
         **{
             **litellm_params.model_dump(exclude_none=True),
             "api_key": litellm_params.api_key,
diff --git a/litellm/proxy/guardrails/guardrail_hooks/openai/moderations.py b/litellm/proxy/guardrails/guardrail_hooks/openai/moderations.py
index b246b125909..33884fda4ee 100644
--- a/litellm/proxy/guardrails/guardrail_hooks/openai/moderations.py
+++ b/litellm/proxy/guardrails/guardrail_hooks/openai/moderations.py
@@ -3,6 +3,8 @@
 OpenAI Moderation Guardrail Integration for LiteLLM
 """
 
+from collections.abc import Mapping
+from types import MappingProxyType
 from typing import TYPE_CHECKING, Final, Literal, Optional
 
 from fastapi import HTTPException
@@ -17,7 +19,14 @@ from litellm.llms.custom_httpx.http_handler import (
     get_async_httpx_client,
     httpxSpecialProvider,
 )
+from litellm.llms.openai.common_utils import OpenAIError
+from litellm.llms.openai.workload_identity import (
+    OpenAIWorkloadIdentityConfig,
+    resolve_openai_bearer_token_async,
+    resolve_openai_workload_identity_config,
+)
 from litellm.proxy.common_utils.callback_utils import add_guardrail_scan_id
+from litellm.secret_managers.main import get_secret_str
 from litellm.types.guardrails import GuardrailEventHooks, SupportedGuardrailIntegrations
 from litellm.types.utils import (
     GenericGuardrailAPIInputs,
@@ -32,6 +41,21 @@ if TYPE_CHECKING:
     from litellm.types.proxy.guardrails.guardrail_hooks.base import GuardrailConfigModel
 
 
+def _config_secret(value: object) -> object:
+    return get_secret_str(value) if isinstance(value, str) and value.startswith("os.environ/") else value
+
+
+def _guardrail_workload_identity(
+    api_base: str, workload_identity_params: Mapping[str, object]
+) -> OpenAIWorkloadIdentityConfig | None:
+    try:
+        return resolve_openai_workload_identity_config(
+            api_key=None, api_base=api_base, litellm_params=workload_identity_params
+        )
+    except OpenAIError as incomplete_identity:
+        raise ValueError(f"OpenAI Moderation: {incomplete_identity.message}") from incomplete_identity
+
+
 class OpenAIModerationGuardrail(OpenAIGuardrailBase, CustomGuardrail):
     """
     LiteLLM Built-in Guardrail for OpenAI Content Moderation.
@@ -55,6 +79,7 @@ class OpenAIModerationGuardrail(OpenAIGuardrailBase, CustomGuardrail):
         model: Literal["omni-moderation-latest", "text-moderation-latest"] | None = None,
         streaming_end_of_stream_only: bool | None = None,
         streaming_sampling_rate: int | None = None,
+        workload_identity_params: Mapping[str, object] | None = None,
         **kwargs,
     ):
         """Initialize OpenAI Moderation guardrail handler."""
@@ -78,7 +103,11 @@ class OpenAIModerationGuardrail(OpenAIGuardrailBase, CustomGuardrail):
         )
         self.streaming_sampling_rate: int = 5 if streaming_sampling_rate is None else streaming_sampling_rate
 
-        if not self.api_key:
+        self.workload_identity_params: Mapping[str, object] = MappingProxyType(
+            {key: _config_secret(value) for key, value in (workload_identity_params or {}).items()}
+        )
+
+        if not self.api_key and _guardrail_workload_identity(self.api_base, self.workload_identity_params) is None:
             raise ValueError(
                 "OpenAI Moderation: api_key is required. Set OPENAI_API_KEY environment variable or pass it in configuration."
             )
@@ -109,10 +138,13 @@ class OpenAIModerationGuardrail(OpenAIGuardrailBase, CustomGuardrail):
 
         verbose_proxy_logger.debug("OpenAI Moderation guard request: %s", request_body)
 
+        bearer_token: Final = await resolve_openai_bearer_token_async(
+            static_api_key=self.api_key, api_base=self.api_base, litellm_params=self.workload_identity_params
+        )
         response: Final = await self.async_handler.post(
             url=f"{self.api_base}/moderations",
             headers={
-                "Authorization": f"Bearer {self.api_key}",
+                "Authorization": f"Bearer {bearer_token}",
                 "Content-Type": "application/json",
             },
             json=request_body,
diff --git a/litellm/proxy/guardrails/tool_name_extraction.py b/litellm/proxy/guardrails/tool_name_extraction.py
index 72e85f35f7d..526f58dcd36 100644
--- a/litellm/proxy/guardrails/tool_name_extraction.py
+++ b/litellm/proxy/guardrails/tool_name_extraction.py
@@ -6,23 +6,23 @@ knowledge lives in one place. Uses guardrail translation handlers where availabl
 with standalone extractors for generate_content and MCP.
 """
 
+from collections.abc import Mapping
 from typing import Any, Final
 
 from litellm.litellm_core_utils.api_route_to_call_types import get_call_types_for_route
 from litellm.llms import load_guardrail_translation_mappings
+from litellm.llms.base_llm.guardrail_translation.utils import list_field
 from litellm.types.utils import CallTypes
 
 # Call types that have no guardrail translation handler; we use standalone extractors
 STANDALONE_EXTRACTORS: Final[dict[str, Any]] = {}
 
 
-def _extract_generate_content_tool_names(data: dict) -> list[str]:
+def _extract_generate_content_tool_names(data: Mapping[str, object]) -> list[str]:
     """Google generateContent: tools[].functionDeclarations[].name"""
     names: Final[list[str]] = []
-    for tool in data.get("tools") or []:
-        if not isinstance(tool, dict):
-            continue
-        for decl in tool.get("functionDeclarations") or []:
+    for tool in list_field(data, "tools"):
+        for decl in list_field(tool, "functionDeclarations"):
             if isinstance(decl, dict) and decl.get("name"):
                 names.append(str(decl["name"]))
     return names
diff --git a/litellm/proxy/management_endpoints/internal_user_endpoints.py b/litellm/proxy/management_endpoints/internal_user_endpoints.py
index 63cc8f0e3ba..b563dbc5c4c 100644
--- a/litellm/proxy/management_endpoints/internal_user_endpoints.py
+++ b/litellm/proxy/management_endpoints/internal_user_endpoints.py
@@ -425,7 +425,7 @@ async def add_new_user_to_default_team(
     user_id: str,
     user_email: str | None,
     user_api_key_dict: UserAPIKeyAuth,
-    teams: list[str] | list[NewUserRequestTeam],
+    teams: Sequence[str | NewUserRequestTeam],
     prisma_client: "PrismaClient",
 ):
     tasks: Final[list[Awaitable[object]]] = []
diff --git a/litellm/proxy/management_endpoints/model_management_endpoints.py b/litellm/proxy/management_endpoints/model_management_endpoints.py
index 36071bfe51a..7460522f53e 100644
--- a/litellm/proxy/management_endpoints/model_management_endpoints.py
+++ b/litellm/proxy/management_endpoints/model_management_endpoints.py
@@ -28,7 +28,7 @@ from pydantic import BaseModel, ConfigDict, Field, TypeAdapter, ValidationError,
 import litellm
 from litellm._logging import verbose_proxy_logger
 from litellm._uuid import uuid
-from litellm.constants import LITELLM_PROXY_ADMIN_NAME
+from litellm.constants import LITELLM_PROXY_ADMIN_NAME, TEAM_DELETE_TRANSACTION_TIMEOUT_SECONDS
 from litellm.litellm_core_utils.credential_accessor import CredentialAccessor
 from litellm.litellm_core_utils.get_model_cost_map import GetModelCostMap
 from litellm.litellm_core_utils.ptu_pricing import (
@@ -1881,7 +1881,7 @@ async def delete_team_models(
     """
     deleted_model_ids: Final[list[str]] = []
     transaction_client: Final = _ModelTransactionClient.model_validate(prisma_client.db)
-    async with transaction_client.tx() as tx:
+    async with transaction_client.tx(timeout=datetime.timedelta(seconds=TEAM_DELETE_TRANSACTION_TIMEOUT_SECONDS)) as tx:
         for team_id in team_ids:
             rows = await _get_team_deployments(team_id, prisma_client, table=tx.litellm_proxymodeltable)
             model_ids = [row.model_id for row in rows]
diff --git a/litellm/proxy/management_endpoints/sso/id_jag_assertion_capture.py b/litellm/proxy/management_endpoints/sso/id_jag_assertion_capture.py
index 404fdfc83a9..ff7e68c3ab2 100644
--- a/litellm/proxy/management_endpoints/sso/id_jag_assertion_capture.py
+++ b/litellm/proxy/management_endpoints/sso/id_jag_assertion_capture.py
@@ -1,25 +1,26 @@
 """Whether the SSO provider the login callback dispatches to can capture an IdP identity assertion.
 
 An ``oauth2_id_jag`` MCP server spends the ``id_token`` captured at SSO login as its RFC 8693
-subject token. Only the generic OIDC login path reaches a token response the gateway retains one
-from, so a deployment whose SSO runs through Google, Microsoft or SAML never stores an assertion
-and every store-sourced ID-JAG exchange fails for every user, however many times they sign in.
-Neither side can see that alone: the MCP registration knows nothing about SSO and the login knows
-nothing about MCP. This module is the one shared answer both warn from.
+subject token. The Google, Microsoft and generic OIDC login paths all reach a token response the
+gateway retains one from, and the SAML login retains the signed assertion itself as a ``saml2``
+subject token. A deployment with no SSO never signs anyone in, so every store-sourced ID-JAG
+exchange fails for every user. Neither side can see that alone: the MCP registration knows nothing
+about SSO and the login knows nothing about MCP. This module is the one shared answer both warn from.
 """
 
 from __future__ import annotations
 
 import os
 from enum import Enum
+from typing import Final
 
 from typing_extensions import assert_never
 
 from litellm.proxy.management_endpoints.sso.saml_sso import SAMLAuthHandler
 
-_GENERIC_OIDC_REMEDY = (
-    "Point SSO at the generic OIDC provider (GENERIC_CLIENT_ID), the one login path whose token "
-    "response the gateway retains an id_token from"
+_OIDC_REMEDY: Final = (
+    "Point SSO at an OIDC provider (GOOGLE_CLIENT_ID, MICROSOFT_CLIENT_ID or GENERIC_CLIENT_ID) or at SAML, "
+    "the login paths the gateway retains an identity assertion from"
 )
 
 
@@ -55,18 +56,14 @@ def id_jag_assertion_capture_gap() -> str | None:
     or ``None`` when that provider does capture an assertion."""
     provider = active_sso_provider()
     match provider:
-        case ActiveSSOProvider.generic:
+        case (
+            ActiveSSOProvider.google | ActiveSSOProvider.microsoft | ActiveSSOProvider.generic | ActiveSSOProvider.saml
+        ):
             return None
         case ActiveSSOProvider.none:
             return (
                 "no SSO provider is configured, so no IdP identity assertion is ever captured and "
-                f"ID-JAG credential resolution fails for every user. {_GENERIC_OIDC_REMEDY}"
-            )
-        case ActiveSSOProvider.google | ActiveSSOProvider.microsoft | ActiveSSOProvider.saml:
-            return (
-                f"the active SSO provider ({provider.value}) has no identity-assertion capture path, so no "
-                "IdP id_token is ever stored and ID-JAG credential resolution fails for every user no matter "
-                f"how often they sign in. {_GENERIC_OIDC_REMEDY}"
+                f"ID-JAG credential resolution fails for every user. {_OIDC_REMEDY}"
             )
         case _:
             assert_never(provider)
diff --git a/litellm/proxy/management_endpoints/sso/saml_sso.py b/litellm/proxy/management_endpoints/sso/saml_sso.py
index 4991436edac..ba265acfe4a 100644
--- a/litellm/proxy/management_endpoints/sso/saml_sso.py
+++ b/litellm/proxy/management_endpoints/sso/saml_sso.py
@@ -27,6 +27,7 @@ import hashlib
 import os
 import secrets
 import time
+from collections.abc import Mapping
 from typing import Final, cast
 from urllib.parse import parse_qsl
 
@@ -37,6 +38,10 @@ from pydantic import ValidationError
 from litellm._internal_context import with_service_target
 from litellm._logging import verbose_proxy_logger
 from litellm.caching.dual_cache import DualCache
+from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+    SSOIdentityAssertion,
+    assertion_from_saml_login,
+)
 from litellm.proxy.auth.ip_address_utils import IPAddressUtils
 from litellm.proxy.management_endpoints.sso_helper_utils import SSO_SESSIONS_TARGET
 from litellm.proxy.management_endpoints.types import CustomOpenID, get_litellm_user_role
@@ -212,7 +217,7 @@ class SAMLAuthHandler:
         return OneLogin_Saml2_IdPMetadataParser.merge_settings(sp_settings, idp_settings)
 
     @staticmethod
-    def _prepare_request_data(request: Request, post_data: dict[str, str] | None = None) -> dict[str, object]:
+    def _prepare_request_data(request: Request, post_data: Mapping[str, str] | None = None) -> dict[str, object]:
         base: Final = SAMLAuthHandler._base_url(request)
         scheme, _, host_part = base.partition("://")
         host: Final = host_part.split("/", 1)[0]
@@ -228,7 +233,7 @@ class SAMLAuthHandler:
     async def _build_auth(
         request: Request,
         cache: DualCache,
-        post_data: dict[str, str] | None = None,
+        post_data: Mapping[str, str] | None = None,
     ) -> "OneLogin_Saml2_Auth":
         if not SAML_AVAILABLE:
             raise _saml_unavailable_error()
@@ -310,7 +315,9 @@ class SAMLAuthHandler:
         return dict(parse_qsl(body.decode("utf-8", "replace")))
 
     @staticmethod
-    async def handle_acs(request: Request, cache: DualCache, post_data: dict[str, str]) -> CustomOpenID:
+    async def handle_acs(
+        request: Request, cache: DualCache, post_data: Mapping[str, str]
+    ) -> tuple[CustomOpenID, SSOIdentityAssertion | None]:
         auth: Final = await SAMLAuthHandler._build_auth(request, cache, post_data=post_data)
         browser_request_id: Final = request.cookies.get(_SAML_AUTHN_STATE_COOKIE)
         try:
@@ -330,7 +337,50 @@ class SAMLAuthHandler:
             )
 
         await SAMLAuthHandler._enforce_response_binding(auth, cache, browser_request_id)
-        return SAMLAuthHandler._result_from_auth(auth)
+        return SAMLAuthHandler._result_from_auth(auth), SAMLAuthHandler._retained_assertion(auth)
+
+    @staticmethod
+    def _retained_assertion(auth: "OneLogin_Saml2_Auth") -> SSOIdentityAssertion | None:
+        """The one signed ``<saml:Assertion>`` the validated response carried, serialized on its own
+        so its enveloped signature still verifies at the IdP's token endpoint. Retention is optional
+        egress material, so a failure here is logged and the validated login goes on without it."""
+        try:
+            return SAMLAuthHandler._parse_retained_assertion(auth)
+        except Exception as e:  # noqa: BLE001 - lxml and python3-saml expose no common base; capture must not block login
+            verbose_proxy_logger.warning(
+                "SAML login validated but its assertion could not be retained for oauth2_id_jag MCP servers: %s", e
+            )
+            return None
+
+    @staticmethod
+    def _parse_retained_assertion(auth: "OneLogin_Saml2_Auth") -> SSOIdentityAssertion | None:
+        xml: Final = cast(bytes | None, auth.get_last_response_xml())  # cast-ok: untyped python3-saml
+        if not xml:
+            verbose_proxy_logger.warning(
+                "SAML login validated but the response XML was not retained, so this user has no identity "
+                "assertion for oauth2_id_jag MCP servers."
+            )
+            return None
+        root: Final = OneLogin_Saml2_XML.to_etree(xml)
+        assertions: Final = OneLogin_Saml2_XML.query(root, "//saml:Assertion")
+        if len(assertions) != 1:
+            encrypted: Final = OneLogin_Saml2_XML.query(root, "//saml:EncryptedAssertion")
+            verbose_proxy_logger.warning(
+                "SAML login validated but the response carried %d plaintext saml:Assertion elements and %d "
+                "saml:EncryptedAssertion elements, so no identity assertion was retained for oauth2_id_jag MCP "
+                "servers. Those servers need exactly one signed, unencrypted assertion from the IdP.",
+                len(assertions),
+                len(encrypted),
+            )
+            return None
+        issuers: Final = OneLogin_Saml2_XML.query(assertions[0], "./saml:Issuer")
+        issuer: Final = cast(str | None, issuers[0].text) if issuers else None  # cast-ok: untyped python3-saml
+        not_on_or_after: Final = auth.get_last_assertion_not_on_or_after()
+        return assertion_from_saml_login(
+            assertion_xml=cast(bytes, OneLogin_Saml2_XML.to_string(assertions[0], encoding="utf-8")),  # cast-ok: saml
+            not_on_or_after=not_on_or_after if isinstance(not_on_or_after, int) else None,
+            issuer=issuer,
+        )
 
     @staticmethod
     def _replay_guard_ttl(auth: "OneLogin_Saml2_Auth") -> int:
diff --git a/litellm/proxy/management_endpoints/team_endpoints.py b/litellm/proxy/management_endpoints/team_endpoints.py
index ba30ac8609b..0f40662ad83 100644
--- a/litellm/proxy/management_endpoints/team_endpoints.py
+++ b/litellm/proxy/management_endpoints/team_endpoints.py
@@ -17,7 +17,7 @@ import traceback
 from collections.abc import Iterable, Mapping, Sequence
 from collections.abc import Set as AbstractSet
 from dataclasses import dataclass
-from datetime import datetime, timezone
+from datetime import datetime, timedelta, timezone
 from itertools import chain
 from types import MappingProxyType
 from typing import (
@@ -42,6 +42,7 @@ from litellm._internal_context import with_service_target
 from litellm._logging import verbose_proxy_logger
 from litellm._uuid import uuid
 from litellm.caching.redis_batch import active_request_redis_batches
+from litellm.constants import TEAM_DELETE_TRANSACTION_TIMEOUT_SECONDS
 from litellm.integrations.prometheus import PrometheusLogger
 from litellm.litellm_core_utils.safe_json_dumps import safe_dumps
 from litellm.proxy._types import (
@@ -4674,7 +4675,7 @@ async def delete_team(
     # or is still waiting on the lock, in which case its own re-read happens after this commits
     # and sees the row gone before it writes anything.
     delete_filter: Final[_TeamIdInFilter] = {"team_id": {"in": data.team_ids}}
-    async with prisma_client.tx() as tx:
+    async with prisma_client.tx(timeout=timedelta(seconds=TEAM_DELETE_TRANSACTION_TIMEOUT_SECONDS)) as tx:
         for team_id in sorted(data.team_ids):
             await tx.query_raw(TEAM_ADVISORY_LOCK_SQL, team_id)
         await tx.litellm_teamtable.delete_many(where=delete_filter)
diff --git a/litellm/proxy/management_endpoints/ui_sso.py b/litellm/proxy/management_endpoints/ui_sso.py
index 4629103070f..4cc849762aa 100644
--- a/litellm/proxy/management_endpoints/ui_sso.py
+++ b/litellm/proxy/management_endpoints/ui_sso.py
@@ -37,10 +37,12 @@ from urllib.parse import parse_qs, urlencode, urlparse
 if TYPE_CHECKING:
     import httpx
 
+    from litellm.caching.redis_cache import RedisCache
+
 import jwt
 from fastapi import APIRouter, Depends, Header, HTTPException, Request, Response, status
 from fastapi.responses import RedirectResponse
-from pydantic import ConfigDict, TypeAdapter, ValidationError
+from pydantic import BaseModel, ConfigDict, TypeAdapter, ValidationError, field_validator
 
 import litellm
 from litellm._internal_context import with_service_target
@@ -69,7 +71,12 @@ from litellm.llms.custom_httpx.http_handler import (
     get_async_httpx_client,
     httpxSpecialProvider,
 )
+from litellm.proxy._experimental.mcp_server.outbound_credentials.login_assertion_exchange import (
+    exchange_login_assertion_if_configured,
+)
 from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+    GOOGLE_REFRESH_TOKEN_PARAMS,
+    MICROSOFT_REFRESH_TOKEN_SCOPE,
     SSOIdentityAssertion,
     assertion_from_sso_login,
     ema_assertion_retention_enabled,
@@ -82,6 +89,7 @@ from litellm.proxy._types import (
     Member,
     NewTeamRequest,
     NewUserRequest,
+    NewUserRequestTeam,
     NewUserResponse,
     ProxyErrorTypes,
     ProxyException,
@@ -111,7 +119,11 @@ from litellm.proxy.common_utils.html_forms.jwt_display_template import (
 from litellm.proxy.common_utils.html_forms.ui_login import build_ui_login_form
 from litellm.proxy.common_utils.user_api_key_cache import AUTH_OBJECTS_TARGET, UserApiKeyCache
 from litellm.proxy.db.exception_handler import PrismaDBExceptionHandler
-from litellm.proxy.management_endpoints.internal_user_endpoints import new_user
+from litellm.proxy.management_endpoints.internal_user_endpoints import (
+    add_new_user_to_default_team,
+    check_if_default_team_set,
+    new_user,
+)
 from litellm.proxy.management_endpoints.sso import CustomMicrosoftSSO, LiteLLMGoogleSSO, create_generic_sso_provider
 from litellm.proxy.management_endpoints.sso.id_jag_assertion_capture import (
     id_jag_assertion_capture_gap,
@@ -1786,6 +1798,19 @@ async def warn_if_id_jag_assertion_uncaptured(
     )
 
 
+async def login_asks_for_refresh_token(retention_enabled: RetentionCheck | None = None) -> bool:
+    """A refresh token is only issued when the authorization request asks for one, and asking costs the
+    user an offline-access consent, so the Google and Microsoft logins ask only while an ``oauth2_id_jag``
+    server exists whose assertion the refresher would renew. A store outage answers no: a login must not
+    fail over a renewal that is only an optimisation on top of signing in again."""
+    try:
+        check: Final = retention_enabled if retention_enabled is not None else ema_assertion_retention_enabled
+        return await check()
+    except Exception as exc:  # noqa: BLE001  # the login must not fail over the renewal gate
+        verbose_proxy_logger.debug("Could not check for oauth2_id_jag MCP servers before SSO login: %s", exc)
+        return False
+
+
 async def warn_if_id_jag_capture_gap(*, retention_enabled: RetentionCheck | None = None) -> None:
     gap: Final = id_jag_assertion_capture_gap()
     if gap is None:
@@ -2125,6 +2150,50 @@ async def check_and_update_if_proxy_admin_id(user_role: str, user_id: str, prism
     return user_role
 
 
+async def _sso_provider_callback(
+    request: Request,
+    redirect_url: str,
+    *,
+    google_client_id: str | None,
+    microsoft_client_id: str | None,
+    generic_client_id: str | None,
+    jwt_handler: JWTHandler,
+    sso_jwt_handler: JWTHandler | None,
+    return_raw_sso_response: bool = False,
+) -> tuple[
+    OpenID | dict[str, object] | None, dict[str, object] | None, dict[str, object] | None, SSOIdentityAssertion | None
+]:
+    """Dispatch the callback to the configured provider in the order the login redirect used (Google,
+    Microsoft, generic) and hand back what every branch has to agree on: the parsed identity, the raw
+    userinfo and access-token claims only the generic branch exposes, and the IdP identity assertion
+    an ``oauth2_id_jag`` MCP server spends. ``None`` identity means no provider is configured."""
+    if google_client_id is not None:
+        google_result, google_assertion = await GoogleSSOHandler.get_google_callback_response(
+            request=request,
+            google_client_id=google_client_id,
+            redirect_url=redirect_url,
+            return_raw_sso_response=return_raw_sso_response,
+        )
+        return google_result, None, None, google_assertion
+    if microsoft_client_id is not None:
+        microsoft_result, microsoft_assertion = await MicrosoftSSOHandler.get_microsoft_callback_response(
+            request=request,
+            microsoft_client_id=microsoft_client_id,
+            redirect_url=redirect_url,
+            return_raw_sso_response=return_raw_sso_response,
+        )
+        return microsoft_result, None, None, microsoft_assertion
+    if generic_client_id is not None:
+        return await get_generic_sso_response(
+            request=request,
+            jwt_handler=jwt_handler,
+            generic_client_id=generic_client_id,
+            redirect_url=redirect_url,
+            sso_jwt_handler=sso_jwt_handler,
+        )
+    return None, None, None, None
+
+
 @router.get("/sso/callback", tags=["experimental"], include_in_schema=False)
 async def auth_callback(request: Request, state: str | None = None):
     """Verify login"""
@@ -2173,9 +2242,6 @@ async def auth_callback(request: Request, state: str | None = None):
     microsoft_client_id: Final = os.getenv("MICROSOFT_CLIENT_ID", None)
     google_client_id: Final = os.getenv("GOOGLE_CLIENT_ID", None)
     generic_client_id: Final = os.getenv("GENERIC_CLIENT_ID", None)
-    received_response: dict | None = None
-    access_token_payload: dict | None = None
-    sso_assertion: SSOIdentityAssertion | None = None
     # get url from request
     if master_key is None:
         raise ProxyException(
@@ -2187,33 +2253,15 @@ async def auth_callback(request: Request, state: str | None = None):
     redirect_url = SSOAuthenticationHandler.get_redirect_url_for_sso(request=request, sso_callback_route="sso/callback")
 
     verbose_proxy_logger.info("Redirecting to %s", redirect_url)
-    result = None
-    if google_client_id is not None:
-        result = await GoogleSSOHandler.get_google_callback_response(
-            request=request,
-            google_client_id=google_client_id,
-            redirect_url=redirect_url,
-        )
-    elif microsoft_client_id is not None:
-        result = await MicrosoftSSOHandler.get_microsoft_callback_response(
-            request=request,
-            microsoft_client_id=microsoft_client_id,
-            redirect_url=redirect_url,
-        )
-
-    elif generic_client_id is not None:
-        (
-            result,
-            received_response,
-            access_token_payload,
-            sso_assertion,
-        ) = await get_generic_sso_response(
-            request=request,
-            jwt_handler=jwt_handler,
-            generic_client_id=generic_client_id,
-            redirect_url=redirect_url,
-            sso_jwt_handler=sso_jwt_handler,
-        )
+    result, received_response, access_token_payload, sso_assertion = await _sso_provider_callback(
+        request,
+        redirect_url,
+        google_client_id=google_client_id,
+        microsoft_client_id=microsoft_client_id,
+        generic_client_id=generic_client_id,
+        jwt_handler=jwt_handler,
+        sso_jwt_handler=sso_jwt_handler,
+    )
 
     if result is None:
         raise HTTPException(
@@ -2303,7 +2351,7 @@ async def saml_callback(request: Request):
     if "SAMLResponse" not in post_data:
         raise HTTPException(status_code=400, detail="Missing SAMLResponse in callback request.")
 
-    result: Final = await SAMLAuthHandler.handle_acs(request=request, cache=saml_sso_cache, post_data=post_data)
+    user, retained = await SAMLAuthHandler.handle_acs(request=request, cache=saml_sso_cache, post_data=post_data)
 
     await _raise_if_sso_exceeds_free_user_limit(premium_user, prisma_client)
 
@@ -2316,7 +2364,7 @@ async def saml_callback(request: Request):
     )
 
     return await SSOAuthenticationHandler.get_redirect_response_from_openid(
-        result=result,
+        result=user,
         request=request,
         received_response=None,
         generic_client_id=None,
@@ -2324,6 +2372,7 @@ async def saml_callback(request: Request):
         access_token_payload=None,
         jwt_handler=jwt_handler,
         return_to=cp_return_to,
+        sso_assertion=retained,
     )
 
 
@@ -2440,7 +2489,8 @@ async def _complete_cli_sso_callback_session(
         raise HTTPException(status_code=500, detail="Failed to retrieve user information from SSO")
     resolved_user_id: Final = _require_sso_user_id(user_info.user_id)
 
-    await retain_sso_identity_assertion_for_ema(user_id=resolved_user_id, assertion=sso_assertion)
+    retained_assertion: Final = await exchange_login_assertion_if_configured(sso_assertion)
+    await retain_sso_identity_assertion_for_ema(user_id=resolved_user_id, assertion=retained_assertion)
     await warn_if_id_jag_assertion_uncaptured(sso_assertion)
 
     teams: list[str] = []
@@ -2780,6 +2830,52 @@ async def insert_sso_user(
     return response
 
 
+DefaultTeamJoin: TypeAlias = Callable[
+    [LiteLLM_UserTable, Sequence[str | NewUserRequestTeam], PrismaClient], Awaitable[None]
+]
+
+
+async def _join_default_teams_as_admin(
+    user: LiteLLM_UserTable, teams: Sequence[str | NewUserRequestTeam], prisma_client: PrismaClient
+) -> None:
+    await add_new_user_to_default_team(
+        user_id=user.user_id,
+        user_email=user.user_email,
+        user_api_key_dict=UserAPIKeyAuth(user_role=LitellmUserRoles.PROXY_ADMIN),
+        teams=teams,
+        prisma_client=prisma_client,
+    )
+
+
+def _default_teams_not_joined(user: LiteLLM_UserTable) -> tuple[str | NewUserRequestTeam, ...]:
+    joined: Final = frozenset(user.teams)
+    return tuple(
+        team
+        for team in check_if_default_team_set() or ()
+        if (team if isinstance(team, str) else team.team_id) not in joined
+    )
+
+
+async def _insert_sso_user_or_find_concurrent_insert(
+    insert: Awaitable[NewUserResponse],
+    user_id: str | None,
+    prisma_client: PrismaClient,
+    join_default_teams: DefaultTeamJoin = _join_default_teams_as_admin,
+) -> NewUserResponse | LiteLLM_UserTable:
+    try:
+        return await insert
+    except Exception:
+        users: Final = UserRepository(prisma_client, use_writer=True)
+        concurrent_insert: Final = None if user_id is None else await users.find_by_id(user_id)
+        if concurrent_insert is None:
+            raise
+        unjoined: Final = _default_teams_not_joined(concurrent_insert)
+        if not unjoined:
+            return concurrent_insert
+        await join_default_teams(concurrent_insert, unjoined, prisma_client)
+        return await users.find_by_id(concurrent_insert.user_id) or concurrent_insert
+
+
 @router.get(
     "/sso/get/ui_settings",
     tags=["experimental"],
@@ -2915,8 +3011,8 @@ def _is_same_origin_return_path(return_to: str) -> bool:
 async def sso_return_to_redirect(
     return_to: str | None,
     jwt_token: str,
-    redis_usage_cache,
-    user_api_key_cache,
+    redis_usage_cache: "RedisCache | None",
+    user_api_key_cache: UserApiKeyCache,
     request: Request,
 ) -> RedirectResponse | None:
     """Resolve the post-SSO redirect for a ``return_to``, or None to fall through to the dashboard.
@@ -3063,6 +3159,7 @@ class SSOAuthenticationHandler:
         generic_client_id: str | None = None,
         state: str | None = None,
         request: Request | None = None,
+        retention_enabled: RetentionCheck | None = None,
     ) -> RedirectResponse | None:
         """
         Step 1. Call Get Login Redirect for the SSO provider. Send the redirect response to `redirect_url`
@@ -3074,10 +3171,13 @@ class SSOAuthenticationHandler:
             generic_client_id (Optional[str], optional): The Generic Client ID. Defaults to None.
             request: Optional FastAPI request, used to drive the ``Secure``
                 attribute on the ``litellm_oauth_state`` CSRF cookie.
+            retention_enabled: Whether an ``oauth2_id_jag`` server exists, deciding if the Google and
+                Microsoft logins ask the IdP for a refresh token. Defaults to the store's own check.
 
         Returns:
             RedirectResponse: The redirect response from the SSO provider.
         """
+        asks_for_refresh_token: Final = await login_asks_for_refresh_token(retention_enabled)
         # Google SSO Auth
         if google_client_id is not None:
             google_client_secret: Final = os.getenv("GOOGLE_CLIENT_SECRET", None)
@@ -3099,7 +3199,10 @@ class SSOAuthenticationHandler:
                 google_client_id,
             )
             with google_sso:
-                return await google_sso.get_login_redirect(state=state)
+                return await google_sso.get_login_redirect(
+                    state=state,
+                    params=dict(GOOGLE_REFRESH_TOKEN_PARAMS) if asks_for_refresh_token else None,
+                )
         # Microsoft SSO Auth
         elif microsoft_client_id is not None:
             microsoft_client_secret: Final = os.getenv("MICROSOFT_CLIENT_SECRET", None)
@@ -3117,6 +3220,7 @@ class SSOAuthenticationHandler:
                 tenant=microsoft_tenant,
                 redirect_uri=redirect_url,
                 allow_insecure_http=True,
+                scope=[*CustomMicrosoftSSO.scope, MICROSOFT_REFRESH_TOKEN_SCOPE] if asks_for_refresh_token else None,
             )
             with microsoft_sso:
                 return await microsoft_sso.get_login_redirect(state=state)
@@ -3418,9 +3522,10 @@ class SSOAuthenticationHandler:
             else:
                 verbose_proxy_logger.info("user not in DB, inserting user into LiteLLM DB")
                 # user not in DB, insert User into LiteLLM DB
-                user_info = await insert_sso_user(
-                    result_openid=result,
-                    user_defined_values=user_defined_values,
+                user_info = await _insert_sso_user_or_find_concurrent_insert(
+                    insert=insert_sso_user(result_openid=result, user_defined_values=user_defined_values),
+                    user_id=None if user_defined_values is None else user_defined_values.get("user_id"),
+                    prisma_client=prisma_client,
                 )
             return user_info
         except Exception as e:
@@ -3815,7 +3920,8 @@ class SSOAuthenticationHandler:
         )
 
         if isinstance(user_id, str) and user_id:
-            await retain_sso_identity_assertion_for_ema(user_id=user_id, assertion=sso_assertion)
+            retained_assertion: Final = await exchange_login_assertion_if_configured(sso_assertion)
+            await retain_sso_identity_assertion_for_ema(user_id=user_id, assertion=retained_assertion)
             await warn_if_id_jag_assertion_uncaptured(sso_assertion)
 
         disabled_non_admin_personal_key_creation: Final = get_disabled_non_admin_personal_key_creation()
@@ -4399,6 +4505,21 @@ class SSOAuthenticationHandler:
         return userinfo
 
 
+class _SSOTokenResponse(BaseModel):
+    """The id_token and refresh token fastapi-sso keeps on the SSO instance after the code exchange,
+    read through a validated view because the package ships no type information."""
+
+    model_config = ConfigDict(frozen=True, from_attributes=True)
+
+    id_token: str | None = None
+    refresh_token: str | None = None
+
+    @field_validator("id_token", "refresh_token", mode="before")
+    @classmethod
+    def _strings_only(cls, value: object) -> str | None:
+        return value if isinstance(value, str) else None
+
+
 class MicrosoftSSOHandler:
     """
     Handles Microsoft SSO callback response and returns a CustomOpenID object
@@ -4433,9 +4554,10 @@ class MicrosoftSSOHandler:
         microsoft_client_id: str,
         redirect_url: str,
         return_raw_sso_response: bool = False,
-    ) -> CustomOpenID | OpenID | dict:
+    ) -> tuple[CustomOpenID | OpenID | dict[str, object], SSOIdentityAssertion | None]:
         """
-        Get the Microsoft SSO callback response
+        Get the Microsoft SSO callback response, with the IdP identity assertion the token
+        response carried (the id_token and refresh token an ``oauth2_id_jag`` server spends)
 
         Args:
             return_raw_sso_response: If True, return the raw SSO response
@@ -4470,6 +4592,8 @@ class MicrosoftSSOHandler:
             )
             or {}
         )
+        microsoft_tokens: Final = _SSOTokenResponse.model_validate(microsoft_sso)
+        sso_assertion: Final = assertion_from_sso_login(microsoft_tokens.id_token, microsoft_tokens.refresh_token)
         if not return_raw_sso_response and "error" in original_msft_result and original_msft_result["error"]:
             verbose_proxy_logger.warning("Microsoft SSO login failed: Graph /me returned an error instead of a profile")
             raise HTTPException(
@@ -4494,7 +4618,7 @@ class MicrosoftSSOHandler:
         if return_raw_sso_response:
             original_msft_result[MicrosoftSSOHandler.GRAPH_API_RESPONSE_KEY] = user_team_ids
             original_msft_result["app_roles"] = app_roles
-            return original_msft_result or {}
+            return original_msft_result or {}, sso_assertion
 
         from litellm.proxy.management_endpoints.sso.agent_subject_enrollment import microsoft_interactive_subject
 
@@ -4517,7 +4641,7 @@ class MicrosoftSSOHandler:
             team_ids=user_team_ids,
             user_role=user_role,
         )
-        return result
+        return result, sso_assertion
 
     @staticmethod
     def openid_from_response(
@@ -4793,9 +4917,10 @@ class GoogleSSOHandler:
         google_client_id: str,
         redirect_url: str,
         return_raw_sso_response: bool = False,
-    ) -> OpenID | dict:
+    ) -> tuple[OpenID | dict[str, object], SSOIdentityAssertion | None]:
         """
-        Get the Google SSO callback response
+        Get the Google SSO callback response, with the IdP identity assertion the token
+        response carried (the id_token and refresh token an ``oauth2_id_jag`` server spends)
 
         Args:
             return_raw_sso_response: If True, return the raw SSO response
@@ -4816,17 +4941,13 @@ class GoogleSSOHandler:
         )
 
         # if user is trying to get the raw sso response for debugging, return the raw sso response
-        if return_raw_sso_response:
-            return (
-                await google_sso.verify_and_process(
-                    request=request,
-                    convert_response=False,
-                )
-                or {}
-            )
-
-        result: Final = await google_sso.verify_and_process(request)
-        return result or {}
+        result: Final = (
+            await google_sso.verify_and_process(request=request, convert_response=False)
+            if return_raw_sso_response
+            else await google_sso.verify_and_process(request)
+        )
+        google_tokens: Final = _SSOTokenResponse.model_validate(google_sso)
+        return result or {}, assertion_from_sso_login(google_tokens.id_token, google_tokens.refresh_token)
 
 
 def _raise_if_sso_debug_disabled() -> None:
@@ -4928,37 +5049,16 @@ async def debug_sso_callback(request: Request):
     else:
         redirect_url += "/sso/debug/callback"
 
-    result = None
-    received_response: dict | None = None
-    access_token_payload: dict | None = None
-    if google_client_id is not None:
-        result = await GoogleSSOHandler.get_google_callback_response(
-            request=request,
-            google_client_id=google_client_id,
-            redirect_url=redirect_url,
-            return_raw_sso_response=True,
-        )
-    elif microsoft_client_id is not None:
-        result = await MicrosoftSSOHandler.get_microsoft_callback_response(
-            request=request,
-            microsoft_client_id=microsoft_client_id,
-            redirect_url=redirect_url,
-            return_raw_sso_response=True,
-        )
-
-    elif generic_client_id is not None:
-        (
-            result,
-            received_response,
-            access_token_payload,
-            _sso_assertion,
-        ) = await get_generic_sso_response(
-            request=request,
-            jwt_handler=jwt_handler,
-            generic_client_id=generic_client_id,
-            redirect_url=redirect_url,
-            sso_jwt_handler=sso_jwt_handler,
-        )
+    result, received_response, access_token_payload, _sso_assertion = await _sso_provider_callback(
+        request,
+        redirect_url,
+        google_client_id=google_client_id,
+        microsoft_client_id=microsoft_client_id,
+        generic_client_id=generic_client_id,
+        jwt_handler=jwt_handler,
+        sso_jwt_handler=sso_jwt_handler,
+        return_raw_sso_response=True,
+    )
 
     # If result is None, return a basic error message
     if result is None:
diff --git a/litellm/proxy/pass_through_endpoints/llm_provider_handlers/anthropic_passthrough_logging_handler.py b/litellm/proxy/pass_through_endpoints/llm_provider_handlers/anthropic_passthrough_logging_handler.py
index 23ef89b3c5c..a7f3a4f84a7 100644
--- a/litellm/proxy/pass_through_endpoints/llm_provider_handlers/anthropic_passthrough_logging_handler.py
+++ b/litellm/proxy/pass_through_endpoints/llm_provider_handlers/anthropic_passthrough_logging_handler.py
@@ -10,12 +10,14 @@ from pydantic import ConfigDict, TypeAdapter
 import litellm
 from litellm._logging import verbose_proxy_logger
 from litellm.constants import ANTHROPIC_BATCHES_ROUTE
+from litellm.litellm_core_utils.asyncify import asyncify
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
 from litellm.litellm_core_utils.litellm_logging import use_custom_pricing_for_model
 from litellm.litellm_core_utils.prompt_templates.common_utils import (
     get_content_from_model_response,
 )
 from litellm.llms.anthropic import get_anthropic_config
+from litellm.llms.anthropic.common_utils import anthropic_error_frame_exception
 from litellm.llms.anthropic.pass_through.stream_assembly import (
     build_complete_streaming_response,
     build_complete_streaming_response_legacy,
@@ -254,6 +256,26 @@ class AnthropicPassthroughLoggingHandler:
             ),
         )
 
+    @staticmethod
+    async def log_error_frame_as_failure(
+        attempt_logging_obj: LiteLLMLoggingObj,
+        request_body: Mapping[str, object],
+        all_chunks: Sequence[str | bytes],
+        error_event: tuple[str, str, int],
+    ) -> None:
+        """A stream closed at the provider's `event: error` frame is one failed attempt of the request: it logs
+        through the attempt-scoped copy its caller took at the close, so the usage it consumed never reaches
+        the success log of the attempt the router opens in its place."""
+        error_type, message, status_code = error_event
+        await asyncify(AnthropicPassthroughLoggingHandler.record_partial_usage_for_failure)(
+            litellm_logging_obj=attempt_logging_obj, request_body=request_body, all_chunks=all_chunks
+        )
+        await attempt_logging_obj.dispatch_failure_handlers(
+            anthropic_error_frame_exception(error_type, message, status_code, str(attempt_logging_obj.model)),
+            "",
+            prefer_async_handlers=True,
+        )
+
     @staticmethod
     def _cost_partial_stream_or_zero(
         partial_response: ModelResponse | TextCompletionResponse, model: str, logging_obj: LiteLLMLoggingObj
diff --git a/litellm/proxy/pass_through_endpoints/streaming_handler.py b/litellm/proxy/pass_through_endpoints/streaming_handler.py
index 8f6a688fecd..6799b82bf06 100644
--- a/litellm/proxy/pass_through_endpoints/streaming_handler.py
+++ b/litellm/proxy/pass_through_endpoints/streaming_handler.py
@@ -165,6 +165,7 @@ class PassThroughStreamingHandler:
             )
 
         logging_scheduled = False
+        stream_ended = False  # rebind-ok: flipped once the upstream ran to its end, so the finally can tell a close-at-frame from a completed stream
         model_name: Final = PassThroughStreamingHandler._extract_model_for_cost_injection(
             request_body=request_body,
             url_route=url_route,
@@ -224,6 +225,7 @@ class PassThroughStreamingHandler:
                         )
                 if pending:
                     yield pending
+            stream_ended = True  # rebind-ok: the finally reads it to spot a close-at-frame
             # Stream completed cleanly.  When the proxy armed deferred
             # dispatch (post-call guardrails active), park the logging
             # coroutine on logging_obj instead of enqueueing now, so
@@ -267,13 +269,46 @@ class PassThroughStreamingHandler:
             # a success would double-log the same request.
             if not logging_scheduled and raw_bytes and response.status_code < 400:
                 logging_scheduled = True
+                superseded_error_event: Final = (
+                    None
+                    if stream_ended
+                    else PassThroughStreamingHandler._error_frame_closed_at(endpoint_type, raw_bytes)
+                )
                 try:
-                    GLOBAL_LOGGING_WORKER.ensure_initialized_and_enqueue(async_coroutine=_build_logging_coroutine())
+                    GLOBAL_LOGGING_WORKER.ensure_initialized_and_enqueue(
+                        async_coroutine=(
+                            _build_logging_coroutine()
+                            if superseded_error_event is None
+                            else AnthropicPassthroughLoggingHandler.log_error_frame_as_failure(
+                                attempt_logging_obj=litellm_logging_obj.attempt_scoped_copy(),
+                                request_body=resolved_request_body,
+                                all_chunks=tuple(raw_bytes),
+                                error_event=superseded_error_event,
+                            )
+                        )
+                    )
                 except Exception as e:
                     verbose_proxy_logger.error("Error scheduling chunk_processor logging: %s", e)
                 else:
                     bind_budget_reservation_to_callbacks(litellm_logging_obj.litellm_params)
 
+    @staticmethod
+    def _error_frame_closed_at(endpoint_type: EndpointType, raw_bytes: Sequence[bytes]) -> tuple[str, str, int] | None:
+        """The provider `event: error` frame of a stream the router closed because a retry or fallback took the
+        request over. That attempt is logged as its own failure, on a copy taken now so the retry's rebinding of
+        the shared logging object never reaches it. A stream that ran to its end or that the client closed keeps
+        logging through the success route, so its usage is still billed."""
+        from litellm.llms.anthropic.pass_through.messages.streaming_iterator import (
+            closing_superseded_attempt,
+            parse_anthropic_error_event,
+        )
+
+        if endpoint_type != EndpointType.ANTHROPIC or not closing_superseded_attempt():
+            return None
+
+        complete_frames, _ = split_complete_sse_frames(b"".join(raw_bytes))
+        return parse_anthropic_error_event(complete_frames)
+
     @staticmethod
     async def route_streaming_logging_to_handler(
         litellm_logging_obj: LiteLLMLoggingObj,
diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py
index a6f8f049d84..7e8727852d8 100644
--- a/litellm/proxy/proxy_server.py
+++ b/litellm/proxy/proxy_server.py
@@ -10014,6 +10014,7 @@ def _pop_complete_sse_frame(buffer: str) -> tuple[str | None, str]:
 _STREAM_KEEPALIVE: Final = object()
 
 _KEEPALIVE_MIN_SECONDS: Final = 1.0
+_STREAM_LOOP_HOLD_SECONDS: Final = 0.05
 _KEEPALIVE_MAX_SECONDS: Final = 300.0
 _EMPTY_MAPPING: Final[Mapping[str, object]] = MappingProxyType({})
 _EMPTY_HEADERS: Final[Mapping[str, str]] = MappingProxyType({})
@@ -10289,7 +10290,14 @@ async def async_data_generator(
             else stream_iterator
         )
 
+        loop_released_at = time.monotonic()  # rebind-ok: last time this stream let other tasks run
         async for item in stream_source:
+            # Unblock the event loop: a stream whose chunks are already buffered never awaits
+            # between chunks, so without this yield one long stream holds the loop for its whole body.
+            # A real await in between may already have released the loop; this only guarantees it
+            if time.monotonic() - loop_released_at >= _STREAM_LOOP_HOLD_SECONDS:
+                await asyncio.sleep(0)
+                loop_released_at = time.monotonic()
             if item is _STREAM_KEEPALIVE:
                 yield ": ping\n\n"
                 continue
diff --git a/litellm/proxy/response_api_endpoints/endpoints.py b/litellm/proxy/response_api_endpoints/endpoints.py
index a44f1d10fda..207e966ef28 100644
--- a/litellm/proxy/response_api_endpoints/endpoints.py
+++ b/litellm/proxy/response_api_endpoints/endpoints.py
@@ -34,6 +34,7 @@ from litellm.integrations.custom_guardrail import ModifyResponseException
 from litellm.litellm_core_utils.core_helpers import as_str_mapping
 from litellm.litellm_core_utils.internal_call_metadata import is_background_response, requests_background
 from litellm.litellm_core_utils.litellm_logging import StandardLoggingPayloadSetup
+from litellm.litellm_core_utils.tool_fields import first_validation_error
 from litellm.llms.openai.responses.guardrail_translation.handler import (
     OpenAIResponsesHandler,
     build_blocked_response,
@@ -45,7 +46,12 @@ from litellm.proxy.auth.user_api_key_auth import (
     user_api_key_auth,
     user_api_key_auth_websocket,
 )
-from litellm.proxy.common_request_processing import ProxyBaseLLMRequestProcessing, cost_headers, create_response
+from litellm.proxy.common_request_processing import (
+    ProxyBaseLLMRequestProcessing,
+    cost_headers,
+    create_response,
+    resolve_counted_tool_fields,
+)
 from litellm.proxy.common_utils.http_parsing_utils import (  # noqa: F401  # legacy module exports
     _read_request_body,  # pyright: ignore[reportPrivateUsage,reportUnusedImport]  # backwards-compatible package export
     _safe_set_request_parsed_body,  # pyright: ignore[reportPrivateUsage,reportUnusedImport]  # backwards-compatible package export
@@ -57,6 +63,7 @@ from litellm.proxy.pass_through_endpoints.llm_provider_handlers.batch_attributio
     request_tags_from_request_data,
 )
 from litellm.proxy.route_llm_request import raise_if_required_body_param_missing
+from litellm.router import Router
 from litellm.types.llms.base import LiteLLMBaseModel
 from litellm.types.llms.openai import (
     REASONING_EFFORT,
@@ -69,7 +76,6 @@ from litellm.types.utils import TokenCountResponse
 if TYPE_CHECKING:
     from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
     from litellm.proxy.utils import ProxyLogging
-    from litellm.router import Router
 
 router: Final = APIRouter()
 _RESPONSES_WS_CONFIG_VALUE_ADAPTER: Final[TypeAdapter[object | None]] = TypeAdapter(object | None)
@@ -1376,6 +1382,15 @@ def _proxy_token_counter() -> _TokenCounter:
 _token_counter_dep: Final = Depends(_proxy_token_counter)
 
 
+def _proxy_llm_router() -> Router | None:
+    from litellm.proxy.proxy_server import llm_router
+
+    return llm_router
+
+
+_llm_router_dep: Final = Depends(_proxy_llm_router)
+
+
 def _responses_invalid_request_response(message: str, param: str | None, code: str | None) -> JSONResponse:
     body: Final[_ResponsesApiErrorBody] = {
         "error": {
@@ -1432,6 +1447,8 @@ def _responses_input_as_token_count_messages(
 async def responses_input_tokens(
     request: Request,
     token_counter: _TokenCounter = _token_counter_dep,
+    llm_router: Router | None = _llm_router_dep,
+    user_api_key_dict: UserAPIKeyAuth = _user_api_key_auth_dep,
 ):
     """
     Count the input tokens of a Responses API request without calling the model.
@@ -1464,6 +1481,13 @@ async def responses_input_tokens(
             code="missing_required_parameter",
         )
 
+    counted_fields: Final = {
+        name: data[name] for name in ("model", "tools", "drop_params", "additional_drop_params") if name in data
+    }
+    token_fields: Final = resolve_counted_tool_fields(counted_fields, llm_router, user_api_key_dict.team_id)
+    if isinstance(token_fields, ProxyException):
+        return _responses_invalid_request_response(message=token_fields.message, param=token_fields.param, code=None)
+
     try:
         payload: Final[_TokenCountPayload] = {
             "model": model_name,
@@ -1471,9 +1495,13 @@ async def responses_input_tokens(
                 input_value=input_value,
                 instructions=data.get("instructions"),
             ),
-            "tools": data.get("tools"),
+            "tools": token_fields.get("tools"),
         }
         token_request: Final = TokenCountRequest.model_validate(payload)
+    except ValidationError as e:
+        return _responses_invalid_request_response(
+            message=first_validation_error(e), param=str(e.errors(include_url=False)[0]["loc"][0]), code=None
+        )
     except Exception as e:
         return _responses_invalid_request_response(
             message=f"Invalid request for token counting: {e}", param=None, code=None
diff --git a/litellm/proxy/utils.py b/litellm/proxy/utils.py
index dc6423c979b..36ace3c1697 100644
--- a/litellm/proxy/utils.py
+++ b/litellm/proxy/utils.py
@@ -3493,6 +3493,7 @@ class ProxyLogging:
         Is triggered when self._is_proxy_only_error() returns True
         """
         litellm_logging_obj: Logging | None = request_data.get("litellm_logging_obj", None)
+        set_up_by_request: Final = litellm_logging_obj is not None
         if litellm_logging_obj is None:
             from litellm._uuid import uuid
 
@@ -3557,7 +3558,9 @@ class ProxyLogging:
                 input = request_data["input"]
                 litellm_logging_obj.model_call_details["input"] = input
                 body_shape_call_type = CallTypes.aembedding.value
-            resolved_call_type: Final = _call_type_for_route(route) or body_shape_call_type
+            resolved_call_type: Final = _call_type_for_route(route) or (
+                None if set_up_by_request else body_shape_call_type
+            )
             if resolved_call_type is not None and litellm_logging_obj.call_type != CallTypes.pass_through.value:
                 litellm_logging_obj.call_type = resolved_call_type
                 litellm_logging_obj.model_call_details["call_type"] = resolved_call_type
diff --git a/litellm/realtime_api/main.py b/litellm/realtime_api/main.py
index aeec0bf67c0..4acce4de586 100644
--- a/litellm/realtime_api/main.py
+++ b/litellm/realtime_api/main.py
@@ -43,6 +43,7 @@ from ..llms.bedrock.realtime.handler import BedrockRealtime
 from ..llms.custom_httpx.http_handler import realtime_ssl_for_url
 from ..llms.openai.live.handler import OpenAILiveSessions
 from ..llms.openai.realtime.handler import OpenAIRealtime
+from ..llms.openai.workload_identity import openai_static_api_key, resolve_openai_bearer_token_async
 from ..llms.vertex_ai.audio_transcription.realtime_transformation import is_vertex_speech_to_text_model
 from ..llms.vertex_ai.realtime.transformation import VertexAIRealtimeConfig, vertex_realtime_config
 from ..llms.vertex_ai.vertex_llm_base import VertexBase
@@ -130,6 +131,17 @@ def _get_realtime_http_provider_config(
     return provider_config, resolved_api_base.rstrip("/"), resolved_api_key
 
 
+async def _realtime_http_bearer_token(
+    custom_llm_provider: str, api_key: str, api_base: str, litellm_params: GenericLiteLLMParams
+) -> str:
+    if custom_llm_provider != LlmProviders.OPENAI.value:
+        return api_key
+    bearer_token: Final = await resolve_openai_bearer_token_async(
+        static_api_key=api_key or None, api_base=api_base, litellm_params=litellm_params.model_dump(exclude_none=True)
+    )
+    return bearer_token or ""
+
+
 @wrapper_client
 async def acreate_realtime_client_secret(
     model: str | None = None,
@@ -180,7 +192,9 @@ async def acreate_realtime_client_secret(
         request_data["session"] = _with_resolved_session_model(request_data["session"], model_name)
     return await base_llm_http_handler.async_realtime_client_secret_handler(
         api_base=resolved_api_base,
-        api_key=resolved_api_key,
+        api_key=await _realtime_http_bearer_token(
+            custom_llm_provider, resolved_api_key, resolved_api_base, litellm_params
+        ),
         request_data=request_data,
         logging_obj=litellm_logging_obj,
         timeout=timeout or request_timeout,
@@ -253,7 +267,9 @@ async def acreate_realtime_transcription_session(
         request_data["input_audio_transcription"]["model"] = model_name
     return await base_llm_http_handler.async_realtime_transcription_session_handler(
         api_base=resolved_api_base,
-        api_key=resolved_api_key,
+        api_key=await _realtime_http_bearer_token(
+            custom_llm_provider, resolved_api_key, resolved_api_base, litellm_params
+        ),
         request_data=request_data,
         logging_obj=litellm_logging_obj,
         timeout=timeout or request_timeout,
@@ -418,17 +434,21 @@ async def _alive_session(
     api_base: str | None,
     api_key: str | None,
     litellm_metadata: Mapping[str, object],
+    litellm_params: Mapping[str, object],
 ) -> None:
     rejection: Final = _live_session_rejection(custom_llm_provider, litellm_metadata)
     if rejection is not None:
         _raise_live_session_rejection(rejection)
+    resolved_api_base: Final = api_base or litellm.api_base or "https://api.openai.com/"
     await openai_live_sessions.async_live_session(
         model=model,
         websocket=websocket,
         logging_obj=litellm_logging_obj,
         session_start=session_start,
-        api_base=api_base or litellm.api_base or "https://api.openai.com/",
-        api_key=api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY"),
+        api_base=resolved_api_base,
+        api_key=await resolve_openai_bearer_token_async(
+            static_api_key=openai_static_api_key(api_key), api_base=resolved_api_base, litellm_params=litellm_params
+        ),
     )
 
 
@@ -497,6 +517,7 @@ async def _arealtime(
             api_base=dynamic_api_base or litellm_params.api_base,
             api_key=dynamic_api_key,
             litellm_metadata=_build_litellm_metadata(kwargs),
+            litellm_params=kwargs,
         )
         return
 
@@ -558,8 +579,9 @@ async def _arealtime(
         )
     elif _custom_llm_provider == "openai":
         api_base = dynamic_api_base or litellm_params.api_base or litellm.api_base or "https://api.openai.com/"
-        # set API KEY
-        api_key = dynamic_api_key or litellm.api_key or litellm.openai_key or get_secret_str("OPENAI_API_KEY")
+        api_key = await resolve_openai_bearer_token_async(
+            static_api_key=openai_static_api_key(dynamic_api_key), api_base=api_base, litellm_params=kwargs
+        )
 
         await openai_realtime.async_realtime(
             model=model,
@@ -774,9 +796,18 @@ async def realtime_health_check(
         str | None, api_version or resolved_params.get("api_version")
     )
     url: str | None = None
+    health_check_api_key: Final = (
+        await resolve_openai_bearer_token_async(
+            static_api_key=openai_static_api_key(resolved_api_key),
+            api_base=resolved_api_base,
+            litellm_params=resolved_params,
+        )
+        if custom_llm_provider == LlmProviders.OPENAI.value
+        else resolved_api_key
+    )
     auth_headers: Final = _realtime_health_check_auth_headers(
         custom_llm_provider=custom_llm_provider,
-        api_key=resolved_api_key,
+        api_key=health_check_api_key,
         model_params=resolved_params,
     )
     if custom_llm_provider == "azure":
diff --git a/litellm/router.py b/litellm/router.py
index b8b42c3d467..ae1c8df619a 100644
--- a/litellm/router.py
+++ b/litellm/router.py
@@ -123,6 +123,7 @@ from litellm.litellm_core_utils.sensitive_data_masker import (
     mask_sensitive_structure,
 )
 from litellm.litellm_core_utils.token_counter import offload_token_count
+from litellm.litellm_core_utils.tool_fields import TOOL_FIELDS, drop_policy
 from litellm.llms.anthropic.common_utils import AnthropicModelInfo, anthropic_error_frame_exception
 from litellm.llms.base_llm.passthrough.transformation import replace_path_segment
 from litellm.llms.base_llm.vector_store.transformation import (
@@ -500,7 +501,9 @@ def model_info_is_active_for_environment(model_info: Mapping[str, object] | None
 _PreRoutingStrategyT = TypeVar("_PreRoutingStrategyT")
 _CallbackT = TypeVar("_CallbackT")
 
-_ALIAS_PARAMS_NEVER_FORWARDED: Final = frozenset({"model", "api_base", "api_key", "api_version"})
+_ALIAS_PARAMS_NEVER_FORWARDED: Final = frozenset(
+    {"model", "api_base", "api_key", "api_version", "responses_api_version"}
+)
 _ALIAS_MARKER_FORWARDED_PARAMS_KWARG: Final = "_alias_marker_forwarded_params"
 _CLAUDE_CODE_SESSION_ID_RE: Final = re.compile(r"^[a-zA-Z0-9_\-]{8,}$")
 _CLAUDE_CODE_SESSION_ROUTER_TTL_SECONDS: Final = 3600
@@ -537,6 +540,7 @@ def _stream_chunks_have_generated_content(chunks: Sequence[ModelResponseStream])
 
 
 _NO_SESSION_KWARGS: Final[Mapping[str, Mapping[str, object]]] = MappingProxyType({})
+_NO_DEFAULT_PARAMS: Final[Mapping[str, object]] = MappingProxyType({})
 _SESSION_ADAPTER: Final = TypeAdapter(Mapping[str, object])
 _MODEL_INFO_ADAPTER: Final = TypeAdapter(Mapping[str, object])
 _LITELLM_PARAMS_ADAPTER: Final = TypeAdapter(Mapping[str, object])
@@ -596,6 +600,21 @@ def _deployment_that_just_failed(request_metadata: object) -> str | None:
     return model_id if isinstance(model_id, str) else None
 
 
+def _drops_malformed_request_tools(
+    deployment_params: Mapping[str, object], defaults: Mapping[str, object], request: Mapping[str, object]
+) -> bool:
+    if isinstance(request.get("tools") or [], (list, tuple)) or not deployment_params.get("tools"):
+        return False
+    set_defaults: Final = {name: value for name, value in defaults.items() if value is not None}
+    return drop_policy({**deployment_params, **set_defaults, **request}).drops("tools")
+
+
+def _merged_tools(deployment_tools: Sequence[object], request_tools: object) -> list[object] | None:
+    if not isinstance(request_tools, (list, tuple)):
+        return None
+    return [*deployment_tools, *request_tools] if deployment_tools or request_tools else None
+
+
 def _deployment_pick_attributes(model: str, request_kwargs: Mapping[str, object] | None) -> Mapping[str, str | int]:
     """Bounded attributes for one deployment pick; attempt is 1-based within the current model group."""
     kwargs: Final = request_kwargs or {}
@@ -4530,7 +4549,9 @@ class Router:
         return deployment_pydantic_obj
 
     @staticmethod
-    def _merge_tools_from_deployment(deployment: dict, kwargs: dict) -> None:
+    def _merge_tools_from_deployment(
+        deployment: dict, kwargs: dict, defaults: Mapping[str, object] = _NO_DEFAULT_PARAMS
+    ) -> None:
         """
         Merge tools from deployment litellm_params with request kwargs.
         When both have tools, concatenate them (deployment tools first, then request tools).
@@ -4541,11 +4562,12 @@ class Router:
             dep_params = dep_params_raw
         else:
             dep_params = dep_params_raw.model_dump(exclude_none=True)
-        dep_tools: Final = dep_params.get("tools") or []
-        req_tools: Final = kwargs.get("tools") or []
-        if dep_tools or req_tools:
-            merged: Final = list(dep_tools) + list(req_tools)
-            kwargs["tools"] = merged
+        if _drops_malformed_request_tools(dep_params, defaults, kwargs):
+            for name in TOOL_FIELDS:
+                kwargs.pop(name, None)
+        merged_tools: Final = _merged_tools(dep_params.get("tools") or [], kwargs.get("tools") or [])
+        if merged_tools is not None:
+            kwargs["tools"] = merged_tools
         if "tool_choice" not in kwargs and dep_params.get("tool_choice") is not None:
             kwargs["tool_choice"] = dep_params["tool_choice"]
 
@@ -4566,7 +4588,7 @@ class Router:
             deployment=deployment, forwarded_keys=kwargs.pop(_ALIAS_MARKER_FORWARDED_PARAMS_KWARG, ())
         ):
             kwargs.pop(key, None)
-        self._merge_tools_from_deployment(deployment=deployment, kwargs=kwargs)
+        self._merge_tools_from_deployment(deployment=deployment, kwargs=kwargs, defaults=self.default_litellm_params)
 
         model_info = deployment.get("model_info", {}).copy()
         deployment_litellm_model_name = deployment["litellm_params"]["model"]
@@ -6069,6 +6091,7 @@ class Router:
         """
         from litellm.llms.anthropic.pass_through.messages.streaming_iterator import (
             aclose_if_supported,
+            aclose_superseded_attempt,
             parse_anthropic_error_event,
             parse_anthropic_refusal_stop_details,
         )
@@ -6078,6 +6101,14 @@ class Router:
 
         source_iterator: Final = response
 
+        async def close_source() -> None:
+            with anyio.CancelScope(shield=True), contextlib.suppress(BaseException):
+                await aclose_if_supported(source_iterator)
+
+        async def close_superseded() -> None:
+            with anyio.CancelScope(shield=True), contextlib.suppress(BaseException):
+                await aclose_superseded_attempt(source_iterator)
+
         async def stream_with_fallbacks() -> AsyncGenerator[bytes, None]:
             from litellm.exceptions import MidStreamFallbackError
 
@@ -6164,11 +6195,11 @@ class Router:
                     model,
                     initial_kwargs,
                     wrapper,
+                    close_superseded,
                 ):
                     yield item
             finally:
-                with anyio.CancelScope(shield=True), contextlib.suppress(BaseException):
-                    await aclose_if_supported(source_iterator)
+                await close_source()
 
         # Referenced by stream_with_fallbacks via closure - assigned here, before
         # the generator body ever runs, so the reference resolves fine despite
@@ -6184,6 +6215,7 @@ class Router:
         model: str,
         initial_kwargs: dict[str, Any],  # mutable-ok: handed to _aanthropic_messages_fallback_attempt, which mutates it
         wrapper: "FallbackAwareAnthropicMessagesStream",
+        close_superseded: Callable[[], Awaitable[None]],
     ) -> AsyncGenerator[bytes, None]:
         """Turns a source-iterator failure into a fallback attempt or the error reaching the caller."""
         from litellm.exceptions import MidStreamFallbackError
@@ -6203,6 +6235,7 @@ class Router:
         )
         if fallback_error is None:
             raise stream_error
+        await close_superseded()
         outcome: Final = await self._astream_retry_same_group(
             fallback_error,
             initial_kwargs,
@@ -10998,6 +11031,7 @@ class Router:
                 persist_across_reloads=False,
                 warning_display_name=model,
                 custom_llm_provider=custom_llm_provider,
+                add_to_provider_model_sets=False,
             )
 
         ## OLD MODEL REGISTRATION ## Kept to prevent breaking changes
diff --git a/litellm/router_utils/common_utils.py b/litellm/router_utils/common_utils.py
index c4e4d9ccc0b..9b9a3d185cc 100644
--- a/litellm/router_utils/common_utils.py
+++ b/litellm/router_utils/common_utils.py
@@ -309,6 +309,9 @@ def filter_team_based_models(
     ]
 
 
+_WEB_SEARCH_TOOL_TYPES: Final = frozenset({"web_search", "web_search_preview"})
+
+
 def _deployment_supports_web_search(deployment: dict) -> bool:
     """
     Check if a deployment supports web search.
@@ -343,14 +346,13 @@ def filter_web_search_deployments(
     if isinstance(healthy_deployments, dict):
         return healthy_deployments
 
-    is_web_search_request = False
-    tools: Final = request_kwargs.get("tools") or []
-    for tool in tools:
-        # These are the two websearch tools for OpenAI / Azure.
-        if tool.get("type") == "web_search" or tool.get("type") == "web_search_preview":
-            is_web_search_request = True
-            break
-
+    tools: Final[object] = request_kwargs.get("tools")
+    is_web_search_request: Final = isinstance(tools, (list, tuple)) and any(
+        isinstance(tool, dict)
+        and isinstance(tool_type := tool.get("type"), str)
+        and tool_type in _WEB_SEARCH_TOOL_TYPES
+        for tool in tools
+    )
     if not is_web_search_request:
         return healthy_deployments
 
diff --git a/litellm/router_utils/cooldown_handlers.py b/litellm/router_utils/cooldown_handlers.py
index c7e3dab0d1a..bb64d912c4c 100644
--- a/litellm/router_utils/cooldown_handlers.py
+++ b/litellm/router_utils/cooldown_handlers.py
@@ -329,6 +329,12 @@ def _should_run_cooldown_logic(
         )
         return False
 
+    if isinstance(original_exception, litellm.MalformedRequestFieldError):
+        verbose_router_logger.debug(
+            "Should Not Run Cooldown Logic: litellm rejected the request before calling the deployment"
+        )
+        return False
+
     if request_kwargs is not None and _is_per_user_provider_request(request_kwargs):
         verbose_router_logger.debug(
             "Should Not Run Cooldown Logic: the failure came from one caller's per-user provider session"
diff --git a/litellm/systemone/main.py b/litellm/systemone/main.py
index c91f504eefa..01f151ef4d0 100644
--- a/litellm/systemone/main.py
+++ b/litellm/systemone/main.py
@@ -1,4 +1,6 @@
+import asyncio
 from collections.abc import Mapping
+from functools import partial
 from typing import Final
 
 import httpx
@@ -75,21 +77,24 @@ async def asystemone(
     assets: DecisionsAssetEntries | None = None,
     **kwargs: object,  # kwargs-ok: litellm_params forwarded by @client
 ) -> DecisionsResponse:
-    call: Final = _prepare_systemone_call(
-        model=model,
-        state=state,
-        questions=questions,
-        images=images,
-        assets=assets,
-        safety_identifier=safety_identifier,
-        audio=audio,
-        videos=videos,
-        api_key=api_key,
-        api_base=api_base,
-        timeout=timeout,
-        custom_llm_provider=custom_llm_provider,
-        extra_headers=extra_headers,
-        kwargs=kwargs,
+    call: Final = await asyncio.to_thread(
+        partial(
+            _prepare_systemone_call,
+            model=model,
+            state=state,
+            questions=questions,
+            images=images,
+            assets=assets,
+            safety_identifier=safety_identifier,
+            audio=audio,
+            videos=videos,
+            api_key=api_key,
+            api_base=api_base,
+            timeout=timeout,
+            custom_llm_provider=custom_llm_provider,
+            extra_headers=extra_headers,
+            kwargs=kwargs,
+        )
     )
     return _systemone_response(await asend(call))
 
diff --git a/litellm/types/guardrails.py b/litellm/types/guardrails.py
index f20a3fa3d7c..33db8cbc6f0 100644
--- a/litellm/types/guardrails.py
+++ b/litellm/types/guardrails.py
@@ -1195,6 +1195,16 @@ class BaseLitellmParams(ContentFilterConfigModel):  # works for new and patch up
         description="Maximum decisions calls in flight at once on the guardrail in each proxy worker. Implemented by guardrail='decision_model'.",
     )
 
+    forward_messages_as_sent: bool | None = Field(
+        default=False,
+        description=(
+            "Only honored by guardrail='generic_guardrail_api'. When True, structured_messages reaches the "
+            "guardrail exactly as the client sent it, so rows can carry provider-native content blocks and "
+            "keys the OpenAI chat types do not declare. Default False sends OpenAI-format chat rows with "
+            "undeclared keys removed."
+        ),
+    )
+
     extra_headers: list[str] | None = Field(
         default=None,
         description=(
diff --git a/litellm/types/litellm_params.py b/litellm/types/litellm_params.py
index 8387afa22bb..174d07a2cea 100644
--- a/litellm/types/litellm_params.py
+++ b/litellm/types/litellm_params.py
@@ -67,6 +67,7 @@ class ProviderConnection:
     api_key: str | None = None
     api_base: str | None = None
     api_version: str | None = None
+    responses_api_version: str | None = None
     region_name: str | None = None
     headers: Mapping[str, str] | None = None
     provider_specific_header: "ProviderSpecificHeader | Sequence[ProviderSpecificHeader] | None" = None
diff --git a/litellm/types/mcp.py b/litellm/types/mcp.py
index 72e564b6919..f0be66f055d 100644
--- a/litellm/types/mcp.py
+++ b/litellm/types/mcp.py
@@ -248,6 +248,15 @@ class MCPCredentials(TypedDict, total=False):
     Optional RFC 8707 resource indicator sent on ID-JAG leg 1
     """
 
+    id_jag_subject_source: ReadOnly[str | None]
+    """
+    Which token ID-JAG leg 1 presents as its RFC 8693 subject_token. ``login_assertion`` (the default) is the
+    identity assertion captured at SSO login, an OIDC id_token or a SAML assertion. ``refresh_token`` exchanges
+    that assertion at the IdP token endpoint once, at login, for a refresh token and presents the refresh token
+    on every leg 1 instead, which is how a SAML requesting app works at IdPs whose ID-JAG exchange does not take
+    a saml2 subject directly.
+    """
+
     id_jag_resource_client_id: ReadOnly[str | None]
     """OAuth client identifier used at the ID-JAG resource authorization server."""
 
diff --git a/litellm/types/mcp_server/mcp_server_manager.py b/litellm/types/mcp_server/mcp_server_manager.py
index f7c4d329781..219f23200d2 100644
--- a/litellm/types/mcp_server/mcp_server_manager.py
+++ b/litellm/types/mcp_server/mcp_server_manager.py
@@ -182,6 +182,7 @@ class MCPServer(LiteLLMBaseModel):
     # posts the ID-JAG assertion to id_jag_resource_token_endpoint.
     id_jag_resource_token_endpoint: str | None = None
     id_jag_resource: str | None = None
+    id_jag_subject_source: str | None = None
     id_jag_resource_client_id: str | None = Field(
         default=None,
         description="OAuth client identifier used at the ID-JAG resource authorization server.",
diff --git a/litellm/types/proxy/guardrails/guardrail_hooks/generic_guardrail_api.py b/litellm/types/proxy/guardrails/guardrail_hooks/generic_guardrail_api.py
index 49eaa154fec..d34a3a13838 100644
--- a/litellm/types/proxy/guardrails/guardrail_hooks/generic_guardrail_api.py
+++ b/litellm/types/proxy/guardrails/guardrail_hooks/generic_guardrail_api.py
@@ -1,7 +1,7 @@
 from collections.abc import Mapping, Sequence
 from typing import Any, Final, Literal, cast  # noqa: TID251  # JSON chat rows have no typed constructor across roles
 
-from pydantic import ConfigDict, Field
+from pydantic import ConfigDict, Field, SerializerFunctionWrapHandler, model_serializer
 from typing_extensions import TypedDict
 
 from litellm.types.llms.base import LiteLLMBaseModel
@@ -17,12 +17,20 @@ class GuardrailToolParam(LiteLLMBaseModel):
     """A tool forwarded verbatim to the guardrail for inspection.
 
     Built-in tools (code_interpreter, file_search, ...) have no ``function`` block
-    and stash their config in tool-specific keys, so only ``type`` is required and
-    ``extra="allow"`` preserves the rest instead of stripping it.
+    and stash their config in tool-specific keys, and provider-native tools such as
+    Gemini ``function_declarations`` carry no ``type`` at all, so nothing is required
+    and ``extra="allow"`` preserves the rest instead of stripping it.
     """
 
     model_config = ConfigDict(extra="allow")
-    type: str
+    type: str | None = None
+
+    @model_serializer(mode="wrap")
+    def _without_absent_type(self, handler: SerializerFunctionWrapHandler) -> Mapping[str, object]:
+        dumped: Final = cast("Mapping[str, object]", handler(self))  # cast-ok: handler dumps this model's fields
+        if self.type is not None:
+            return dumped
+        return {key: value for key, value in dumped.items() if key != "type"}
 
 
 class GenericGuardrailAPIMetadata(TypedDict, total=False):
@@ -62,6 +70,15 @@ class GenericGuardrailAPIOptionalParams(LiteLLMBaseModel):
         ),
     )
 
+    forward_messages_as_sent: bool | None = Field(
+        default=False,
+        description=(
+            "When True, structured_messages reaches the guardrail exactly as the client sent it, so rows can "
+            "carry provider-native content blocks and keys the OpenAI chat types do not declare. False "
+            "(default) sends OpenAI-format chat rows with undeclared keys removed."
+        ),
+    )
+
     streaming_end_of_stream_only: bool | None = Field(
         default=None,
         description=(
diff --git a/litellm/types/router.py b/litellm/types/router.py
index 0ca39e2400d..96add8bb2a1 100644
--- a/litellm/types/router.py
+++ b/litellm/types/router.py
@@ -496,6 +496,7 @@ class GenericLiteLLMParams(CredentialLiteLLMParams, CustomPricingLiteLLMParams):
         def __init__(self, /, **data: object) -> None: ...  # kwargs-ok: provider parameters vary by deployment
 
     custom_llm_provider: str | None = None
+    responses_api_version: str | None = None
     tpm: int | None = None
     rpm: int | None = None
     itpm: int | None = None
@@ -703,6 +704,7 @@ class LiteLLMParamsTypedDict(TypedDict, total=False):
     api_key: str | None
     api_base: str | None
     api_version: str | None
+    responses_api_version: ReadOnly[str | None]
     timeout: float | str | httpx.Timeout | SDKTimeout | None  # writable-ok: preserve timeout updates
     stream_timeout: float | str | None
     max_retries: int | None
@@ -1400,8 +1402,9 @@ def reject_server_owned_wif_params(body: Mapping[str, object]) -> None:
     This lives here rather than under ``litellm.proxy`` so the router can call it on a
     post-authentication merge without core importing from the proxy package.
     """
+    submitted_names: Final = frozenset(key.removesuffix("[]") for key in body)
     for param in _server_owned_wif_litellm_params:
-        if param in body:
+        if param in submitted_names:
             raise ValueError(
                 f"Rejected Request: {param} is a server-owned workload identity federation or OAuth token exchange "
                 "parameter "
diff --git a/litellm/types/utils.py b/litellm/types/utils.py
index a97e35a9021..054a0a1c034 100644
--- a/litellm/types/utils.py
+++ b/litellm/types/utils.py
@@ -3900,6 +3900,7 @@ class MirroredPricingParams(LiteLLMBaseModel):
     output_cost_per_character: float | None = None
     cache_read_input_token_cost: float | None = None
     cache_creation_input_token_cost: float | None = None
+    cache_creation_input_token_cost_above_1hr: float | None = None
     tiered_pricing: list[dict[str, Any]] | None = None
 
 
@@ -3927,7 +3928,6 @@ class CustomPricingLiteLLMParams(MirroredPricingParams):
     input_cost_per_token_priority: float | None = None
     input_cost_per_token_balanced: float | None = None
     input_cost_per_token_ultrafast: float | None = None
-    cache_creation_input_token_cost_above_1hr: float | None = None
     cache_creation_input_token_cost_above_100k_tokens: float | None = None
     cache_creation_input_token_cost_above_1hr_above_100k_tokens: float | None = None
     cache_creation_input_token_cost_above_200k_tokens: float | None = None
diff --git a/litellm/utils.py b/litellm/utils.py
index 2de161a41e9..c1a729e64ad 100644
--- a/litellm/utils.py
+++ b/litellm/utils.py
@@ -101,6 +101,7 @@ from litellm.litellm_core_utils.on_end_byte_stream import (
 )
 from litellm.litellm_core_utils.sensitive_data_masker import redact_credentials_in_payload
 from litellm.litellm_core_utils.tokenizer import strip_special_tokens
+from litellm.litellm_core_utils.tool_fields import MalformedField, resolve_deployment_tool_fields
 from litellm.rust_bridge import tokenizer as tokenizer_dispatch
 from litellm.rust_bridge.catalog import decision
 from litellm.rust_bridge.configuration import Decision
@@ -485,6 +486,7 @@ from .exceptions import (
     BudgetExceededError,
     ContentPolicyViolationError,
     ContextWindowExceededError,
+    MalformedRequestFieldError,
     ModelNotMappedError,
     NotFoundError,
     OpenAIError,
@@ -1619,7 +1621,23 @@ def check_coroutine(value) -> bool:
     return get_coroutine_checker().is_async_callable(value)
 
 
-async def async_pre_call_deployment_hook(kwargs: dict[str, Any], call_type: str):
+def _deployment_provider(kwargs: Mapping[str, object]) -> str:
+    model: Final = kwargs.get("model")
+    custom_llm_provider: Final = kwargs.get("custom_llm_provider")
+    api_base: Final = kwargs.get("api_base")
+    if not isinstance(model, str):
+        return ""
+    try:
+        return litellm.get_llm_provider(
+            model=model,
+            custom_llm_provider=custom_llm_provider if isinstance(custom_llm_provider, str) else None,
+            api_base=api_base if isinstance(api_base, str) else None,
+        )[1]
+    except BadRequestError:
+        return ""
+
+
+async def async_pre_call_deployment_hook(kwargs: dict[str, Any], call_type: str) -> dict[str, Any]:
     """
     Allow modifying the request just before it's sent to the deployment.
 
@@ -1630,7 +1648,16 @@ async def async_pre_call_deployment_hook(kwargs: dict[str, Any], call_type: str)
     except ValueError:
         typed_call_type = None  # unknown call type
 
-    modified_kwargs = kwargs.copy()
+    route: Final[object] = getattr(kwargs.get("litellm_logging_obj"), "call_type", None)
+    resolved: Final = resolve_deployment_tool_fields(kwargs, route)
+    if isinstance(resolved, MalformedField):
+        raise MalformedRequestFieldError(
+            message=resolved.message,
+            model=kwargs.get("model"),
+            llm_provider=_deployment_provider(kwargs),
+            body={"type": "invalid_request_error", "param": resolved.field},
+        )
+    modified_kwargs = dict(resolved)
 
     custom_logger_class: Final = _get_cached_custom_logger()
     for callback in litellm.callbacks:
@@ -3588,6 +3615,7 @@ def register_model(
     persist_across_reloads: bool = True,
     warning_display_name: str | None = None,
     custom_llm_provider: str | None = None,
+    add_to_provider_model_sets: bool = True,
 ):
     """
     Register new / Override existing models (and their pricing) to specific providers.
@@ -3616,6 +3644,10 @@ def register_model(
     ``custom_llm_provider`` scopes the built-in cost-map match to entries for
     that provider, so a deployment id that happens to equal another provider's
     catalog key stays its own provider-less entry instead of merging into it.
+
+    ``add_to_provider_model_sets`` adds the keys to the per-provider model sets
+    behind provider resolution and wildcard model listing. Pass False when the
+    keys are opaque ids rather than model names (e.g. router deployment ids).
     """
 
     loaded_model_cost = {}
@@ -3701,56 +3733,10 @@ def register_model(
         _invalidate_model_cost_lowercase_map()
 
         verbose_logger.debug("added/updated model=%s in litellm.model_cost: %s", model_cost_key, model_cost_key)
-        # add new model names to provider lists
-        if value.get("litellm_provider") == "openai":
-            if key not in litellm.open_ai_chat_completion_models:
-                litellm.open_ai_chat_completion_models.add(key)
-        elif value.get("litellm_provider") == "text-completion-openai":
-            if key not in litellm.open_ai_text_completion_models:
-                litellm.open_ai_text_completion_models.add(key)
-        elif value.get("litellm_provider") == "cohere":
-            if key not in litellm.cohere_models:
-                litellm.cohere_models.add(key)
-        elif value.get("litellm_provider") == "anthropic":
-            if key not in litellm.anthropic_models:
-                litellm.anthropic_models.add(key)
-        elif value.get("litellm_provider") == "openrouter":
-            split_string = key.split("/", 1)
-            if split_string[-1] not in litellm.openrouter_models:
-                litellm.openrouter_models.add(split_string[-1])
-        elif value.get("litellm_provider") == "vercel_ai_gateway":
-            if key not in litellm.vercel_ai_gateway_models:
-                litellm.vercel_ai_gateway_models.add(key)
-        elif value.get("litellm_provider") == "edenai":
-            if key not in litellm.edenai_models:
-                litellm.edenai_models.add(key)
-        elif value.get("litellm_provider") == "vertex_ai-text-models":
-            if key not in litellm.vertex_text_models:
-                litellm.vertex_text_models.add(key)
-        elif value.get("litellm_provider") == "vertex_ai-code-text-models":
-            if key not in litellm.vertex_code_text_models:
-                litellm.vertex_code_text_models.add(key)
-        elif value.get("litellm_provider") == "vertex_ai-chat-models":
-            if key not in litellm.vertex_chat_models:
-                litellm.vertex_chat_models.add(key)
-        elif value.get("litellm_provider") == "vertex_ai-code-chat-models":
-            if key not in litellm.vertex_code_chat_models:
-                litellm.vertex_code_chat_models.add(key)
-        elif value.get("litellm_provider") == "ai21":
-            if key not in litellm.ai21_models:
-                litellm.ai21_models.add(key)
-        elif value.get("litellm_provider") == "nlp_cloud":
-            if key not in litellm.nlp_cloud_models:
-                litellm.nlp_cloud_models.add(key)
-        elif value.get("litellm_provider") == "aleph_alpha":
-            if key not in litellm.aleph_alpha_models:
-                litellm.aleph_alpha_models.add(key)
-        elif value.get("litellm_provider") == "bedrock":
-            if key not in litellm.bedrock_models:
-                litellm.bedrock_models.add(key)
-        elif value.get("litellm_provider") == "novita":
-            if key not in litellm.novita_models:
-                litellm.novita_models.add(key)
+        if add_to_provider_model_sets and value.get("litellm_provider") == "openrouter":
+            litellm.openrouter_models.add(_key_str.split("/", 1)[-1])
+    if add_to_provider_model_sets:
+        litellm.add_known_models(loaded_model_cost)
     return model_cost
 
 
@@ -9422,7 +9408,7 @@ class ProviderConfigManager:
 
             return XAIAudioTranscriptionConfig()
         elif litellm.LlmProviders.OPENAI == provider:
-            if "gpt-4o" in model:
+            if "gpt-4o" in model or (model.startswith("gpt-") and "transcribe" in model):
                 return litellm.OpenAIGPTAudioTranscriptionConfig()
             else:
                 return litellm.OpenAIWhisperAudioTranscriptionConfig()
diff --git a/litellm/vector_stores/vector_store_registry.py b/litellm/vector_stores/vector_store_registry.py
index e0b536d6c57..b93d9874dbc 100644
--- a/litellm/vector_stores/vector_store_registry.py
+++ b/litellm/vector_stores/vector_store_registry.py
@@ -1,6 +1,6 @@
 # litellm/proxy/vector_stores/vector_store_registry.py
 import json
-from collections.abc import Mapping
+from collections.abc import Mapping, Sequence
 from datetime import datetime, timezone
 from itertools import chain
 from typing import (
@@ -11,7 +11,7 @@ from typing import (
     get_args,
 )
 
-from pydantic import ConfigDict, TypeAdapter
+from pydantic import ConfigDict, TypeAdapter, ValidationError
 
 from litellm._logging import verbose_logger
 from litellm.litellm_core_utils.core_helpers import remove_items_at_indices
@@ -34,6 +34,26 @@ else:
     PrismaClient = Any
 
 _DB_ROW: Final = TypeAdapter(Mapping[str, object], config=ConfigDict(strict=True, hide_input_in_errors=True))
+_ITEMS: Final = TypeAdapter(Sequence[object], config=ConfigDict(strict=True))
+_TOOL: Final = TypeAdapter(Mapping[str, object], config=ConfigDict(strict=True))
+_STORE_ID_ITEMS: Final = TypeAdapter(list[object], config=ConfigDict(strict=True))
+
+
+def _named_store_ids(store_ids: object) -> tuple[str, ...]:
+    if isinstance(store_ids, str):
+        return (store_ids,)
+    try:
+        items: Final = _STORE_ID_ITEMS.validate_python(store_ids)
+    except ValidationError:
+        return ()
+    return tuple(store_id for store_id in items if isinstance(store_id, str))
+
+
+def _tool_vector_store_ids(tool: object) -> tuple[str, ...]:
+    try:
+        return _named_store_ids(_TOOL.validate_python(tool).get("vector_store_ids"))
+    except ValidationError:
+        return ()
 
 
 class VectorStoreIndexRegistry:
@@ -131,7 +151,7 @@ class VectorStoreRegistry:
 
         return VectorStoreToolParams(**kwargs)
 
-    def get_vector_store_ids_to_run(self, non_default_params: dict, tools: list[dict] | None = None) -> list[str]:
+    def get_vector_store_ids_to_run(self, non_default_params: dict, tools: object = None) -> list[str]:
         """
         Returns the vector store ids to run
 
@@ -175,7 +195,7 @@ class VectorStoreRegistry:
         tools_to_remove: Final[list[int]] = []
 
         for i, tool in enumerate(tools):
-            tool_vector_store_ids = tool.get("vector_store_ids", [])
+            tool_vector_store_ids = _tool_vector_store_ids(tool)
             if not tool_vector_store_ids:
                 continue
 
@@ -395,14 +415,15 @@ class VectorStoreRegistry:
 
         return vector_stores_to_run
 
-    def _get_vector_store_ids_from_tool_calls(self, tools: list[dict] | None, vector_store_ids: list[str]) -> list[str]:
+    def _get_vector_store_ids_from_tool_calls(self, tools: object, vector_store_ids: list[str]) -> list[str]:
         """
         Returns the vector store ids from the tool calls
         """
-        return [
-            *vector_store_ids,
-            *chain.from_iterable(tool["vector_store_ids"] for tool in tools or () if "vector_store_ids" in tool),
-        ]
+        try:
+            validated_tools: Final = _ITEMS.validate_python(tools)
+        except ValidationError:
+            return vector_store_ids
+        return [*vector_store_ids, *chain.from_iterable(_tool_vector_store_ids(tool) for tool in validated_tools)]
 
     def load_vector_stores_from_config(self, vector_stores_config: list[dict]):
         """
diff --git a/model_prices_and_context_window.json b/model_prices_and_context_window.json
index 49d2ce90af4..c3efaf168ab 100644
--- a/model_prices_and_context_window.json
+++ b/model_prices_and_context_window.json
@@ -342,26 +342,33 @@
     },
     "writer.palmyra-vision-7b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 4096,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_vision": true
     },
     "amazon.nova-lite-v1:0": {
         "cache_read_input_token_cost": 1.5e-08,
         "input_cost_per_token": 6e-08,
+        "input_cost_per_token_batches": 3e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 300000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 2.4e-07,
+        "output_cost_per_token_batches": 1.2e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -371,13 +378,19 @@
     },
     "amazon.nova-2-lite-v1:0": {
         "cache_read_input_token_cost": 7.5e-08,
+        "cache_read_input_token_cost_priority": 1.3125e-07,
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
+        "input_cost_per_token_priority": 5.25e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-06,
+        "output_cost_per_token_batches": 1.25e-06,
+        "output_cost_per_token_priority": 4.375e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -392,13 +405,17 @@
         "input_cost_per_token": 1.25e-06,
         "input_cost_per_image_token": 1.25e-06,
         "input_cost_per_audio_token": 1.25e-06,
+        "input_cost_per_token_batches": 6.25e-07,
+        "input_cost_per_token_priority": 2.1875e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1e-05,
-        "source": "https://aws.amazon.com/nova/pricing/",
+        "output_cost_per_token_batches": 5e-06,
+        "output_cost_per_token_priority": 1.75e-05,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -489,15 +506,21 @@
     "us.amazon.nova-2-lite-v1:0": {
         "cache_read_input_token_cost": 8.25e-08,
         "cache_read_input_token_cost_flex": 4.125e-08,
+        "cache_read_input_token_cost_priority": 1.44375e-07,
         "input_cost_per_token": 3.3e-07,
+        "input_cost_per_token_batches": 1.65e-07,
         "input_cost_per_token_flex": 1.65e-07,
+        "input_cost_per_token_priority": 5.775e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.75e-06,
+        "output_cost_per_token_batches": 1.375e-06,
         "output_cost_per_token_flex": 1.375e-06,
+        "output_cost_per_token_priority": 4.8125e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -512,13 +535,17 @@
         "input_cost_per_token": 1.375e-06,
         "input_cost_per_image_token": 1.375e-06,
         "input_cost_per_audio_token": 1.375e-06,
+        "input_cost_per_token_batches": 6.875e-07,
+        "input_cost_per_token_priority": 2.40625e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 1.1e-05,
-        "source": "https://aws.amazon.com/nova/pricing/",
+        "output_cost_per_token_batches": 5.5e-06,
+        "output_cost_per_token_priority": 1.925e-05,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -548,12 +575,15 @@
     "amazon.nova-micro-v1:0": {
         "cache_read_input_token_cost": 8.75e-09,
         "input_cost_per_token": 3.5e-08,
+        "input_cost_per_token_batches": 1.75e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 1.4e-07,
+        "output_cost_per_token_batches": 7e-08,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_prompt_caching": true,
         "supports_response_schema": true,
@@ -561,13 +591,19 @@
     },
     "amazon.nova-premier-v1:0": {
         "cache_read_input_token_cost": 6.25e-07,
+        "cache_read_input_token_cost_priority": 1.09375e-06,
         "input_cost_per_token": 2.5e-06,
+        "input_cost_per_token_batches": 1.25e-06,
+        "input_cost_per_token_priority": 4.375e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 1.25e-05,
+        "output_cost_per_token_batches": 6.25e-06,
+        "output_cost_per_token_priority": 2.1875e-05,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -578,15 +614,21 @@
     "amazon.nova-pro-v1:0": {
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_flex": 1e-07,
+        "cache_read_input_token_cost_priority": 3.5e-07,
         "input_cost_per_token": 8e-07,
+        "input_cost_per_token_batches": 4e-07,
         "input_cost_per_token_flex": 4e-07,
+        "input_cost_per_token_priority": 1.4e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 300000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 3.2e-06,
+        "output_cost_per_token_batches": 1.6e-06,
         "output_cost_per_token_flex": 1.6e-06,
+        "output_cost_per_token_priority": 5.6e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -3987,7 +4029,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_cache_breakpoint": true,
@@ -8656,7 +8698,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -8705,7 +8747,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -8754,7 +8796,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -8803,7 +8845,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -8852,7 +8894,7 @@
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
         "supports_native_streaming": true,
-        "supports_none_reasoning_effort": true,
+        "supports_none_reasoning_effort": false,
         "supports_parallel_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -23756,19 +23798,23 @@
     },
     "deepseek.v3.2": {
         "input_cost_per_token": 6.2e-07,
+        "input_cost_per_token_batches": 3.1e-07,
         "input_cost_per_token_flex": 3.1e-07,
+        "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 164000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
+        "output_cost_per_token_batches": 9.25e-07,
         "output_cost_per_token_flex": 9.25e-07,
+        "output_cost_per_token_priority": 3.2375e-06,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_native_structured_output": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -33590,15 +33636,19 @@
     "google.gemma-3-12b-it": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 9e-08,
+        "input_cost_per_token_batches": 5e-08,
         "input_cost_per_token_flex": 5e-08,
+        "input_cost_per_token_priority": 1.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.9e-07,
+        "output_cost_per_token_batches": 1.5e-07,
         "output_cost_per_token_flex": 1.5e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-google-gemma-3-12b-it.html",
+        "output_cost_per_token_priority": 5.1e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_response_schema": true,
@@ -33608,15 +33658,19 @@
     "google.gemma-3-27b-it": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2.3e-07,
+        "input_cost_per_token_batches": 1.2e-07,
         "input_cost_per_token_flex": 1.2e-07,
+        "input_cost_per_token_priority": 4e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 3.8e-07,
+        "output_cost_per_token_batches": 1.9e-07,
         "output_cost_per_token_flex": 1.9e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-google-gemma-3-27b-pt.html",
+        "output_cost_per_token_priority": 6.7e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_response_schema": true,
@@ -33626,15 +33680,19 @@
     "google.gemma-3-4b-it": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 4e-08,
+        "input_cost_per_token_batches": 2e-08,
         "input_cost_per_token_flex": 2e-08,
+        "input_cost_per_token_priority": 7e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 8e-08,
+        "output_cost_per_token_batches": 4e-08,
         "output_cost_per_token_flex": 4e-08,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-google-gemma-3-4b-it.html",
+        "output_cost_per_token_priority": 1.4e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -33747,13 +33805,19 @@
     },
     "global.amazon.nova-2-lite-v1:0": {
         "cache_read_input_token_cost": 7.5e-08,
+        "cache_read_input_token_cost_priority": 1.3125e-07,
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
+        "input_cost_per_token_priority": 5.25e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 64000,
         "max_tokens": 64000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-06,
+        "output_cost_per_token_batches": 1.25e-06,
+        "output_cost_per_token_priority": 4.375e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -40334,26 +40398,30 @@
     "meta.llama3-1-70b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7.2e-07,
+        "input_cost_per_token_batches": 3.6e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 7.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-1-70b-instruct.md",
+        "output_cost_per_token_batches": 3.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
     "meta.llama3-1-8b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2.2e-07,
+        "input_cost_per_token_batches": 1.1e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 2.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-1-8b-instruct.md",
+        "output_cost_per_token_batches": 1.1e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
@@ -40408,13 +40476,15 @@
     "meta.llama3-3-70b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7.2e-07,
+        "input_cost_per_token_batches": 3.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 7.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-3-70b-instruct.md",
+        "output_cost_per_token_batches": 3.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
@@ -40819,15 +40889,19 @@
     "minimax.minimax-m2": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
         "input_cost_per_token_flex": 1.5e-07,
+        "input_cost_per_token_priority": 5.2e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 1000000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.2e-06,
+        "output_cost_per_token_batches": 6e-07,
         "output_cost_per_token_flex": 6e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-minimax-minimax-m2.html",
+        "output_cost_per_token_priority": 2.1e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -40838,25 +40912,31 @@
     "minimax.minimax-m2.1": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
         "input_cost_per_token_flex": 1.5e-07,
+        "input_cost_per_token_priority": 5.25e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 196000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.2e-06,
+        "output_cost_per_token_batches": 6e-07,
         "output_cost_per_token_flex": 6e-07,
+        "output_cost_per_token_priority": 2.1e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-minimax-minimax-m2-1.html",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
     },
     "minimax.minimax-m2.5": {
         "input_cost_per_token": 3e-07,
+        "input_cost_per_token_batches": 1.5e-07,
         "input_cost_per_token_flex": 1.5e-07,
+        "input_cost_per_token_priority": 5.25e-07,
         "output_cost_per_token": 1.2e-06,
         "output_cost_per_token_flex": 6e-07,
         "litellm_provider": "bedrock_converse",
@@ -40864,10 +40944,12 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 6e-07,
+        "output_cost_per_token_priority": 2.1e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -41052,33 +41134,41 @@
     "mistral.devstral-2-123b": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 4e-07,
+        "input_cost_per_token_batches": 2e-07,
         "input_cost_per_token_flex": 2e-07,
+        "input_cost_per_token_priority": 7e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 32000,
         "max_tokens": 32000,
         "mode": "chat",
         "output_cost_per_token": 2e-06,
+        "output_cost_per_token_batches": 1e-06,
         "output_cost_per_token_flex": 1e-06,
+        "output_cost_per_token_priority": 3.5e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-mistral-ai-devstral-2-123b.html",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
     },
     "mistral.magistral-small-2509": {
         "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "input_cost_per_token_flex": 2.5e-07,
+        "input_cost_per_token_priority": 8.8e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 40000,
         "max_tokens": 40000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-06,
+        "output_cost_per_token_batches": 7.5e-07,
         "output_cost_per_token_flex": 7.5e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 2.63e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_reasoning": true,
@@ -41088,15 +41178,19 @@
     },
     "mistral.ministral-3-14b-instruct": {
         "input_cost_per_token": 2e-07,
+        "input_cost_per_token_batches": 1e-07,
         "input_cost_per_token_flex": 1e-07,
+        "input_cost_per_token_priority": 3.5e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2e-07,
+        "output_cost_per_token_batches": 1e-07,
         "output_cost_per_token_flex": 1e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 3.5e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -41106,15 +41200,19 @@
     },
     "mistral.ministral-3-3b-instruct": {
         "input_cost_per_token": 1e-07,
+        "input_cost_per_token_batches": 5e-08,
         "input_cost_per_token_flex": 5e-08,
+        "input_cost_per_token_priority": 1.7e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1e-07,
+        "output_cost_per_token_batches": 5e-08,
         "output_cost_per_token_flex": 5e-08,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 1.7e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -41124,15 +41222,19 @@
     },
     "mistral.ministral-3-8b-instruct": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-07,
+        "output_cost_per_token_batches": 7e-08,
         "output_cost_per_token_flex": 7e-08,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 2.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -41177,15 +41279,19 @@
     },
     "mistral.mistral-large-3-675b-instruct": {
         "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "input_cost_per_token_flex": 2.5e-07,
+        "input_cost_per_token_priority": 8.8e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 32000,
         "max_tokens": 32000,
         "mode": "chat",
         "output_cost_per_token": 1.5e-06,
+        "output_cost_per_token_batches": 7.5e-07,
         "output_cost_per_token_flex": 7.5e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 2.63e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -41221,15 +41327,19 @@
     "mistral.voxtral-mini-3b-2507": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 4e-08,
+        "input_cost_per_token_batches": 2e-08,
         "input_cost_per_token_flex": 2e-08,
+        "input_cost_per_token_priority": 7e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 32768,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 4e-08,
+        "output_cost_per_token_batches": 2e-08,
         "output_cost_per_token_flex": 2e-08,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-mistral-ai-voxtral-mini-3b-2507.html",
+        "output_cost_per_token_priority": 7e-08,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": true,
         "supports_system_messages": true,
         "supports_native_structured_output": true
@@ -41237,15 +41347,19 @@
     "mistral.voxtral-small-24b-2507": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 1e-07,
+        "input_cost_per_token_batches": 5e-08,
         "input_cost_per_token_flex": 5e-08,
+        "input_cost_per_token_priority": 1.7e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 32768,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 3e-07,
+        "output_cost_per_token_batches": 1.5e-07,
         "output_cost_per_token_flex": 1.5e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-mistral-ai-voxtral-small-24b-2507.html",
+        "output_cost_per_token_priority": 5.2e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": true,
         "supports_system_messages": true,
         "supports_native_structured_output": true
@@ -42056,13 +42170,17 @@
     "moonshot.kimi-k2-thinking": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 6e-07,
+        "input_cost_per_token_batches": 3e-07,
+        "input_cost_per_token_priority": 1.05e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 2.5e-06,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-moonshot-ai-kimi-k2-thinking.html",
+        "output_cost_per_token_batches": 1.25e-06,
+        "output_cost_per_token_priority": 4.38e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_reasoning": true,
@@ -42073,19 +42191,23 @@
     },
     "moonshotai.kimi-k2.5": {
         "input_cost_per_token": 6e-07,
+        "input_cost_per_token_batches": 3e-07,
         "input_cost_per_token_flex": 3e-07,
+        "input_cost_per_token_priority": 1.05e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 3e-06,
+        "output_cost_per_token_batches": 1.5e-06,
         "output_cost_per_token_flex": 1.5e-06,
+        "output_cost_per_token_priority": 5.25e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true
     },
@@ -43177,15 +43299,19 @@
     "nvidia.nemotron-nano-12b-v2": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2e-07,
+        "input_cost_per_token_batches": 1e-07,
         "input_cost_per_token_flex": 1e-07,
+        "input_cost_per_token_priority": 3.5e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-nvidia-nvidia-nemotron-nano-12b-v2-vl-bf16.html",
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_response_schema": true,
@@ -43195,15 +43321,19 @@
     "nvidia.nemotron-nano-9b-v2": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 6e-08,
+        "input_cost_per_token_batches": 3e-08,
         "input_cost_per_token_flex": 3e-08,
+        "input_cost_per_token_priority": 1.1e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.3e-07,
+        "output_cost_per_token_batches": 1.2e-07,
         "output_cost_per_token_flex": 1.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-nvidia-nvidia-nemotron-nano-9b-v2.html",
+        "output_cost_per_token_priority": 4e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_response_schema": true,
@@ -43212,18 +43342,22 @@
     },
     "nvidia.nemotron-nano-3-30b": {
         "input_cost_per_token": 6e-08,
+        "input_cost_per_token_batches": 3e-08,
         "input_cost_per_token_flex": 3e-08,
+        "input_cost_per_token_priority": 1.1e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.4e-07,
+        "output_cost_per_token_batches": 1.2e-07,
         "output_cost_per_token_flex": 1.2e-07,
+        "output_cost_per_token_priority": 4.2e-07,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_native_structured_output": true,
         "supports_response_schema": true,
@@ -43231,15 +43365,19 @@
     },
     "nvidia.nemotron-super-3-120b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 32000,
         "max_tokens": 32000,
         "mode": "chat",
         "output_cost_per_token": 6.5e-07,
+        "output_cost_per_token_batches": 3.25e-07,
         "output_cost_per_token_flex": 3.25e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 1.1375e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_reasoning": true,
@@ -44731,6 +44869,7 @@
         "supports_bedrock_runtime_chat_completions_tools_with_reasoning": true,
         "supports_bedrock_runtime_chat_completions_inline_reasoning": true,
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
         "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
@@ -44739,9 +44878,10 @@
         "max_tokens": 16384,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
         "output_cost_per_token_priority": 1.05e-06,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -44754,6 +44894,7 @@
         "supports_bedrock_runtime_chat_completions_tools_with_reasoning": true,
         "supports_bedrock_runtime_chat_completions_inline_reasoning": true,
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3.5e-08,
         "input_cost_per_token_flex": 3.5e-08,
         "input_cost_per_token_priority": 1.225e-07,
         "litellm_provider": "bedrock_converse",
@@ -44762,9 +44903,10 @@
         "max_tokens": 16384,
         "mode": "chat",
         "output_cost_per_token": 3e-07,
+        "output_cost_per_token_batches": 1.5e-07,
         "output_cost_per_token_flex": 1.5e-07,
         "output_cost_per_token_priority": 5.25e-07,
-        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/index.json",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_response_schema": true,
@@ -44772,15 +44914,19 @@
     },
     "openai.gpt-oss-safeguard-120b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_bedrock_runtime_chat_completions_inline_reasoning": true,
         "supports_function_calling": true,
@@ -44790,15 +44936,19 @@
     },
     "openai.gpt-oss-safeguard-20b": {
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3e-08,
         "input_cost_per_token_flex": 3e-08,
+        "input_cost_per_token_priority": 1.2e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 2e-07,
+        "output_cost_per_token_batches": 1e-07,
         "output_cost_per_token_flex": 1e-07,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_priority": 3.5e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_bedrock_runtime_chat_completions_inline_reasoning": true,
         "supports_function_calling": true,
@@ -45654,13 +45804,17 @@
     "qwen.qwen3-coder-30b-a3b-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 262144,
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-coder-30b-a3b-instruct.html",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_tool_choice": true,
@@ -45668,15 +45822,19 @@
     },
     "qwen.qwen3-32b-v1:0": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 32768,
         "max_output_tokens": 8192,
         "max_tokens": 8192,
         "mode": "chat",
         "output_cost_per_token": 6e-07,
+        "output_cost_per_token_batches": 3e-07,
         "output_cost_per_token_flex": 3e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-32b.html",
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_tool_choice": true,
@@ -45796,13 +45954,17 @@
     },
     "qwen.qwen3-vl-235b-a22b": {
         "input_cost_per_token": 5.3e-07,
+        "input_cost_per_token_batches": 2.6e-07,
+        "input_cost_per_token_priority": 9.3e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
         "output_cost_per_token": 2.66e-06,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "output_cost_per_token_batches": 1.33e-06,
+        "output_cost_per_token_priority": 4.66e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_function_calling": true,
         "supports_system_messages": true,
@@ -45812,18 +45974,22 @@
     },
     "qwen.qwen3-coder-next": {
         "input_cost_per_token": 5e-07,
+        "input_cost_per_token_batches": 2.5e-07,
         "input_cost_per_token_flex": 2.5e-07,
+        "input_cost_per_token_priority": 8.75e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 256000,
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
         "output_cost_per_token": 1.2e-06,
+        "output_cost_per_token_batches": 6e-07,
         "output_cost_per_token_flex": 6e-07,
+        "output_cost_per_token_priority": 2.1e-06,
         "supports_function_calling": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -47842,12 +48008,15 @@
     "us.amazon.nova-lite-v1:0": {
         "cache_read_input_token_cost": 1.5e-08,
         "input_cost_per_token": 6e-08,
+        "input_cost_per_token_batches": 3e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 300000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 2.4e-07,
+        "output_cost_per_token_batches": 1.2e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -47858,12 +48027,15 @@
     "us.amazon.nova-micro-v1:0": {
         "cache_read_input_token_cost": 8.75e-09,
         "input_cost_per_token": 3.5e-08,
+        "input_cost_per_token_batches": 1.75e-08,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 1.4e-07,
+        "output_cost_per_token_batches": 7e-08,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_prompt_caching": true,
         "supports_response_schema": true,
@@ -47872,15 +48044,21 @@
     "us.amazon.nova-pro-v1:0": {
         "cache_read_input_token_cost": 2e-07,
         "cache_read_input_token_cost_flex": 1e-07,
+        "cache_read_input_token_cost_priority": 3.5e-07,
         "input_cost_per_token": 8e-07,
+        "input_cost_per_token_batches": 4e-07,
         "input_cost_per_token_flex": 4e-07,
+        "input_cost_per_token_priority": 1.4e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 300000,
         "max_output_tokens": 10000,
         "max_tokens": 10000,
         "mode": "chat",
         "output_cost_per_token": 3.2e-06,
+        "output_cost_per_token_batches": 1.6e-06,
         "output_cost_per_token_flex": 1.6e-06,
+        "output_cost_per_token_priority": 5.6e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_pdf_input": true,
         "supports_prompt_caching": true,
@@ -48599,14 +48777,19 @@
     },
     "us.deepseek.v3.2": {
         "input_cost_per_token": 6.2e-07,
+        "input_cost_per_token_batches": 3.1e-07,
         "input_cost_per_token_flex": 3.1e-07,
+        "input_cost_per_token_priority": 1.085e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 163840,
         "max_output_tokens": 163840,
         "max_tokens": 163840,
         "mode": "chat",
         "output_cost_per_token": 1.85e-06,
+        "output_cost_per_token_batches": 9.25e-07,
         "output_cost_per_token_flex": 9.25e-07,
+        "output_cost_per_token_priority": 3.2375e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_native_structured_output": true,
@@ -48648,26 +48831,30 @@
     "us.meta.llama3-1-70b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7.2e-07,
+        "input_cost_per_token_batches": 3.6e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 7.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-1-70b-instruct.md",
+        "output_cost_per_token_batches": 3.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
     "us.meta.llama3-1-8b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 2.2e-07,
+        "input_cost_per_token_batches": 1.1e-07,
         "litellm_provider": "bedrock",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 2.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-1-8b-instruct.md",
+        "output_cost_per_token_batches": 1.1e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
@@ -48722,13 +48909,15 @@
     "us.meta.llama3-3-70b-instruct-v1:0": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7.2e-07,
+        "input_cost_per_token_batches": 3.6e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 128000,
         "max_output_tokens": 4096,
         "max_tokens": 4096,
         "mode": "chat",
         "output_cost_per_token": 7.2e-07,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-meta-llama-3-3-70b-instruct.md",
+        "output_cost_per_token_batches": 3.6e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_function_calling": true,
         "supports_tool_choice": false
     },
@@ -53430,37 +53619,45 @@
     "zai.glm-4.7": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 6e-07,
+        "input_cost_per_token_batches": 3e-07,
         "input_cost_per_token_flex": 3e-07,
+        "input_cost_per_token_priority": 1.05e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 203000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 2.2e-06,
+        "output_cost_per_token_batches": 1.1e-06,
         "output_cost_per_token_flex": 1.1e-06,
+        "output_cost_per_token_priority": 3.85e-06,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-zai-glm-4-7.md",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
     },
     "zai.glm-5": {
         "input_cost_per_token": 1e-06,
+        "input_cost_per_token_batches": 5e-07,
+        "input_cost_per_token_priority": 1.75e-06,
         "output_cost_per_token": 3.2e-06,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 200000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
+        "output_cost_per_token_batches": 1.6e-06,
+        "output_cost_per_token_priority": 5.6e-06,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_native_structured_output": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -53468,19 +53665,23 @@
     "zai.glm-4.7-flash": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3.5e-08,
         "input_cost_per_token_flex": 3.5e-08,
+        "input_cost_per_token_priority": 1.225e-07,
         "litellm_provider": "bedrock_converse",
         "max_input_tokens": 203000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 4e-07,
+        "output_cost_per_token_batches": 2e-07,
         "output_cost_per_token_flex": 2e-07,
+        "output_cost_per_token_priority": 7e-07,
         "supports_function_calling": true,
         "supports_reasoning": true,
         "supports_system_messages": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-zai-glm-4-7-flash.md",
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supports_audio_input": false,
         "supports_response_schema": true,
         "supports_vision": false
@@ -58851,7 +59052,9 @@
     },
     "bedrock_mantle/openai.gpt-oss-120b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "output_cost_per_token": 6e-07,
         "output_cost_per_token_flex": 3e-07,
         "litellm_provider": "bedrock_mantle",
@@ -58859,7 +59062,9 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-oss-120b.html",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/responses"
@@ -58872,7 +59077,9 @@
     },
     "bedrock_mantle/openai.gpt-oss-20b": {
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3.5e-08,
         "input_cost_per_token_flex": 3.5e-08,
+        "input_cost_per_token_priority": 1.225e-07,
         "output_cost_per_token": 3e-07,
         "output_cost_per_token_flex": 1.5e-07,
         "litellm_provider": "bedrock_mantle",
@@ -58880,7 +59087,9 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-oss-20b.html",
+        "output_cost_per_token_batches": 1.5e-07,
+        "output_cost_per_token_priority": 5.25e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supported_endpoints": [
             "/v1/chat/completions",
             "/v1/responses"
@@ -58893,7 +59102,9 @@
     },
     "bedrock_mantle/openai.gpt-oss-safeguard-120b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.6e-07,
         "output_cost_per_token": 6e-07,
         "output_cost_per_token_flex": 3e-07,
         "litellm_provider": "bedrock_mantle",
@@ -58901,7 +59112,9 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-oss-safeguard-120b.html",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
@@ -58912,7 +59125,9 @@
     },
     "bedrock_mantle/openai.gpt-oss-safeguard-20b": {
         "input_cost_per_token": 7e-08,
+        "input_cost_per_token_batches": 3e-08,
         "input_cost_per_token_flex": 3e-08,
+        "input_cost_per_token_priority": 1.2e-07,
         "output_cost_per_token": 2e-07,
         "output_cost_per_token_flex": 1e-07,
         "litellm_provider": "bedrock_mantle",
@@ -58920,7 +59135,9 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-openai-gpt-oss-safeguard-20b.html",
+        "output_cost_per_token_batches": 1e-07,
+        "output_cost_per_token_priority": 3.5e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
@@ -59553,7 +59770,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_prompt_caching": true,
         "supports_prompt_cache_breakpoint": true,
         "supports_reasoning": true,
@@ -59592,7 +59809,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_prompt_caching": true,
         "supports_prompt_cache_breakpoint": true,
         "supports_reasoning": true,
@@ -59675,7 +59892,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59714,7 +59931,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59799,7 +60016,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59834,7 +60051,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59872,7 +60089,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -59907,7 +60124,7 @@
         "supports_function_calling": true,
         "supports_max_reasoning_effort": true,
         "supports_minimal_reasoning_effort": false,
-        "supports_none_reasoning_effort": false,
+        "supports_none_reasoning_effort": true,
         "supports_tool_choice": true,
         "supports_prompt_caching": true,
         "supports_reasoning": true,
@@ -60002,7 +60219,9 @@
     },
     "bedrock_mantle/google.gemma-4-31b": {
         "input_cost_per_token": 1.4e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.45e-07,
         "output_cost_per_token": 4e-07,
         "output_cost_per_token_flex": 2e-07,
         "litellm_provider": "bedrock_mantle",
@@ -60010,6 +60229,9 @@
         "max_output_tokens": 256000,
         "max_tokens": 256000,
         "mode": "chat",
+        "output_cost_per_token_batches": 2e-07,
+        "output_cost_per_token_priority": 7e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60023,7 +60245,9 @@
     },
     "bedrock_mantle/google.gemma-4-26b-a4b": {
         "input_cost_per_token": 1.3e-07,
+        "input_cost_per_token_batches": 6.5e-08,
         "input_cost_per_token_flex": 6.5e-08,
+        "input_cost_per_token_priority": 2.275e-07,
         "output_cost_per_token": 4e-07,
         "output_cost_per_token_flex": 2e-07,
         "litellm_provider": "bedrock_mantle",
@@ -60031,6 +60255,9 @@
         "max_output_tokens": 256000,
         "max_tokens": 256000,
         "mode": "chat",
+        "output_cost_per_token_batches": 2e-07,
+        "output_cost_per_token_priority": 7e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60044,7 +60271,9 @@
     },
     "bedrock_mantle/google.gemma-4-e2b": {
         "input_cost_per_token": 4e-08,
+        "input_cost_per_token_batches": 2e-08,
         "input_cost_per_token_flex": 2e-08,
+        "input_cost_per_token_priority": 7e-08,
         "output_cost_per_token": 8e-08,
         "output_cost_per_token_flex": 4e-08,
         "litellm_provider": "bedrock_mantle",
@@ -60052,6 +60281,9 @@
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
+        "output_cost_per_token_batches": 4e-08,
+        "output_cost_per_token_priority": 1.4e-07,
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json",
         "use_openai_responses_path": true,
         "supported_endpoints": [
             "/v1/chat/completions",
@@ -60068,8 +60300,10 @@
         "input_cost_per_token": 1.25e-06,
         "output_cost_per_token": 2.5e-06,
         "cache_read_input_token_cost": 2e-07,
+        "cache_read_input_token_cost_batches": 1e-07,
         "cache_read_input_token_cost_flex": 1e-07,
         "cache_read_input_token_cost_priority": 3.5e-07,
+        "input_cost_per_token_batches": 6.25e-07,
         "input_cost_per_token_flex": 6.25e-07,
         "input_cost_per_token_priority": 2.1875e-06,
         "litellm_provider": "bedrock_mantle",
@@ -60077,6 +60311,7 @@
         "max_output_tokens": 16384,
         "max_tokens": 16384,
         "mode": "chat",
+        "output_cost_per_token_batches": 1.25e-06,
         "output_cost_per_token_flex": 1.25e-06,
         "output_cost_per_token_priority": 4.375e-06,
         "supported_endpoints": [
@@ -60088,7 +60323,7 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "source": "https://aws.amazon.com/bedrock/pricing/"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/xai.grok-4.6": {
         "use_openai_responses_path": true,
@@ -67524,7 +67759,9 @@
     "bedrock_mantle/deepseek.v3.1": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 5.8e-07,
+        "input_cost_per_token_batches": 2.9e-07,
         "input_cost_per_token_flex": 2.9e-07,
+        "input_cost_per_token_priority": 1.015e-06,
         "output_cost_per_token": 1.68e-06,
         "output_cost_per_token_flex": 8.4e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67532,17 +67769,21 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 8.4e-07,
+        "output_cost_per_token_priority": 2.94e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-deepseek-deepseek-v3-1.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/moonshotai.kimi-k2-thinking": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 6e-07,
+        "input_cost_per_token_batches": 3e-07,
         "input_cost_per_token_flex": 3e-07,
+        "input_cost_per_token_priority": 1.05e-06,
         "output_cost_per_token": 2.5e-06,
         "output_cost_per_token_flex": 1.25e-06,
         "litellm_provider": "bedrock_mantle",
@@ -67550,17 +67791,21 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
+        "output_cost_per_token_batches": 1.25e-06,
+        "output_cost_per_token_priority": 4.38e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_reasoning": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-moonshot-ai-kimi-k2-thinking.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-235b-a22b-2507": {
         "input_cost_per_token": 2.2e-07,
+        "input_cost_per_token_batches": 1.1e-07,
         "input_cost_per_token_flex": 1.1e-07,
+        "input_cost_per_token_priority": 3.85e-07,
         "output_cost_per_token": 8.8e-07,
         "output_cost_per_token_flex": 4.4e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67568,17 +67813,21 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 4.4e-07,
+        "output_cost_per_token_priority": 1.54e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_reasoning": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-235b-a22b-2507.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-32b": {
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "output_cost_per_token": 6e-07,
         "output_cost_per_token_flex": 3e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67586,18 +67835,22 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_reasoning": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-32b.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-coder-30b-a3b-instruct": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 1.5e-07,
+        "input_cost_per_token_batches": 7.5e-08,
         "input_cost_per_token_flex": 7.5e-08,
+        "input_cost_per_token_priority": 2.625e-07,
         "output_cost_per_token": 6e-07,
         "output_cost_per_token_flex": 3e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67605,17 +67858,21 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
+        "output_cost_per_token_batches": 3e-07,
+        "output_cost_per_token_priority": 1.05e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-coder-30b-a3b-instruct.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-coder-480b-a35b-instruct": {
         "deprecation_date": "2027-03-30",
         "input_cost_per_token": 4.5e-07,
+        "input_cost_per_token_batches": 2.25e-07,
         "input_cost_per_token_flex": 2.25e-07,
+        "input_cost_per_token_priority": 7.875e-07,
         "output_cost_per_token": 1.8e-06,
         "output_cost_per_token_flex": 9e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67623,16 +67880,20 @@
         "max_output_tokens": 16000,
         "max_tokens": 16000,
         "mode": "chat",
+        "output_cost_per_token_batches": 9e-07,
+        "output_cost_per_token_priority": 3.15e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-coder-480b-a35b-instruct.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-next-80b-a3b-instruct": {
         "input_cost_per_token": 1.4e-07,
+        "input_cost_per_token_batches": 7e-08,
         "input_cost_per_token_flex": 7e-08,
+        "input_cost_per_token_priority": 2.6e-07,
         "output_cost_per_token": 1.2e-06,
         "output_cost_per_token_flex": 6e-07,
         "litellm_provider": "bedrock_mantle",
@@ -67640,17 +67901,21 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 6e-07,
+        "output_cost_per_token_priority": 2.1e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_reasoning": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-next-80b-a3b.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "bedrock_mantle/qwen.qwen3-vl-235b-a22b-instruct": {
         "input_cost_per_token": 5.3e-07,
+        "input_cost_per_token_batches": 2.6e-07,
         "input_cost_per_token_flex": 2.6e-07,
+        "input_cost_per_token_priority": 9.3e-07,
         "output_cost_per_token": 2.66e-06,
         "output_cost_per_token_flex": 1.33e-06,
         "litellm_provider": "bedrock_mantle",
@@ -67658,13 +67923,15 @@
         "max_output_tokens": 8000,
         "max_tokens": 8000,
         "mode": "chat",
+        "output_cost_per_token_batches": 1.33e-06,
+        "output_cost_per_token_priority": 4.66e-06,
         "supported_endpoints": [
             "/v1/chat/completions"
         ],
         "supports_function_calling": true,
         "supports_tool_choice": true,
         "supports_vision": true,
-        "source": "https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-qwen-qwen3-vl-235b-a22b.html"
+        "source": "https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/current/us-east-1/index.json"
     },
     "azure/us-gov/gpt-5.1": {
         "cache_read_input_token_cost": 1.71875e-07,
@@ -75218,5 +75485,45 @@
         "supports_response_schema": true,
         "supports_tool_choice": true,
         "supports_vision": true
+    },
+    "together_ai/reflection/Beam-1.0-501B-A23B": {
+        "cache_read_input_token_cost": 4e-08,
+        "input_cost_per_token": 4e-07,
+        "litellm_provider": "together_ai",
+        "max_input_tokens": 1048576,
+        "max_tokens": 1048576,
+        "mode": "chat",
+        "output_cost_per_token": 1.2e-06,
+        "source": "https://api.together.ai/v1/models",
+        "supports_function_calling": true,
+        "supports_prompt_caching": true,
+        "supports_response_schema": true
+    },
+    "baseten/reflection/Beam-1.0": {
+        "cache_read_input_token_cost": 1.3e-07,
+        "input_cost_per_token": 1.3e-06,
+        "litellm_provider": "baseten",
+        "max_input_tokens": 1048576,
+        "max_output_tokens": 131072,
+        "max_tokens": 131072,
+        "mode": "chat",
+        "output_cost_per_token": 4.3e-06,
+        "source": "https://inference.baseten.co/v1/models",
+        "supports_function_calling": true,
+        "supports_prompt_caching": true,
+        "supports_reasoning": true,
+        "supports_response_schema": true,
+        "supports_tool_choice": true
+    },
+    "nebius/reflection/beam": {
+        "input_cost_per_token": 2.5e-07,
+        "litellm_provider": "nebius",
+        "max_input_tokens": 1048576,
+        "max_tokens": 1048576,
+        "mode": "chat",
+        "output_cost_per_token": 1e-06,
+        "source": "https://tokenfactory.nebius.com/models/catalog/text2text/reflection%2Fbeam",
+        "supports_function_calling": true,
+        "supports_reasoning": true
     }
 }
diff --git a/pyproject.toml b/pyproject.toml
index 0be8adb7337..854811799a0 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -290,7 +290,7 @@ ci = [
     "langchain-openai==1.1.14",
     "langgraph>=1.2.4,<1.3.0",
     "langgraph-prebuilt>=1.1.0,<1.3.0",
-    "claude-agent-sdk==0.1.44",
+    "claude-agent-sdk==0.2.165",
     "google-cloud-speech==2.40.0",
 ]
 healthcheck = [
diff --git a/tests/code_coverage_tests/router_code_coverage.py b/tests/code_coverage_tests/router_code_coverage.py
index 6762e4cd35c..e669107900d 100644
--- a/tests/code_coverage_tests/router_code_coverage.py
+++ b/tests/code_coverage_tests/router_code_coverage.py
@@ -112,6 +112,8 @@ ignored_function_names = [
     "_get_wildcard_deployments",  # Tested through the get_model_list_of_routed_group wildcard test in test_router.py
     "_is_fallback_hop",  # Tested through the order fallback hop tests in test_router_order_fallback.py
     "_deployment_that_just_failed",  # Tested through the same-boundary hop test in test_router_order_fallback.py
+    "_merged_tools",  # Tested through the _update_kwargs_with_deployment tools merge tests in test_router.py
+    "_drops_malformed_request_tools",  # Tested through the _update_kwargs_with_deployment tools merge tests in test_router.py
     "_collect_ptu_share_teams",  # Cached behind team_ptu_ceiling, tested through the live model list test in test_router.py
     "_resolve_team_ptu_ceiling",  # Cached behind team_ptu_ceiling, tested through the live model list test in test_router.py
     "_register_continuation_prefill_check",  # Tested through the continuation tests in test_router.py
diff --git a/tests/e2e/llm_translation/responses_helpers.py b/tests/e2e/llm_translation/responses_helpers.py
index be0fac74bb6..29b923a7f34 100644
--- a/tests/e2e/llm_translation/responses_helpers.py
+++ b/tests/e2e/llm_translation/responses_helpers.py
@@ -8,10 +8,13 @@ AZURE_OPENAI_BACKEND: Final = "azure/gpt-5.4-nano"
 AZURE_OPENAI_API_VERSION: Final = "v1"
 
 
-def azure_openai_params(api_version: str = AZURE_OPENAI_API_VERSION) -> LiteLLMParamsBody:
+def azure_openai_params(
+    api_version: str = AZURE_OPENAI_API_VERSION, responses_api_version: str | None = None
+) -> LiteLLMParamsBody:
     return LiteLLMParamsBody(
         model=AZURE_OPENAI_BACKEND,
         api_base="os.environ/AZURE_API_BASE",
         api_key="os.environ/AZURE_API_KEY",
         api_version=api_version,
+        responses_api_version=responses_api_version,
     )
diff --git a/tests/e2e/llm_translation/test_image_generation_e2e.py b/tests/e2e/llm_translation/test_image_generation_e2e.py
index 15cf20aa65a..46561ccbc37 100644
--- a/tests/e2e/llm_translation/test_image_generation_e2e.py
+++ b/tests/e2e/llm_translation/test_image_generation_e2e.py
@@ -24,7 +24,10 @@ from sdk_clients import SdkClients
 pytestmark = pytest.mark.e2e
 
 OPENAI_IMAGE_BACKEND: Final = "openai/gpt-image-1-mini"
-BEDROCK_IMAGE_BACKEND: Final = "bedrock/amazon.nova-canvas-v1:0"
+BEDROCK_IMAGE_BACKEND: Final = "bedrock/stability.stable-image-core-v1:1"
+# Nova Canvas reached end of life on 2026-09-30. Stable Image Core is active on Bedrock only in us-west-2:
+# https://docs.aws.amazon.com/bedrock/latest/userguide/model-card-stability-ai-stable-image-core-1-0.html (2026-10-16)
+BEDROCK_IMAGE_REGION: Final = "us-west-2"
 
 
 class _OptionalImageBody(BaseModel):
@@ -96,10 +99,10 @@ class TestImageGeneration:
                 model=BEDROCK_IMAGE_BACKEND,
                 aws_access_key_id="os.environ/AWS_ACCESS_KEY_ID",
                 aws_secret_access_key="os.environ/AWS_SECRET_ACCESS_KEY",
-                aws_region_name="os.environ/AWS_REGION",
+                aws_region_name=BEDROCK_IMAGE_REGION,
             ),
         )
-        images = sdk.openai(key).images.generate(model=model, prompt="Draw a cute cat", n=1, size="1024x1024")
+        images = sdk.openai(key).images.generate(model=model, prompt="Draw a cute cat")
         _assert_image_returned(images)
 
     @pytest.mark.skip(reason="stage red: product gap, /v1/images/generations 500s (aimage_generation TypeError) on missing prompt instead of 400")
diff --git a/tests/e2e/llm_translation/test_responses_e2e.py b/tests/e2e/llm_translation/test_responses_e2e.py
index ee4699703b2..bb75569ad99 100644
--- a/tests/e2e/llm_translation/test_responses_e2e.py
+++ b/tests/e2e/llm_translation/test_responses_e2e.py
@@ -40,7 +40,7 @@ from provider_edge import LiveEdge, start_provider_edge
 from provider_edge_bedrock import ConverseBodyCapture, bedrock_signer
 from proxy_client import ProxyClient
 from pydantic import BaseModel, TypeAdapter
-from responses_helpers import AZURE_OPENAI_BACKEND, azure_openai_params
+from responses_helpers import AZURE_OPENAI_API_VERSION, AZURE_OPENAI_BACKEND, azure_openai_params
 from sdk_clients import NO_PROXY_CACHE, SdkClients
 
 pytestmark = pytest.mark.e2e
@@ -748,6 +748,70 @@ class TestResponses:
             f"/responses over azure openai preview returned no output text: {response.output!r}"
         )
 
+    @meta(
+        Subject(
+            domain=Domain.LLM_TRANSLATION,
+            route=Route.RESPONSES,
+            providers=(Provider.AZURE,),
+            models=(AZURE_OPENAI_BACKEND,),
+            mode=Mode.NONSTREAM,
+        )
+    )
+    def test_responses_azure_openai_dated_ga_chat_api_version_serves_responses(
+        self, proxy: ProxyClient, resources: ResourceManager, sdk: SdkClients
+    ) -> None:
+        model: Final = _register(
+            proxy,
+            resources,
+            azure_openai_params(api_version="2024-10-21"),
+            prefix="e2e-responses-azure-dated-chat",
+        )
+        client: Final = sdk.openai(resources.key())
+
+        response: Final = client.responses.create(
+            model=model,
+            input="reply with one word",
+            instructions=INSTRUCTIONS,
+            extra_body=NO_PROXY_CACHE,
+        )
+        assert response.output_text.strip(), (
+            f"/responses over an azure deployment pinned to a dated GA chat api_version returned no output text: "
+            f"{response.output!r}"
+        )
+
+    @meta(
+        Subject(
+            domain=Domain.LLM_TRANSLATION,
+            route=Route.RESPONSES,
+            providers=(Provider.AZURE,),
+            models=(AZURE_OPENAI_BACKEND,),
+            mode=Mode.NONSTREAM,
+        )
+    )
+    def test_responses_azure_openai_responses_api_version_overrides_a_pre_responses_api_version(
+        self, proxy: ProxyClient, resources: ResourceManager, sdk: SdkClients
+    ) -> None:
+        # Azure rejects /openai/responses below api-version 2025-03-01-preview (probed live 2026-10-15),
+        # so this call only succeeds if the proxy sends responses_api_version instead of api_version.
+        model: Final = _register(
+            proxy,
+            resources,
+            azure_openai_params(api_version="2024-10-01-preview", responses_api_version=AZURE_OPENAI_API_VERSION),
+            prefix="e2e-responses-azure-override",
+        )
+        client: Final = sdk.openai(resources.key())
+
+        response: Final = client.responses.create(
+            model=model,
+            input="reply with one word",
+            instructions=INSTRUCTIONS,
+            extra_body=NO_PROXY_CACHE,
+        )
+        assert response.output_text.strip(), (
+            f"/responses over an azure deployment with responses_api_version set returned no output text: "
+            f"{response.output!r}"
+        )
+
     @meta(
         Subject(
             domain=Domain.LLM_TRANSLATION,
diff --git a/tests/e2e/mcp/test_mcp_tool_search_e2e.py b/tests/e2e/mcp/test_mcp_tool_search_e2e.py
index 847239e8a66..c4a8e29eb82 100644
--- a/tests/e2e/mcp/test_mcp_tool_search_e2e.py
+++ b/tests/e2e/mcp/test_mcp_tool_search_e2e.py
@@ -3,6 +3,7 @@ from __future__ import annotations
 from typing import Final
 
 import pytest
+from pydantic import BaseModel, ConfigDict, TypeAdapter
 from datadog_mcp import SEARCH_LOGS_TOOL, register_datadog_mcp
 from e2e_config import provider_edge_base, unique_marker
 from e2e_http import unwrap
@@ -17,6 +18,19 @@ MCP_TOOL_SEARCH_TOOL_NAME: Final = "mcp_tool_search"
 OVERSIZED_DESCRIPTION: Final = f"OVERSIZED {'weather ' * 12_000}"
 
 
+class _SearchHit(BaseModel):
+    model_config = ConfigDict(frozen=True)
+
+    name: str
+
+
+_SEARCH_HITS: Final = TypeAdapter(tuple[_SearchHit, ...])
+
+
+def _hits_tool(hits: tuple[_SearchHit, ...], tool_name: str) -> bool:
+    return any(hit.name.endswith(f"-{tool_name}") for hit in hits)
+
+
 class TestMcpToolSearch:
     @pytest.mark.covers("mcp.tool_search.api_key.oversized_description_omitted")
     def test_native_tool_search_omits_oversized_description(
@@ -82,5 +96,6 @@ class TestMcpToolSearch:
         )
 
         assert result.is_error is not True, result.all_text
-        assert normal_tool_name in result.all_text
-        assert oversized_tool_name not in result.all_text
+        hits: Final = _SEARCH_HITS.validate_json(result.all_text)
+        assert _hits_tool(hits, normal_tool_name), hits
+        assert not _hits_tool(hits, oversized_tool_name), hits
diff --git a/tests/e2e/models.py b/tests/e2e/models.py
index 08fc7a79df3..d7a10c6da1f 100644
--- a/tests/e2e/models.py
+++ b/tests/e2e/models.py
@@ -1366,6 +1366,7 @@ class LiteLLMParamsBody(BaseModel):
     litellm_credential_name: str | None = None
     api_base: str | None = Field(default=None, repr=False)
     api_version: str | None = None
+    responses_api_version: str | None = None
     realtime_protocol: str | None = None
     allowed_openai_params: list[str] | None = None
     drop_params: bool | None = None
diff --git a/tests/e2e/perf/cases/mixed_size_requests_2rps.py b/tests/e2e/perf/cases/mixed_size_requests_2rps.py
index 41b61cdc987..89263977fb0 100644
--- a/tests/e2e/perf/cases/mixed_size_requests_2rps.py
+++ b/tests/e2e/perf/cases/mixed_size_requests_2rps.py
@@ -69,6 +69,9 @@ CASE: Final = PerformanceTestCase(
         Limit("memory_growth_megabytes", max=600),
         Limit("cpu_seconds_per_request", max=1.26),
         Limit("postgres_calls_per_request", max=3.5),
+        Limit("postgres_max_statement_per_request", max=0.5),
+        Limit("postgres_max_background_statement_per_request", max=0.9),
         Limit("redis_calls_per_request", max=21.0),
     ),
+    background_cap_exempt_tables=frozenset({"LiteLLM_DailyGuardrailMetrics"}),
 )
diff --git a/tests/e2e/perf/cases/small_bodies_5rps.py b/tests/e2e/perf/cases/small_bodies_5rps.py
index 00a9fdefdb5..73772465492 100644
--- a/tests/e2e/perf/cases/small_bodies_5rps.py
+++ b/tests/e2e/perf/cases/small_bodies_5rps.py
@@ -68,6 +68,8 @@ CASE: Final = PerformanceTestCase(
         Limit("time_to_first_token_seconds", percentile=99, max=3.7),
         Limit("memory_growth_megabytes", max=100),
         Limit("postgres_calls_per_request", max=1.8),
+        Limit("postgres_max_statement_per_request", max=0.5),
+        Limit("postgres_max_background_statement_per_request", max=0.9),
         Limit("redis_calls_per_request", max=18),
         Limit("cpu_seconds_per_request", max=0.29),
     ),
diff --git a/tests/e2e/perf/setup/datastore.py b/tests/e2e/perf/setup/datastore.py
index b4ad10b5a5a..54c6943a054 100644
--- a/tests/e2e/perf/setup/datastore.py
+++ b/tests/e2e/perf/setup/datastore.py
@@ -76,6 +76,11 @@ class StatementCalls:
             return "plumbing"
         return "awaited" if verb == "SELECT" and tables[0] in _AWAITED_TABLES else "background"
 
+    @property
+    def table(self) -> str:
+        tables: Final = _TABLE.findall(self.query)
+        return tables[0] if tables else ""
+
     @property
     def summary(self) -> str:
         return re.sub(r"\s+", " ", self.query)[:110]
diff --git a/tests/e2e/perf/setup/observe.py b/tests/e2e/perf/setup/observe.py
index 98391a02418..f634df7de84 100644
--- a/tests/e2e/perf/setup/observe.py
+++ b/tests/e2e/perf/setup/observe.py
@@ -128,6 +128,21 @@ class Observation:
     def statements(self) -> tuple[StatementCalls, ...] | None:
         return statement_deltas(self.db_before, self.db_after)
 
+    @property
+    def busiest_awaited_statement(self) -> StatementCalls | None:
+        """The awaited statement with the most calls: a lookup added to every request shows up here at
+        1.0 per request while cache refreshes stay fractional, which the awaited total cannot tell apart."""
+        awaited: Final = tuple(item for item in self.statements or () if item.bucket == "awaited")
+        return max(awaited, key=_item_count, default=None)
+
+    def busiest_background_statement(self, exempt_tables: frozenset[str]) -> StatementCalls | None:
+        """The background statement with the most calls, skipping the case's per-flush exemptions: a rollup
+        written once per request reads 1.0 here while batched writers stay below it."""
+        background: Final = tuple(
+            item for item in self.statements or () if item.bucket == "background" and item.table not in exempt_tables
+        )
+        return max(background, key=_item_count, default=None)
+
     @property
     def retried_markers(self) -> frozenset[str]:
         counts: Final = Counter(seen.marker for seen in self.mock_requests if seen.marker is not None)
@@ -195,7 +210,9 @@ def _text_sha1(text: str, *, intervened: bool) -> str:
     return hashlib.sha1(original.encode()).hexdigest()
 
 
-def observe(metric: Metric, percentile_rank: int | None, observation: Observation) -> float | None:
+def observe(
+    metric: Metric, percentile_rank: int | None, observation: Observation, exempt_tables: frozenset[str] = frozenset()
+) -> float | None:
     """The observed value of one metric, at a percentile when the metric is per request."""
     per_request: dict[str, list[float]] = {
         "gateway_added_seconds": observation.gateway_added_seconds(),
@@ -209,6 +226,16 @@ def observe(metric: Metric, percentile_rank: int | None, observation: Observatio
         return observation.count_per_request(calls_in("awaited", observation.statements))
     if metric == "postgres_background_calls_per_request":
         return observation.count_per_request(calls_in("background", observation.statements))
+    if metric == "postgres_max_statement_per_request":
+        if observation.statements is None:
+            return None
+        busiest: Final = observation.busiest_awaited_statement
+        return observation.count_per_request(0 if busiest is None else busiest.calls)
+    if metric == "postgres_max_background_statement_per_request":
+        if observation.statements is None:
+            return None
+        busiest_background: Final = observation.busiest_background_statement(exempt_tables)
+        return observation.count_per_request(0 if busiest_background is None else busiest_background.calls)
     if metric == "redis_calls_per_request":
         return observation.count_per_request(calls_in("awaited", observation.redis_commands))
     if metric == "redis_background_calls_per_request":
@@ -225,6 +252,7 @@ class Row:
     percentile: int | None
     observed: float | None
     limit: float | None
+    detail: str = ""
 
     @property
     def label(self) -> str:
@@ -252,6 +280,8 @@ REPORTED: Final[tuple[tuple[Metric, int | None], ...]] = (
     ("memory_growth_megabytes", None),
     ("postgres_calls_per_request", None),
     ("postgres_background_calls_per_request", None),
+    ("postgres_max_statement_per_request", None),
+    ("postgres_max_background_statement_per_request", None),
     ("redis_calls_per_request", None),
     ("redis_background_calls_per_request", None),
     ("cpu_seconds_per_request", None),
@@ -273,12 +303,13 @@ def evaluate(case: PerformanceTestCase, observation: Observation) -> tuple[list[
             Row(
                 metric=metric,
                 percentile=rank,
-                observed=observe(metric, rank, observation),
+                observed=observe(metric, rank, observation, case.background_cap_exempt_tables),
                 limit=limit.max if limit else None,
+                detail=_detail(metric, observation, case.background_cap_exempt_tables),
             )
         )
     exceeded: Final = [
-        f"{row.label}: observed {row.observed:.4f} > limit {row.limit:.4f}"
+        f"{row.label}: observed {row.observed:.4f} > limit {row.limit:.4f}{f' ({row.detail})' if row.detail else ''}"
         if row.over and row.observed is not None and row.limit is not None
         else f"{row.label}: limit set but nothing observed"
         for row in rows
@@ -287,6 +318,16 @@ def evaluate(case: PerformanceTestCase, observation: Observation) -> tuple[list[
     return rows, exceeded
 
 
+def _detail(metric: Metric, observation: Observation, exempt_tables: frozenset[str]) -> str:
+    if metric == "postgres_max_statement_per_request":
+        busiest: Final = observation.busiest_awaited_statement
+        return "" if busiest is None else busiest.summary
+    if metric == "postgres_max_background_statement_per_request":
+        busiest_background: Final = observation.busiest_background_statement(exempt_tables)
+        return "" if busiest_background is None else busiest_background.summary
+    return ""
+
+
 def _row_properties(row: Row) -> tuple[tuple[str, float], ...]:
     observed: Final = ((row.property_name, row.observed),) if row.observed is not None else ()
     limit: Final = ((f"{row.property_name}_limit", row.limit),) if row.limit is not None else ()
diff --git a/tests/e2e/perf/setup/performance_test_case.py b/tests/e2e/perf/setup/performance_test_case.py
index 76e6efa3203..37ad640db62 100644
--- a/tests/e2e/perf/setup/performance_test_case.py
+++ b/tests/e2e/perf/setup/performance_test_case.py
@@ -23,6 +23,8 @@ Metric = Literal[
     "memory_growth_megabytes",
     "postgres_calls_per_request",
     "postgres_background_calls_per_request",
+    "postgres_max_statement_per_request",
+    "postgres_max_background_statement_per_request",
     "cpu_seconds_per_request",
     "redis_calls_per_request",
     "redis_background_calls_per_request",
@@ -148,6 +150,9 @@ class PerformanceTestCase:
     traffic: Traffic
     limits: tuple[Limit, ...]
     mock_latency: MockLatency = field(default_factory=lambda: MockLatency())
+    background_cap_exempt_tables: frozenset[str] = frozenset()
+    """Tables whose background write is one upsert per writer flush and, at this case's request rate, lands
+    above the `postgres_max_background_statement_per_request` cap without being per request."""
 
     def team(self, name: str) -> Team:
         return next(team for team in self.teams if team.name == name)
diff --git a/tests/e2e/ui/helpers/playground.ts b/tests/e2e/ui/helpers/playground.ts
index 866334e1c94..b46a2263072 100644
--- a/tests/e2e/ui/helpers/playground.ts
+++ b/tests/e2e/ui/helpers/playground.ts
@@ -2,42 +2,57 @@ import { expect, type Locator, type Page as PlaywrightPage } from "@playwright/t
 import { navigateToPage, dismissFeedbackPopup } from "./navigation";
 import { Page } from "../fixtures/pages";
 
-/** Controls for the Test Key / Playground page, shared with the router-fallback specs. */
-
-/**
- * The configuration panel is rendered twice, docked and overlay, with one visible at a time.
- * Every control is narrowed to the visible copy or it trips strict mode against its hidden twin.
- */
 export const onlyVisible = (locator: Locator): Locator => locator.filter({ visible: true }).first();
 
-/** The model combobox, addressed by the placeholder its search input shows before selection. */
-export const modelSelect = (page: PlaywrightPage): Locator => onlyVisible(page.getByPlaceholder("Select a Model"));
+export const composer = (page: PlaywrightPage): Locator =>
+  onlyVisible(page.getByRole("group").filter({ has: page.getByRole("textbox", { name: "Message" }) }));
+
+export const modelSelect = (page: PlaywrightPage): Locator =>
+  onlyVisible(page.getByRole("combobox", { name: "Model", exact: true }));
 
 export const sendButton = (page: PlaywrightPage): Locator =>
-  onlyVisible(page.getByRole("button", { name: "Send message" }));
+  composer(page).getByRole("button", { name: "Send message" });
 
-/** The Virtual Key Source dropdown, addressed by the accessible name on its trigger. */
-export const keySourceSelect = (page: PlaywrightPage): Locator =>
-  onlyVisible(page.getByLabel("Virtual Key Source"));
+export const keySourceSelect = (page: PlaywrightPage): Locator => onlyVisible(page.getByLabel("Send as"));
 
 export async function openPlayground(page: PlaywrightPage): Promise<void> {
   await navigateToPage(page, Page.LlmPlayground);
   await dismissFeedbackPopup(page);
-  await expect(onlyVisible(page.getByText("Virtual Key Source"))).toBeVisible({
-    timeout: 20_000,
-  });
+  await expect(modelSelect(page)).toBeVisible({ timeout: 20_000 });
+  const searchHint = page.getByRole("button", { name: "Dismiss search hint" });
+  if (await searchHint.isVisible()) {
+    await searchHint.click();
+  }
+}
+
+export async function openRequestSettings(page: PlaywrightPage): Promise<void> {
+  await composer(page).getByRole("button", { name: "Settings", exact: true }).click();
+  await expect(keySourceSelect(page)).toBeVisible({ timeout: 10_000 });
+}
+
+export async function enterVirtualKey(page: PlaywrightPage, key: string): Promise<void> {
+  await openRequestSettings(page);
+  await keySourceSelect(page).click();
+  await onlyVisible(page.getByRole("option", { name: "Virtual key", exact: true })).click({ timeout: 15_000 });
+  const keyInput = onlyVisible(page.getByLabel("Virtual key", { exact: true }));
+  await expect(keyInput).toBeVisible({ timeout: 10_000 });
+  await keyInput.fill(key);
+  await page.keyboard.press("Escape");
+}
+
+export async function searchModels(page: PlaywrightPage, query: string): Promise<void> {
+  await modelSelect(page).click();
+  await onlyVisible(page.getByPlaceholder("Search models")).fill(query);
 }
 
 export async function selectModel(page: PlaywrightPage, model: string): Promise<void> {
-  const select = modelSelect(page);
-  await select.click();
-  // Virtualized: options outside the rendered window are absent from the DOM, so search first.
-  await select.fill(model);
+  await searchModels(page, model);
   await onlyVisible(page.getByRole("option", { name: model, exact: true })).click({ timeout: 15_000 });
+  await expect(modelSelect(page)).toContainText(model);
 }
 
 export async function sendMessage(page: PlaywrightPage, message: string): Promise<void> {
-  const input = onlyVisible(page.getByPlaceholder("Type your message", { exact: false }));
+  const input = composer(page).getByRole("textbox", { name: "Message" });
   await expect(input).toBeVisible({ timeout: 15_000 });
   await input.fill(message);
   await sendButton(page).click();
diff --git a/tests/e2e/ui/tests/auth/logout.spec.ts b/tests/e2e/ui/tests/auth/logout.spec.ts
index fcdd71898e2..8d251d52ef7 100644
--- a/tests/e2e/ui/tests/auth/logout.spec.ts
+++ b/tests/e2e/ui/tests/auth/logout.spec.ts
@@ -2,6 +2,8 @@ import { test, expect } from "@playwright/test";
 import { Role, users } from "../../fixtures/users";
 import { logInThroughLoginPage } from "../../helpers/userOnboarding";
 
+const LOGOUT_URL = process.env.PROXY_LOGOUT_URL ?? "";
+
 test.describe("Logout", () => {
   test.use({ storageState: { cookies: [], origins: [] } });
 
@@ -9,9 +11,21 @@ test.describe("Logout", () => {
     const admin = users[Role.ProxyAdmin];
     await logInThroughLoginPage(page, admin.email, admin.password);
 
+    if (LOGOUT_URL) {
+      const target = new URL(LOGOUT_URL);
+      await page.route(
+        (url) => url.origin === target.origin,
+        (route) =>
+          route.fulfill({ status: 200, contentType: "text/html", body: "<html><body>logged out</body></html>" }),
+      );
+    }
+    const settingsLoaded = page.waitForResponse((r) => r.url().includes("/sso/get/ui_settings") && r.ok(), {
+      timeout: 30_000,
+    });
     await page.goto("/ui");
     // Scope to the sidebar; the top-bar breadcrumb also shows "Virtual Keys".
     await expect(page.getByRole("complementary").getByText("Virtual Keys")).toBeVisible({ timeout: 10_000 });
+    await settingsLoaded;
 
     // Open the sidebar account menu. The trigger button exposes an aria-label
     // of "Account menu — <role> — signed in as <email>"; clicking it opens the
@@ -22,8 +36,12 @@ test.describe("Logout", () => {
     await expect(popup).toBeVisible({ timeout: 5_000 });
 
     // Click Logout — the handler clears the auth cookie and navigates via
-    // window.location.href = PROXY_LOGOUT_URL (empty string in the e2e env).
+    // window.location.href = PROXY_LOGOUT_URL.
+    const loggedOut = LOGOUT_URL
+      ? page.waitForURL((url) => url.origin === new URL(LOGOUT_URL).origin, { timeout: 15_000 })
+      : page.waitForEvent("load", { timeout: 15_000 });
     await popup.getByRole("button", { name: "Logout" }).click();
+    await loggedOut;
     await expect
       .poll(async () => (await page.context().cookies()).filter((c) => c.name === "token").length, {
         timeout: 15_000,
diff --git a/tests/e2e/ui/tests/guardrails/presidioUserStory.spec.ts b/tests/e2e/ui/tests/guardrails/presidioUserStory.spec.ts
index b4dc7c4e8da..c57a9147ab0 100644
--- a/tests/e2e/ui/tests/guardrails/presidioUserStory.spec.ts
+++ b/tests/e2e/ui/tests/guardrails/presidioUserStory.spec.ts
@@ -3,7 +3,7 @@ import { ADMIN_STORAGE_PATH, MOCK_PRESIDIO_URL, PROPAGATION_TIMEOUT_MS } from ".
 import { navigateToPage, dismissFeedbackPopup } from "../../helpers/navigation";
 import { Page } from "../../fixtures/pages";
 import { CHAT_MODEL_A, masterKey, rootPath, uniqueSuffix, waitForSpendLog } from "../../helpers/traffic";
-import { openPlayground, selectModel, sendButton, onlyVisible } from "../../helpers/playground";
+import { composer, openPlayground, selectModel, sendButton, onlyVisible } from "../../helpers/playground";
 
 const RAW_EMAIL = "jane.doe@example.com";
 const RAW_PHONE = "555-867-5309";
@@ -123,14 +123,12 @@ test.describe("Presidio PII guardrail, end to end from the dashboard", () => {
     await openPlayground(page);
     await selectModel(page, CHAT_MODEL_A);
 
-    const guardrailSelect = onlyVisible(page.getByPlaceholder("Select guardrails"));
-    await expect(guardrailSelect).toBeVisible({ timeout: 20_000 });
-    await guardrailSelect.click();
-    await guardrailSelect.fill(guardrailName);
+    await composer(page).getByRole("combobox", { name: "Guardrails" }).click();
+    await onlyVisible(page.getByPlaceholder("Search guardrails")).fill(guardrailName);
     await onlyVisible(page.getByRole("option", { name: guardrailName, exact: true })).click({ timeout: 20_000 });
     await page.keyboard.press("Escape");
 
-    const input = onlyVisible(page.getByPlaceholder("Type your message", { exact: false }));
+    const input = composer(page).getByRole("textbox", { name: "Message" });
     await expect(input).toBeVisible({ timeout: 15_000 });
 
     await input.fill(prompt);
diff --git a/tests/e2e/ui/tests/internal-user/internalUser.spec.ts b/tests/e2e/ui/tests/internal-user/internalUser.spec.ts
index f392c5104da..d34bc034453 100644
--- a/tests/e2e/ui/tests/internal-user/internalUser.spec.ts
+++ b/tests/e2e/ui/tests/internal-user/internalUser.spec.ts
@@ -9,7 +9,7 @@ import {
 import { Page } from "../../fixtures/pages";
 import { navigateToPage, clickTeamId } from "../../helpers/navigation";
 import { CHAT_MODEL_A, MOCK_RESPONSE_TEXT, masterKey } from "../../helpers/traffic";
-import { keySourceSelect, onlyVisible, openPlayground, selectModel, sendMessage } from "../../helpers/playground";
+import { openPlayground, selectModel, sendMessage, enterVirtualKey } from "../../helpers/playground";
 
 test.describe("Internal User", () => {
   test.use({ storageState: INTERNAL_USER_STORAGE_PATH });
@@ -73,12 +73,7 @@ test.describe("Internal User", () => {
 
     try {
       await openPlayground(page);
-      await keySourceSelect(page).click();
-      await onlyVisible(page.getByRole("option", { name: "Virtual Key" })).click({ timeout: 15_000 });
-
-      const keyInput = onlyVisible(page.getByPlaceholder("Enter custom Virtual Key"));
-      await expect(keyInput).toBeVisible({ timeout: 10_000 });
-      await keyInput.fill(apiKey);
+      await enterVirtualKey(page, apiKey);
 
       await selectModel(page, CHAT_MODEL_A);
       await sendMessage(page, `internal user team key ping ${keyName}`);
diff --git a/tests/e2e/ui/tests/modelsPage/cacheWriteTiers.spec.ts b/tests/e2e/ui/tests/modelsPage/cacheWriteTiers.spec.ts
new file mode 100644
index 00000000000..7d0f02209cf
--- /dev/null
+++ b/tests/e2e/ui/tests/modelsPage/cacheWriteTiers.spec.ts
@@ -0,0 +1,146 @@
+import { test, expect, type Page as PlaywrightPage } from "@playwright/test";
+import { ADMIN_STORAGE_PATH } from "../../constants";
+import { Role, users } from "../../fixtures/users";
+import { Page } from "../../fixtures/pages";
+import { navigateToPage } from "../../helpers/navigation";
+import { captureRequestBody, readBack } from "../../helpers/roundTrip";
+
+const FIVE_MINUTE_PER_MILLION = 3.75;
+const ONE_HOUR_PER_MILLION = 7.5;
+const perToken = (perMillion: number): number => perMillion / 1_000_000;
+const ONE_HOUR_LABEL = /^Cache Write Cost \(1 hour, per 1M tokens\)/;
+
+type Deployment = {
+  model_name?: string;
+  model_info?: { id?: string };
+  litellm_params: {
+    cache_creation_input_token_cost?: number;
+    cache_creation_input_token_cost_above_1hr?: number;
+  };
+};
+
+const masterKey = users[Role.ProxyAdmin].password;
+const auth = { Authorization: `Bearer ${masterKey}` };
+
+async function deleteModel(page: PlaywrightPage, id: string) {
+  await page.request.post("/model/delete", { headers: auth, data: { id } });
+}
+
+async function readDeployment(page: PlaywrightPage, modelId: string): Promise<Deployment | undefined> {
+  const body = await readBack<{ data: Deployment[] }>(page, `/model/info?litellm_model_id=${modelId}`);
+  return body.data[0];
+}
+
+async function selectProvider(page: PlaywrightPage, providerName: string) {
+  const providerDropdown = page.getByRole("combobox", { name: "Provider", exact: true });
+  await providerDropdown.click();
+  await providerDropdown.fill(providerName);
+  await page.getByRole("option").filter({ hasText: providerName }).first().click();
+  await expect(providerDropdown).toHaveValue(providerName);
+}
+
+test.describe("Cache write cost tiers", () => {
+  test.use({ storageState: ADMIN_STORAGE_PATH });
+
+  let createdModelId: string | null = null;
+
+  test.afterEach(async ({ page }) => {
+    if (createdModelId) {
+      await deleteModel(page, createdModelId);
+      createdModelId = null;
+    }
+  });
+
+  test("the edit form saves the 1 hour rate next to the 5 minute rate and the detail view shows both", async ({
+    page,
+  }) => {
+    const modelName = `e2e-cache-tiers-edit-${Date.now()}`;
+    const created = await page.request.post("/model/new", {
+      headers: auth,
+      data: {
+        model_name: modelName,
+        litellm_params: {
+          model: "anthropic/claude-sonnet-4-6",
+          api_key: "sk-e2e-not-used",
+          cache_creation_input_token_cost: perToken(FIVE_MINUTE_PER_MILLION),
+        },
+        model_info: {},
+      },
+    });
+    expect(created.ok(), `POST /model/new for ${modelName}`).toBe(true);
+    createdModelId = (await created.json()).model_info?.id;
+    expect(createdModelId, "model id from /model/new").toBeTruthy();
+
+    await page.goto("/ui");
+    await page.getByText("Models + Endpoints").click();
+    const modelIdCell = page.getByTestId(`model-id-${createdModelId}`);
+    await expect(modelIdCell).toBeVisible({ timeout: 15_000 });
+    await modelIdCell.click();
+    await expect(page.getByText("Back to Models").first()).toBeVisible({ timeout: 10_000 });
+
+    await page.getByRole("button", { name: "Edit Settings" }).click();
+    const oneHour = page.getByLabel(ONE_HOUR_LABEL);
+    await oneHour.waitFor({ timeout: 15_000 });
+    await oneHour.fill(String(ONE_HOUR_PER_MILLION));
+
+    const patchBody = await captureRequestBody(
+      page,
+      { method: "PATCH", urlIncludes: `/model/${createdModelId}/update` },
+      async () => {
+        await page.getByRole("button", { name: "Save Changes" }).click();
+      },
+    );
+    expect(patchBody.litellm_params.cache_creation_input_token_cost_above_1hr, "1 hour rate sent per token").toBe(
+      perToken(ONE_HOUR_PER_MILLION),
+    );
+    await expect(page.getByText("Model settings updated successfully")).toBeVisible({ timeout: 10_000 });
+
+    const stored = await readDeployment(page, createdModelId!);
+    expect(stored?.litellm_params?.cache_creation_input_token_cost_above_1hr, "1 hour rate persisted").toBe(
+      perToken(ONE_HOUR_PER_MILLION),
+    );
+    expect(stored?.litellm_params?.cache_creation_input_token_cost, "5 minute rate untouched").toBe(
+      perToken(FIVE_MINUTE_PER_MILLION),
+    );
+
+    await expect(page.getByText(ONE_HOUR_LABEL)).toBeVisible();
+    await expect(page.getByText(ONE_HOUR_PER_MILLION.toFixed(4))).toBeVisible({ timeout: 10_000 });
+    await expect(page.getByText(FIVE_MINUTE_PER_MILLION.toFixed(4))).toBeVisible();
+  });
+
+  test("Add Model sends both cache write tiers per token", async ({ page }) => {
+    const publicName = `e2e-cache-tiers-add-${Date.now()}`;
+    await navigateToPage(page, Page.Models);
+    await page.getByRole("tab", { name: "Add Model" }).click();
+    await selectProvider(page, "Anthropic");
+
+    await page.getByRole("combobox", { name: "Select models" }).click();
+    await page.getByRole("option", { name: "Custom Model Name (Enter below)" }).click();
+    await page.keyboard.press("Escape");
+    await page.getByPlaceholder("Enter custom model name").fill(publicName);
+    await page.locator("#api_key").fill("sk-e2e-not-used");
+
+    await page.getByText("Advanced Settings").click();
+    await page.getByRole("switch", { name: "Custom Pricing" }).click();
+    await page.getByLabel(/^Input Cost \(per 1M tokens\)/).fill("3");
+    await page.getByLabel(/^Output Cost \(per 1M tokens\)/).fill("15");
+    await page.getByLabel(/^Cache Write Cost \(per 1M tokens\)/).fill(String(FIVE_MINUTE_PER_MILLION));
+    await page.getByLabel(ONE_HOUR_LABEL).fill(String(ONE_HOUR_PER_MILLION));
+
+    const body = await captureRequestBody(page, { method: "POST", urlIncludes: "/model/new" }, async () => {
+      await page.getByTestId("add-model-btn").click();
+    });
+    await expect(page.getByText("created successfully")).toBeVisible({ timeout: 15_000 });
+    const listed = await readBack<{ data: Deployment[] }>(page, "/v2/model/info");
+    createdModelId = listed.data.find((row) => row.model_name === publicName)?.model_info?.id ?? null;
+
+    expect(body.model_name).toBe(publicName);
+    expect(body.litellm_params.cache_creation_input_token_cost, "5 minute rate sent per token").toBe(
+      perToken(FIVE_MINUTE_PER_MILLION),
+    );
+    expect(body.litellm_params.cache_creation_input_token_cost_above_1hr, "1 hour rate sent per token").toBe(
+      perToken(ONE_HOUR_PER_MILLION),
+    );
+    expect(createdModelId, "the model landed in the database").toBeTruthy();
+  });
+});
diff --git a/tests/e2e/ui/tests/modelsPage/clearCustomPricing.spec.ts b/tests/e2e/ui/tests/modelsPage/clearCustomPricing.spec.ts
index c532641b238..34a93c7ce14 100644
--- a/tests/e2e/ui/tests/modelsPage/clearCustomPricing.spec.ts
+++ b/tests/e2e/ui/tests/modelsPage/clearCustomPricing.spec.ts
@@ -87,7 +87,7 @@ test.describe("Clear custom pricing on a deployment", () => {
     // Both cache fields share the same placeholder ("Defaults to Input Cost if blank"),
     // so disambiguate via their labels.
     const cacheReadCost = page.getByLabel(/Cache Read Cost/);
-    const cacheWriteCost = page.getByLabel(/Cache Write Cost/);
+    const cacheWriteCost = page.getByLabel("Cache Write Cost (per 1M tokens)", { exact: true });
     await inputCost.waitFor({ timeout: 15_000 });
     for (const field of [inputCost, outputCost, cacheReadCost, cacheWriteCost]) {
       await field.click({ clickCount: 3 });
diff --git a/tests/e2e/ui/tests/playground/playground.spec.ts b/tests/e2e/ui/tests/playground/playground.spec.ts
index 9a9ecd539b3..205cc57ae46 100644
--- a/tests/e2e/ui/tests/playground/playground.spec.ts
+++ b/tests/e2e/ui/tests/playground/playground.spec.ts
@@ -1,7 +1,14 @@
 import { test, expect } from "@playwright/test";
 import { ADMIN_STORAGE_PATH } from "../../constants";
 import { CHAT_MODEL_A, CHAT_MODEL_B, MOCK_RESPONSE_TEXT, createVirtualKey } from "../../helpers/traffic";
-import { keySourceSelect, onlyVisible, openPlayground, selectModel, sendMessage } from "../../helpers/playground";
+import {
+  keySourceSelect,
+  openPlayground,
+  openRequestSettings,
+  selectModel,
+  sendMessage,
+  enterVirtualKey,
+} from "../../helpers/playground";
 
 /**
  * The one flow that exercises the dashboard's own LLM call path rather than an admin CRUD endpoint,
@@ -14,8 +21,9 @@ test.describe("Playground", () => {
     test(`chats with ${model} using the current UI session`, async ({ page }) => {
       await openPlayground(page);
 
-      // "Current UI Session" is the default: the logged-in admin's key, nothing pasted.
-      await expect(keySourceSelect(page)).toContainText("Current UI Session");
+      await openRequestSettings(page);
+      await expect(keySourceSelect(page)).toContainText("Current UI session");
+      await page.keyboard.press("Escape");
 
       await selectModel(page, model);
       const prompt = `playground ping for ${model}`;
@@ -34,14 +42,7 @@ test.describe("Playground", () => {
 
     await openPlayground(page);
 
-    // Switch the source to "Virtual Key" and paste the key we just minted.
-    await keySourceSelect(page).click();
-    await onlyVisible(page.getByRole("option", { name: "Virtual Key" })).click({ timeout: 15_000 });
-
-    const keyInput = onlyVisible(page.getByPlaceholder("Enter custom Virtual Key"));
-    await expect(keyInput).toBeVisible({ timeout: 10_000 });
-    await keyInput.fill(key);
-
+    await enterVirtualKey(page, key);
     await selectModel(page, CHAT_MODEL_A);
     await sendMessage(page, "playground ping via virtual key");
 
diff --git a/tests/e2e/ui/tests/team-admin/teamAdmin.spec.ts b/tests/e2e/ui/tests/team-admin/teamAdmin.spec.ts
index f3c031f0172..ff41778b2c9 100644
--- a/tests/e2e/ui/tests/team-admin/teamAdmin.spec.ts
+++ b/tests/e2e/ui/tests/team-admin/teamAdmin.spec.ts
@@ -10,7 +10,7 @@ import { Page } from "../../fixtures/pages";
 import { navigateToPage, dismissFeedbackPopup, clickTeamId } from "../../helpers/navigation";
 import { captureRequestBody, readBack } from "../../helpers/roundTrip";
 import { CHAT_MODEL_A, masterKey } from "../../helpers/traffic";
-import { keySourceSelect, modelSelect, onlyVisible, openPlayground } from "../../helpers/playground";
+import { onlyVisible, openPlayground, searchModels, enterVirtualKey } from "../../helpers/playground";
 
 /**
  * Every identifier a roster is addressable by. Which of user_id / user_email is populated depends on
@@ -228,21 +228,14 @@ test.describe("Team Admin", () => {
             .toBe(true);
 
           await openPlayground(page);
-          await keySourceSelect(page).click();
-          await onlyVisible(page.getByRole("option", { name: "Virtual Key" })).click({ timeout: 15_000 });
+          await enterVirtualKey(page, teamKey);
 
-          const keyInput = onlyVisible(page.getByPlaceholder("Enter custom Virtual Key"));
-          await expect(keyInput).toBeVisible({ timeout: 10_000 });
-          await keyInput.fill(teamKey);
-
-          const select = modelSelect(page);
-          await select.click();
-          await select.fill(teamModelName);
+          await searchModels(page, teamModelName);
           await expect(onlyVisible(page.getByRole("option", { name: teamModelName }))).toBeVisible({
             timeout: 15_000,
           });
 
-          await select.fill(CHAT_MODEL_A);
+          await onlyVisible(page.getByPlaceholder("Search models")).fill(CHAT_MODEL_A);
           await expect(onlyVisible(page.getByRole("option", { name: CHAT_MODEL_A }))).toBeVisible({
             timeout: 15_000,
           });
diff --git a/tests/e2e_harness/perf/setup/test_observe.py b/tests/e2e_harness/perf/setup/test_observe.py
index f38e7927fb7..ad54c61aed0 100644
--- a/tests/e2e_harness/perf/setup/test_observe.py
+++ b/tests/e2e_harness/perf/setup/test_observe.py
@@ -69,5 +69,101 @@ def test_junit_properties_carry_each_observed_metric_and_each_limit_including_un
         "perf_gateway_added_seconds_p99": 0.75,
         "perf_postgres_calls_per_request": 10.0,
         "perf_postgres_background_calls_per_request": 0.0,
+        "perf_postgres_max_statement_per_request": 10.0,
+        "perf_postgres_max_background_statement_per_request": 0.0,
         "perf_redis_calls_per_request_limit": 35.0,
     }
+
+
+def _statement(queryid: int, query: str, calls: int) -> StatementCalls:
+    return StatementCalls(queryid=queryid, query=query, calls=calls)
+
+
+def _observation_with(statements: tuple[StatementCalls, ...]) -> Observation:
+    before: Final = tuple(replace(item, calls=0) for item in statements)
+    return Observation(
+        records=tuple(served(seq, 1.0) for seq in range(1000)),
+        mock_requests=(),
+        guardrail_calls=(),
+        rss_before=NO_RSS,
+        rss_after=NO_RSS,
+        wall_seconds=600.0,
+        db_before=DbCounters(commits=0, statements=before),
+        db_after=DbCounters(commits=0, statements=statements),
+    )
+
+
+MAX_STATEMENT_CASE: Final = replace(CASE, limits=(Limit("postgres_max_statement_per_request", max=0.5),))
+BACKGROUND_CAP_CASE: Final = replace(
+    CASE,
+    limits=(Limit("postgres_max_background_statement_per_request", max=0.9),),
+    background_cap_exempt_tables=frozenset({"LiteLLM_DailyGuardrailMetrics"}),
+)
+GUARDRAIL_UPSERT: Final = 'INSERT INTO "LiteLLM_DailyGuardrailMetrics" ("guardrail_id","date") VALUES ($1,$2)'
+MODEL_USAGE_UPSERT: Final = 'INSERT INTO "LiteLLM_DailyModelUsage" ("date","model") VALUES ($1,$2)'
+TEAM_REFRESH: Final = 'SELECT * FROM "LiteLLM_TeamMembership" WHERE user_id = $1'
+USER_LOOKUP: Final = 'SELECT * FROM "LiteLLM_UserTable" WHERE user_id = $1'
+
+
+def test_cache_refreshes_whose_sum_exceeds_the_cap_pass_the_per_statement_limit() -> None:
+    statements: Final = (
+        _statement(1, TEAM_REFRESH, calls=357),
+        _statement(2, USER_LOOKUP, calls=245),
+        _statement(3, 'INSERT INTO "LiteLLM_DailyModelUsage" VALUES ($1)', calls=1000),
+    )
+
+    rows, exceeded = evaluate(MAX_STATEMENT_CASE, _observation_with(statements))
+
+    assert exceeded == []
+    assert dict(junit_properties(rows))["perf_postgres_max_statement_per_request"] == 0.357
+    assert dict(junit_properties(rows))["perf_postgres_calls_per_request"] == 0.602
+
+
+def test_a_lookup_on_every_request_fails_the_per_statement_limit_and_names_the_statement() -> None:
+    statements: Final = (_statement(1, TEAM_REFRESH, calls=357), _statement(2, USER_LOOKUP, calls=1000))
+
+    _, exceeded = evaluate(MAX_STATEMENT_CASE, _observation_with(statements))
+
+    assert exceeded == [f"postgres_max_statement_per_request: observed 1.0000 > limit 0.5000 ({USER_LOOKUP})"], exceeded
+
+
+def test_per_statement_limit_without_db_counters_reports_nothing_observed() -> None:
+    observation: Final = replace(_observation_with(()), db_before=None, db_after=None)
+
+    _, exceeded = evaluate(MAX_STATEMENT_CASE, observation)
+
+    assert exceeded == ["postgres_max_statement_per_request: limit set but nothing observed"]
+
+
+def test_per_flush_rollups_pass_the_background_cap_and_the_exempt_table_is_skipped() -> None:
+    statements: Final = (
+        _statement(1, GUARDRAIL_UPSERT, calls=1150),
+        _statement(2, MODEL_USAGE_UPSERT, calls=810),
+        _statement(3, USER_LOOKUP, calls=1000),
+    )
+
+    rows, exceeded = evaluate(BACKGROUND_CAP_CASE, _observation_with(statements))
+
+    assert exceeded == []
+    assert dict(junit_properties(rows))["perf_postgres_max_background_statement_per_request"] == 0.81
+
+
+def test_a_rollup_written_on_every_request_fails_the_background_cap_and_names_the_statement() -> None:
+    statements: Final = (_statement(1, GUARDRAIL_UPSERT, calls=1050), _statement(2, MODEL_USAGE_UPSERT, calls=1000))
+
+    _, exceeded = evaluate(BACKGROUND_CAP_CASE, _observation_with(statements))
+
+    assert exceeded == [
+        f"postgres_max_background_statement_per_request: observed 1.0000 > limit 0.9000 ({MODEL_USAGE_UPSERT})"
+    ], exceeded
+
+
+def test_background_cap_without_exemptions_counts_the_guardrail_upsert() -> None:
+    case: Final = replace(BACKGROUND_CAP_CASE, background_cap_exempt_tables=frozenset())
+    statements: Final = (_statement(1, GUARDRAIL_UPSERT, calls=1150), _statement(2, MODEL_USAGE_UPSERT, calls=810))
+
+    _, exceeded = evaluate(case, _observation_with(statements))
+
+    assert exceeded == [
+        f"postgres_max_background_statement_per_request: observed 1.1500 > limit 0.9000 ({GUARDRAIL_UPSERT})"
+    ], exceeded
diff --git a/tests/integration/AGENTS.md b/tests/integration/AGENTS.md
index 5a09b66e7ed..a727b20596c 100644
--- a/tests/integration/AGENTS.md
+++ b/tests/integration/AGENTS.md
@@ -25,3 +25,15 @@ By the domain a user would name: `pricing`, `spend`, `routing`, `mcp`. A file on
 directory that a `GROUPS` entry in `run.py` selects. There is no manifest and no `covers` marker on new
 tests. A product bug the test exposes is `pytest.skip("BUG: <symptom>")` at the top of the body, not a
 fix in the test and not a deletion. Needs no network, proxy, DB or Redis: `tests/unit`
+
+CircleCI's integration groups run every file here except the OCI and sandbox tests, which no CI runs, and
+the files in `GITHUB_FILES` in `run.py`. CircleCI runs on main, not on pull requests, so a new file here
+first runs after its PR merges. Wanting a file to run before merge is no reason to change CI, and a new
+dedicated workflow for it is the same mistake as a shared shard. Write the file, leave `GITHUB_FILES` and
+every workflow alone, and tell the user it first runs on main. `GITHUB_FILES` is only for a file that
+needs what CircleCI's groups cannot give it, like the images `image-scan.yml` builds or the plain pytest
+run CircleCI's `roi-database` job gives `test_roi_observed.py`. Add a file there only in that case,
+together with its dedicated job, and list a new dedicated GitHub workflow with the directory it owns in
+`DEDICATED_INTEGRATION_WORKFLOWS` in `.github/scripts/assert_ci_coverage.py`. The `ci-coverage` check
+fails a file here that a GitHub workflow runs unless it is in `GITHUB_FILES` and that workflow owns its
+directory (#46780)
diff --git a/tests/integration/README.md b/tests/integration/README.md
index 33263043489..496c88050ee 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -4,7 +4,7 @@ These tests exercise a running gateway, PostgreSQL and Redis with an owned local
 
 The ROI database contracts in `database/test_roi_observed.py` run as plain pytest outside `run_integration.sh` in CircleCI's `roi-database` Postgres job. The job uploads coverage with the `roi-postgres` flag. These contracts own temporary databases and script only the external provider transport
 
-The Redis cluster IAM contracts in `sdk/test_redis_cluster_iam_auth.py` start their own `redis-server` and mock the cloud credential clients, so they run in the GitHub Actions `redis-compat` matrix against every supported redis-py major rather than in `run_integration.sh`
+The Redis cluster IAM contracts in `sdk/test_redis_cluster_iam_auth.py` start their own `redis-server` and mock the cloud credential clients, so CircleCI's `sdk` group installs `redis-server` before it runs them
 
 The `cost` group is driven by the `CostTrackingTestCase` literals under `cost_calculation/cases/<provider>.py` (gathered by `cost_calculation/catalog.py`), with the scripted cost map in `cost_calculation/cost_map.py`. Each case has a name, contract ID, cost-map model, optional deployment overrides, request body, tagged response and exact or recount expectations. Request bodies use `$MODEL` for the registered proxy model, while responses use `$REQUEST_ID` for the per-run scenario ID. To add a case, add a cost-map entry when the model is new, add the request body and exact provider response data, and add hand-computed expected values. The upstream serves each stored response for any path under `/<scenario_id>`, while the test-owned cost map is served over loopback through `LITELLM_MODEL_COST_MAP_URL`
 
@@ -26,7 +26,7 @@ Reuse the existing canned provider handlers through `_support/upstream.py`. It r
 
 Owned proxies disable `.env` loading by default. A contract testing dotenv behavior can explicitly set `PYTHON_DOTENV_DISABLED=0` in its owned environment. The runner drops inherited `*_API_KEY` variables, so a contract that needs one sets a synthetic value in its owned environment. An explicit scratch writer database drops an inherited reader with a different database name; pass both database URLs when the contract needs a paired reader. Database relays close listeners, active connections and their event loops on teardown. Upstream startup failures reap the child process before returning the failure. Custom subprocesses, direct SQL and background tasks still need an explicit owner in the test
 
-Owned proxy workers configure a 32-thread executor before application startup, preserving additional worker startup hooks. Held synchronous provider calls must not consume a CPU-dependent executor limit before the rest of a fault burst can start. The proxy entrypoint imports LiteLLM inside `main`, so spawned workers begin supervision before importing the application. Worker healthchecks have a five-second deadline by default, so uvicorn kills a worker that stays paused longer than that. Tests never signal proxy processes themselves. `OwnedProxy.kill_worker` SIGKILLs a worker and returns once its replacement answers readiness with its own pid, `replacing_worker` does the same for a kill that has to land mid-burst, and `suspended` pauses a worker or the supervisor, which only works on a proxy launched with `healthcheck=WorkerHealthcheck.LENIENT`. Helper processes that are not the proxy stop through `stop_child`, `stop_processes` and `stop_process_group` and pause through `paused`. `scripts/check_test_quality.py` rule TQ010 rejects a raw `os.kill`, SIGKILL / SIGSTOP / SIGCONT, `.kill()`, `.terminate()`, `.suspend()` or `.send_signal()` anywhere under `tests/integration` outside `_support`, and TQ011 rejects an assertion that caps an elapsed time with a fixed number. Bound timings with `_support/timing.py` instead, relative to a measured control or to the injected delay. `run.py` measures how long this box takes to import the proxy application before it starts pytest, records it in `boot-calibration.json` beside the results and exports it as `INTEGRATION_IMPORT_SECONDS`. Readiness deadlines, graceful stops and the default per-test timeout are multiples of that measurement (`_support/budget.py`), so a slower box gets longer budgets and a two-worker proxy gets twice the readiness deadline of a one-worker one. Readiness requires responsive worker identities that are still alive and a positively identified owned listener. Unreadable socket records cannot establish ownership. Crash tests own their client tasks with `TaskGroup`, release held peers in `finally` and verify that the intended worker dies. A test requiring traffic on both workers prepares that traffic explicitly instead of assuming OS load balancing, for example by sending each half while the other worker is suspended
+Owned proxy workers configure a 32-thread executor before application startup, preserving additional worker startup hooks. Held synchronous provider calls must not consume a CPU-dependent executor limit before the rest of a fault burst can start. The proxy entrypoint imports LiteLLM inside `main`, so spawned workers begin supervision before importing the application. Worker healthchecks have a five-second deadline by default, so uvicorn kills a worker that stays paused longer than that. Tests never signal proxy processes themselves. `OwnedProxy.kill_worker` SIGKILLs a worker and returns once its replacement answers readiness with its own pid, `replacing_worker` does the same for a kill that has to land mid-burst, and `suspended` pauses a worker or the supervisor, which only works on a proxy launched with `healthcheck=WorkerHealthcheck.LENIENT`. The `kill()` that `replacing_worker` yields returns as soon as the worker is dead, so a test can release requests it holds on the surviving worker right away. Uvicorn may take a full worker healthcheck to notice the death, so the block waits for the supervisor to reap the worker and for the replacement only when it exits. Helper processes that are not the proxy stop through `stop_child`, `stop_processes` and `stop_process_group` and pause through `paused`. `scripts/check_test_quality.py` rule TQ010 rejects a raw `os.kill`, SIGKILL / SIGSTOP / SIGCONT, `.kill()`, `.terminate()`, `.suspend()` or `.send_signal()` anywhere under `tests/integration` outside `_support`, and TQ011 rejects an assertion that caps an elapsed time with a fixed number. Bound timings with `_support/timing.py` instead, relative to a measured control or to the injected delay. `run.py` measures how long this box takes to import the proxy application before it starts pytest, records it in `boot-calibration.json` beside the results and exports it as `INTEGRATION_IMPORT_SECONDS`. Readiness deadlines, graceful stops and the default per-test timeout are multiples of that measurement (`_support/budget.py`), so a slower box gets longer budgets and a two-worker proxy gets twice the readiness deadline of a one-worker one. Readiness requires responsive worker identities that are still alive and a positively identified owned listener. Unreadable socket records cannot establish ownership. Crash tests own their client tasks with `TaskGroup`, release held peers in `finally` and verify that the intended worker dies. A test requiring traffic on both workers prepares that traffic explicitly instead of assuming OS load balancing, for example by sending each half while the other worker is suspended
 
 Any port the harness picks before the server that listens on it has started comes from `allocate_port()` in `_support/ports.py`. That covers owned proxies, scripted upstreams, fake providers, OTLP sinks, database relays and Redis. A server that binds port 0 itself and keeps that socket, such as `wire_server` without a port, needs no allocation. Each pytest process claims a block of 200 ports between 10000 and 32767 by holding an exclusive lock file per block in the system temp directory, so two runs on one machine, such as parallel worktrees, never share a block, and the OS drops the lock when the process exits. The range sits above the fixed service ports and below the Linux and macOS ephemeral ranges, so a port-0 bind or an outbound connection never lands in a block. Ports inside a block go out in order and are never handed out twice in a run, a port that something outside the harness already holds is skipped, and a process that uses up its block claims the next free one. A test that restarts a server on the same port allocates that port up front instead of reading it back from the first server. TQ012 in `scripts/check_test_quality.py` rejects reading a port back from a port-0 bind anywhere under `tests/integration`
 
diff --git a/tests/integration/_support/process.py b/tests/integration/_support/process.py
index 3c12414553d..fd61ca3aea2 100644
--- a/tests/integration/_support/process.py
+++ b/tests/integration/_support/process.py
@@ -150,9 +150,9 @@ def _is_reaped(process: psutil.Process) -> bool:
     return False
 
 
-def _wait_until_reaped(process: psutil.Process, supervisor: psutil.Process, seconds: float) -> None:
+def _wait_until_reaped(process: psutil.Process, seconds: float) -> None:
     deadline: Final = time.monotonic() + seconds
-    while not _is_reaped(process) and not _is_stopped(supervisor):
+    while not _is_reaped(process):
         assert time.monotonic() < deadline, f"The supervisor did not reap worker {process.pid} within {seconds:.0f}s"
         time.sleep(0.05)
 
@@ -160,8 +160,6 @@ def _wait_until_reaped(process: psutil.Process, supervisor: psutil.Process, seco
 @dataclass(frozen=True, slots=True)
 class WorkerKill:
     victim: psutil.Process
-    supervisor: psutil.Process
-    reap_seconds: float
     fired: threading.Event
 
     def freeze(self) -> psutil.Process:
@@ -173,7 +171,6 @@ class WorkerKill:
         with suppress(psutil.NoSuchProcess):
             self.victim.kill()
         _wait_until_gone(self.victim, STRICT_HEALTHCHECK_SECONDS)
-        _wait_until_reaped(self.victim, self.supervisor, self.reap_seconds)
         self.fired.set()
 
 
@@ -250,22 +247,22 @@ class OwnedProxy:
         assert pid in before, f"{pid} is not a serving worker of this proxy: {sorted(before)}"
         return psutil.Process(pid), before
 
-    def _worker_kill(self, victim: psutil.Process) -> WorkerKill:
-        reap_seconds: Final = healthcheck_seconds(self.healthcheck) + STRICT_HEALTHCHECK_SECONDS
-        return WorkerKill(victim, psutil.Process(self.process.pid), reap_seconds, threading.Event())
+    def _replacement_of(self, victim: psutil.Process, before: frozenset[int]) -> int:
+        _wait_until_reaped(victim, healthcheck_seconds(self.healthcheck) + STRICT_HEALTHCHECK_SECONDS)
+        return self._await_replacement(before)
 
     @contextmanager
     def replacing_worker(self, pid: int) -> Iterator[WorkerKill]:
         victim, before = self._victim(pid)
-        kill: Final = self._worker_kill(victim)
+        kill: Final = WorkerKill(victim, threading.Event())
         yield kill
         assert kill.fired.is_set(), f"replacing_worker({pid}) exited without killing the worker"
-        self._await_replacement(before)
+        self._replacement_of(victim, before)
 
     def kill_worker(self, pid: int) -> int:
         victim, before = self._victim(pid)
-        self._worker_kill(victim)()
-        return self._await_replacement(before)
+        WorkerKill(victim, threading.Event())()
+        return self._replacement_of(victim, before)
 
     @contextmanager
     def suspended(self, pid: int) -> Iterator[psutil.Process]:
diff --git a/tests/integration/_support/wire.py b/tests/integration/_support/wire.py
index b261973973c..e5ce909ab18 100644
--- a/tests/integration/_support/wire.py
+++ b/tests/integration/_support/wire.py
@@ -6,6 +6,7 @@ import time
 from collections.abc import Callable, Generator, Iterator, Mapping
 from contextlib import contextmanager
 from dataclasses import dataclass
+from functools import partial
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from queue import SimpleQueue
 from types import MappingProxyType
@@ -60,6 +61,7 @@ class Reply:
     abort_after: int | None = None
     gate_after_first: threading.Event | None = None
     pause_between_chunks: float = 0
+    heartbeat: bytes | None = None
     headers: Mapping[str, str] = MappingProxyType({})
     drop_connection: bool = False
 
@@ -82,10 +84,14 @@ class Wire:
         return self.connected.qsize() - self.closed.qsize()
 
 
-def _await_release(gate: threading.Event, closing: threading.Event) -> bool:
+def _await_release(
+    gate: threading.Event, closing: threading.Event, beat: Callable[[], None] | None = None, every: float = 0.05
+) -> bool:
     while not closing.is_set():
-        if gate.wait(timeout=0.05):
+        if gate.wait(timeout=every):
             return True
+        if beat is not None:
+            beat()
     return gate.is_set()
 
 
@@ -117,6 +123,10 @@ def wire_server(
             super().finish()
             closed.put(f"{self.client_address[0]}:{self.client_address[1]}")
 
+        def write_chunk(self, chunk: bytes) -> None:
+            self.wfile.write(b"%x\r\n%s\r\n" % (len(chunk), chunk))
+            self.wfile.flush()
+
         def respond(self) -> None:
             headers: Final = {name.lower(): value for name, value in self.headers.items()}
             try:
@@ -156,12 +166,20 @@ def wire_server(
                     for index, chunk in enumerate(reply.chunks):
                         if reply.abort_after == index:
                             break
-                        self.wfile.write(b"%x\r\n%s\r\n" % (len(chunk), chunk))
-                        self.wfile.flush()
+                        self.write_chunk(chunk)
                         if (
                             index == 0
                             and reply.gate_after_first is not None
-                            and not _await_release(reply.gate_after_first, closing)
+                            and not (
+                                _await_release(reply.gate_after_first, closing)
+                                if reply.heartbeat is None
+                                else _await_release(
+                                    reply.gate_after_first,
+                                    closing,
+                                    partial(self.write_chunk, reply.heartbeat),
+                                    reply.pause_between_chunks,
+                                )
+                            )
                         ):
                             break
                         if reply.pause_between_chunks and index + 1 < len(reply.chunks):
diff --git a/tests/integration/compatibility/test_audio_transcriptions_wire.py b/tests/integration/compatibility/test_audio_transcriptions_wire.py
index 7845e3d2423..8f9a83e9912 100644
--- a/tests/integration/compatibility/test_audio_transcriptions_wire.py
+++ b/tests/integration/compatibility/test_audio_transcriptions_wire.py
@@ -1,15 +1,18 @@
+import io
 import json
 import math
 import mimetypes
 import uuid
+import wave
 from email.message import Message
 from email.parser import BytesParser
 from email.policy import HTTP
+from hashlib import sha256
 from typing import Final, cast
 
 import httpx
 import pytest
-from integration._support.client import Gateway, eventually
+from integration._support.client import JSON_OBJECT, Gateway, eventually, object_value
 from integration._support.database import read_rows
 from integration._support.wire import Reply, Request, wire_server
 from openai import OpenAI
@@ -601,6 +604,31 @@ def test_audio_transcription_consumes_bracketed_form_metadata_tags(gateway: Gate
         ) == (tag,), rows
 
 
+@pytest.mark.parametrize(
+    "identity_param", ("openai_identity_provider_id", "openai_service_account_id", "openai_identity_token_file")
+)
+def test_audio_transcription_refuses_a_bracketed_identity_form_key_before_the_upstream(
+    gateway: Gateway, identity_param: str
+) -> None:
+    wav: Final = _WAV_BYTES + uuid.uuid4().bytes
+
+    def respond(request: Request) -> Reply:
+        return Reply(body=json.dumps(_JSON_TRANSCRIPT).encode())
+
+    with wire_server(respond) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model="openai/whisper-1", api_base=f"{wire.url}/v1", api_key="synthetic-openai-key"
+        )
+        response: Final = gateway.request_multipart(
+            "/v1/audio/transcriptions",
+            {"model": model, "response_format": "json", f"{identity_param}[]": "caller-chosen-" + uuid.uuid4().hex},
+            {"file": ("a.wav", wav, _WAV_CONTENT_TYPE)},
+        )
+        assert response.status_code == 401, response.text
+        assert identity_param in response.text, response.text
+        assert wire.drain() == ()
+
+
 def test_audio_transcription_preserves_the_client_file_content_type(gateway: Gateway) -> None:
     pytest.skip(
         "BUG: the proxy discards the client's file part content type and re-derives it from the filename, "
@@ -671,3 +699,172 @@ def test_audio_transcription_bills_audio_tokens_at_the_input_rate_when_no_audio_
             rel_tol=1e-9,
         ), response.text
         assert [(request.method, request.target) for request in wire.drain()] == [("POST", "/v1/audio/transcriptions")]
+
+
+_GPT_TRANSCRIBE_VERBOSE_JSON_REFUSAL: Final = {
+    "error": {
+        "message": "response_format 'verbose_json' is not compatible with model 'gpt-transcribe'",
+        "type": "invalid_request_error",
+        "param": "response_format",
+        "code": "unsupported_value",
+    }
+}
+_UNDECODABLE_M4A_BYTES: Final = b"\x00\x00\x00\x20ftypM4A \x00\x00\x02\x00M4A isommp42\x00\x00\x00\x08free"
+_DEPLOYMENT_COST_PER_SECOND: Final = 0.0003
+
+
+def _openai_gpt_transcribe_reply(request: Request, reported_seconds: float) -> Reply:
+    fields: Final = dict(_text_parts(_multipart_parts(request)))
+    if fields.get("response_format") == "verbose_json":
+        return Reply(status=400, body=json.dumps(_GPT_TRANSCRIBE_VERBOSE_JSON_REFUSAL).encode())
+    return Reply(
+        body=json.dumps({"text": "hello world", "usage": {"type": "duration", "seconds": reported_seconds}}).encode()
+    )
+
+
+def _uploaded_files(request: Request) -> tuple[tuple[str, str, bytes], ...]:
+    return tuple((name, filename, payload) for name, filename, _, payload in _file_parts(_multipart_parts(request)))
+
+
+def _silent_wav(seconds: float) -> bytes:
+    output: Final = io.BytesIO()
+    with wave.open(output, "wb") as wav:
+        wav.setnchannels(1)
+        wav.setsampwidth(2)
+        wav.setframerate(16000)
+        wav.writeframes(b"\x00\x00" * round(16000 * seconds))
+    return output.getvalue()
+
+
+def _advertised_cost_per_second(gateway: Gateway, model: str) -> float:
+    entries: Final = gateway.get("/v2/model/info", {"model": model})["data"]
+    assert isinstance(entries, list) and len(entries) == 1, entries
+    price: Final = object_value(object_value(entries[0])["model_info"])["input_cost_per_second"]
+    assert isinstance(price, float) and price > 0, entries
+    return price
+
+
+def _response_cost(response: httpx.Response) -> float:
+    return float(response.headers["x-litellm-response-cost"]) if "x-litellm-response-cost" in response.headers else 0.0
+
+
+def _logged_spend(call_id: str) -> float:
+    rows: Final = eventually(
+        lambda: read_rows('SELECT spend FROM "LiteLLM_SpendLogs" WHERE request_id = %s', (call_id,)),
+        lambda values: len(values) == 1,
+        seconds=70,
+    )
+    return float(str(rows[0]["spend"]))
+
+
+def test_gpt_transcribe_without_response_format_reaches_openai_without_verbose_json(gateway: Gateway) -> None:
+    upload: Final = _UNDECODABLE_M4A_BYTES + uuid.uuid4().bytes
+
+    with (
+        wire_server(lambda request: _openai_gpt_transcribe_reply(request, 2)) as wire,
+        gateway.scenario() as scenario,
+    ):
+        model: Final = scenario.model(
+            model="openai/gpt-transcribe", api_base=f"{wire.url}/v1", api_key="synthetic-openai-key"
+        )
+        with _sdk(gateway, "/v1", gateway.key) as sdk:
+            response: Final = sdk.audio.transcriptions.with_raw_response.create(
+                model=model, file=("a.m4a", upload, "audio/mp4")
+            )
+        requests: Final = wire.drain()
+
+    assert response.status_code == 200, response.text
+    assert JSON_OBJECT.validate_json(response.content)["text"] == "hello world", response.text
+    assert [(request.method, request.target) for request in requests] == [("POST", "/v1/audio/transcriptions")]
+    assert _text_parts(_multipart_parts(requests[0])) == (("model", "gpt-transcribe"),)
+    assert _uploaded_files(requests[0]) == (("file", "a.m4a", upload),)
+
+
+@pytest.mark.parametrize(
+    "configured_cost_per_second",
+    (None, _DEPLOYMENT_COST_PER_SECOND),
+    ids=("cost_map_price", "deployment_price"),
+)
+def test_gpt_transcribe_unmeasurable_upload_bills_the_seconds_openai_reports(
+    gateway: Gateway, configured_cost_per_second: float | None
+) -> None:
+    reported_seconds: Final = 2.0
+    upload: Final = _UNDECODABLE_M4A_BYTES + uuid.uuid4().bytes
+
+    with (
+        wire_server(lambda request: _openai_gpt_transcribe_reply(request, reported_seconds)) as wire,
+        gateway.scenario() as scenario,
+    ):
+        model: Final = (
+            scenario.model(
+                model="openai/gpt-transcribe",
+                api_base=f"{wire.url}/v1",
+                api_key="synthetic-openai-key",
+                input_cost_per_second=configured_cost_per_second,
+            )
+            if configured_cost_per_second is not None
+            else scenario.model(
+                model="openai/gpt-transcribe", api_base=f"{wire.url}/v1", api_key="synthetic-openai-key"
+            )
+        )
+        key: Final = scenario.key(models=[model])
+        cost_per_second: Final = (
+            configured_cost_per_second
+            if configured_cost_per_second is not None
+            else _advertised_cost_per_second(gateway, model)
+        )
+        response: Final = gateway.request_multipart(
+            "/v1/audio/transcriptions",
+            {"model": model, "response_format": "json"},
+            {"file": ("a.m4a", upload, "audio/mp4")},
+            key=key,
+        )
+        expected_cost: Final = reported_seconds * cost_per_second
+
+        assert response.status_code == 200, response.text
+        assert JSON_OBJECT.validate_json(response.content)["text"] == "hello world", response.text
+        assert math.isclose(_response_cost(response), expected_cost), (_response_cost(response), expected_cost)
+        assert math.isclose(_logged_spend(response.headers["x-litellm-call-id"]), expected_cost)
+        key_rows: Final = eventually(
+            lambda: read_rows(
+                'SELECT spend FROM "LiteLLM_VerificationToken" WHERE token = %s',
+                (sha256(key.encode()).hexdigest(),),
+            ),
+            lambda rows: len(rows) == 1 and float(str(rows[0]["spend"])) > 0,
+            seconds=70,
+        )
+        assert math.isclose(float(str(key_rows[0]["spend"])), expected_cost), key_rows
+        requests: Final = wire.drain()
+
+    assert [(request.method, request.target) for request in requests] == [("POST", "/v1/audio/transcriptions")]
+    assert _uploaded_files(requests[0]) == (("file", "a.m4a", upload),)
+
+
+def test_gpt_transcribe_measured_upload_bills_the_measured_length_over_reported_seconds(gateway: Gateway) -> None:
+    measured_seconds: Final = 1.0
+    upload: Final = _silent_wav(measured_seconds)
+
+    with (
+        wire_server(lambda request: _openai_gpt_transcribe_reply(request, 7)) as wire,
+        gateway.scenario() as scenario,
+    ):
+        model: Final = scenario.model(
+            model="openai/gpt-transcribe",
+            api_base=f"{wire.url}/v1",
+            api_key="synthetic-openai-key",
+            input_cost_per_second=_DEPLOYMENT_COST_PER_SECOND,
+        )
+        response: Final = gateway.request_multipart(
+            "/v1/audio/transcriptions",
+            {"model": model, "response_format": "json"},
+            {"file": ("a.wav", upload, _WAV_CONTENT_TYPE)},
+        )
+        expected_cost: Final = measured_seconds * _DEPLOYMENT_COST_PER_SECOND
+
+        assert response.status_code == 200, response.text
+        assert math.isclose(_response_cost(response), expected_cost), (_response_cost(response), expected_cost)
+        assert math.isclose(_logged_spend(response.headers["x-litellm-call-id"]), expected_cost)
+        requests: Final = wire.drain()
+
+    assert [(request.method, request.target) for request in requests] == [("POST", "/v1/audio/transcriptions")]
+    assert _uploaded_files(requests[0]) == (("file", "a.wav", upload),)
diff --git a/tests/integration/cost_calculation/cases/azure.py b/tests/integration/cost_calculation/cases/azure.py
index 3df038d1e0e..1360f65b802 100644
--- a/tests/integration/cost_calculation/cases/azure.py
+++ b/tests/integration/cost_calculation/cases/azure.py
@@ -23,8 +23,18 @@ from integration.cost_calculation.bridge_cost_parity.case import BridgeCostParit
 from integration.cost_calculation.stream_parity.case import StreamParityTestCase, sse_frames
 
 
-def _response_for_model(response: JsonResponse, model: str) -> JsonResponse:
-    return response.model_copy(update={"body": {**response.body, "model": model}})
+def _response_for_model(
+    response: JsonResponse, model: str, *, service_tier: str | None = None
+) -> JsonResponse:
+    return response.model_copy(
+        update={
+            "body": {
+                **response.body,
+                "model": model,
+                **({"service_tier": service_tier} if service_tier is not None else {}),
+            }
+        }
+    )
 
 
 def _stream_for_model(response: SseResponse, model: str) -> SseResponse:
@@ -3618,173 +3628,7 @@ AZURE_GPT_6_LUNA_STREAM: Final = CostTrackingTestCase(
     ),
 )
 
-AZURE_GPT_6_LUNA_SERVICE_TIER_FLEX: Final = CostTrackingTestCase(
-    name="azure-gpt-6-luna-service_tier_flex",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="azure/gpt-6-luna",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "895f84528ea4 summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "service_tier": "flex",
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "choices": [
-                {
-                    "content_filter_results": _GPT_6_CONTENT_FILTER_RESULTS,
-                    "finish_reason": "stop",
-                    "index": 0,
-                    "logprobs": None,
-                    "message": {
-                        "annotations": [],
-                        "content": "scripted answer 895f84528ea4",
-                        "refusal": None,
-                        "role": "assistant",
-                    },
-                }
-            ],
-            "created": 1791852029,
-            "id": "chatcmpl-$REQUEST_ID",
-            "model": "gpt-6-luna-2026-09-22",
-            "object": "chat.completion",
-            "prompt_filter_results": _GPT_6_PROMPT_FILTER_RESULTS,
-            "routing": {"serving_pipereplica": "d20260922011332-060efdec-prefill-r0-dp0-prefill"},
-            "service_tier": "flex",
-            "system_fingerprint": None,
-            "usage": {
-                "completion_tokens": 412,
-                "completion_tokens_details": {
-                    "accepted_prediction_tokens": 0,
-                    "audio_tokens": 0,
-                    "reasoning_tokens": 0,
-                    "rejected_prediction_tokens": 0,
-                },
-                "latency_checkpoint": {
-                    "engine_tbt_ms": 4,
-                    "engine_ttft_ms": 131,
-                    "engine_ttlt_ms": 157,
-                    "pre_inference_ms": 55,
-                    "service_tbt_ms": 5,
-                    "service_ttft_ms": 1034,
-                    "service_ttlt_ms": 1058,
-                    "user_visible_ttft_ms": 979,
-                },
-                "prompt_tokens": 1840,
-                "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-                "total_tokens": 2252,
-            },
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.0002535, input_cost=0.0001196, output_cost=0.0001339, prompt_tokens=1840, completion_tokens=412
-    ),
-)
 
-AZURE_GPT_6_LUNA_SERVICE_TIER_PRIORITY: Final = CostTrackingTestCase(
-    name="azure-gpt-6-luna-service_tier_priority",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="azure/gpt-6-luna",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "705c026752fc summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "service_tier": "priority",
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "choices": [
-                {
-                    "content_filter_results": _GPT_6_CONTENT_FILTER_RESULTS,
-                    "finish_reason": "stop",
-                    "index": 0,
-                    "logprobs": None,
-                    "message": {
-                        "annotations": [],
-                        "content": "scripted answer 705c026752fc",
-                        "refusal": None,
-                        "role": "assistant",
-                    },
-                }
-            ],
-            "created": 1791852029,
-            "id": "chatcmpl-$REQUEST_ID",
-            "model": "gpt-6-luna-2026-09-22",
-            "object": "chat.completion",
-            "prompt_filter_results": _GPT_6_PROMPT_FILTER_RESULTS,
-            "routing": {"serving_pipereplica": "d20260922011332-060efdec-prefill-r0-dp0-prefill"},
-            "service_tier": "default",
-            "system_fingerprint": None,
-            "usage": {
-                "completion_tokens": 412,
-                "completion_tokens_details": {
-                    "accepted_prediction_tokens": 0,
-                    "audio_tokens": 0,
-                    "reasoning_tokens": 0,
-                    "rejected_prediction_tokens": 0,
-                },
-                "latency_checkpoint": {
-                    "engine_tbt_ms": 4,
-                    "engine_ttft_ms": 131,
-                    "engine_ttlt_ms": 157,
-                    "pre_inference_ms": 55,
-                    "service_tbt_ms": 5,
-                    "service_ttft_ms": 1034,
-                    "service_ttlt_ms": 1058,
-                    "user_visible_ttft_ms": 979,
-                },
-                "prompt_tokens": 1840,
-                "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-                "total_tokens": 2252,
-            },
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.000507, input_cost=0.0002392, output_cost=0.0002678, prompt_tokens=1840, completion_tokens=412
-    ),
-)
 
 AZURE_GPT_6_ASTRA_INPUT_TEXT: Final = CostTrackingTestCase(
     name="azure-gpt-6-astra-input_text",
@@ -3997,173 +3841,7 @@ AZURE_GPT_6_ASTRA_STREAM: Final = CostTrackingTestCase(
     ),
 )
 
-AZURE_GPT_6_ASTRA_SERVICE_TIER_FLEX: Final = CostTrackingTestCase(
-    name="azure-gpt-6-astra-service_tier_flex",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="azure/gpt-6-astra",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "6ff9027e3f7f summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "service_tier": "flex",
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "choices": [
-                {
-                    "content_filter_results": _GPT_6_CONTENT_FILTER_RESULTS,
-                    "finish_reason": "stop",
-                    "index": 0,
-                    "logprobs": None,
-                    "message": {
-                        "annotations": [],
-                        "content": "scripted answer 6ff9027e3f7f",
-                        "refusal": None,
-                        "role": "assistant",
-                    },
-                }
-            ],
-            "created": 1791852029,
-            "id": "chatcmpl-$REQUEST_ID",
-            "model": "gpt-6-astra-2026-09-03",
-            "object": "chat.completion",
-            "prompt_filter_results": _GPT_6_PROMPT_FILTER_RESULTS,
-            "routing": {"serving_pipereplica": "d20260922011332-060efdec-prefill-r0-dp0-prefill"},
-            "service_tier": "flex",
-            "system_fingerprint": None,
-            "usage": {
-                "completion_tokens": 412,
-                "completion_tokens_details": {
-                    "accepted_prediction_tokens": 0,
-                    "audio_tokens": 0,
-                    "reasoning_tokens": 0,
-                    "rejected_prediction_tokens": 0,
-                },
-                "latency_checkpoint": {
-                    "engine_tbt_ms": 4,
-                    "engine_ttft_ms": 131,
-                    "engine_ttlt_ms": 157,
-                    "pre_inference_ms": 55,
-                    "service_tbt_ms": 5,
-                    "service_ttft_ms": 1034,
-                    "service_ttlt_ms": 1058,
-                    "user_visible_ttft_ms": 979,
-                },
-                "prompt_tokens": 1840,
-                "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-                "total_tokens": 2252,
-            },
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.024375, input_cost=0.0115, output_cost=0.012875, prompt_tokens=1840, completion_tokens=412
-    ),
-)
 
-AZURE_GPT_6_ASTRA_SERVICE_TIER_PRIORITY: Final = CostTrackingTestCase(
-    name="azure-gpt-6-astra-service_tier_priority",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="azure/gpt-6-astra",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "9a0c038a2ad8 summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "service_tier": "priority",
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "choices": [
-                {
-                    "content_filter_results": _GPT_6_CONTENT_FILTER_RESULTS,
-                    "finish_reason": "stop",
-                    "index": 0,
-                    "logprobs": None,
-                    "message": {
-                        "annotations": [],
-                        "content": "scripted answer 9a0c038a2ad8",
-                        "refusal": None,
-                        "role": "assistant",
-                    },
-                }
-            ],
-            "created": 1791852029,
-            "id": "chatcmpl-$REQUEST_ID",
-            "model": "gpt-6-astra-2026-09-03",
-            "object": "chat.completion",
-            "prompt_filter_results": _GPT_6_PROMPT_FILTER_RESULTS,
-            "routing": {"serving_pipereplica": "d20260922011332-060efdec-prefill-r0-dp0-prefill"},
-            "service_tier": "default",
-            "system_fingerprint": None,
-            "usage": {
-                "completion_tokens": 412,
-                "completion_tokens_details": {
-                    "accepted_prediction_tokens": 0,
-                    "audio_tokens": 0,
-                    "reasoning_tokens": 0,
-                    "rejected_prediction_tokens": 0,
-                },
-                "latency_checkpoint": {
-                    "engine_tbt_ms": 4,
-                    "engine_ttft_ms": 131,
-                    "engine_ttlt_ms": 157,
-                    "pre_inference_ms": 55,
-                    "service_tbt_ms": 5,
-                    "service_ttft_ms": 1034,
-                    "service_ttlt_ms": 1058,
-                    "user_visible_ttft_ms": 979,
-                },
-                "prompt_tokens": 1840,
-                "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-                "total_tokens": 2252,
-            },
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.04875, input_cost=0.023, output_cost=0.02575, prompt_tokens=1840, completion_tokens=412
-    ),
-)
 
 AZURE_GPT_6_1_SOL_INPUT_TEXT: Final = CostTrackingTestCase(
     name="azure-gpt-6.1-sol-input_text",
@@ -4376,173 +4054,7 @@ AZURE_GPT_6_1_SOL_STREAM: Final = CostTrackingTestCase(
     ),
 )
 
-AZURE_GPT_6_1_SOL_SERVICE_TIER_FLEX: Final = CostTrackingTestCase(
-    name="azure-gpt-6.1-sol-service_tier_flex",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="azure/gpt-6.1-sol",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "960e0935140f summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "service_tier": "flex",
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "choices": [
-                {
-                    "content_filter_results": _GPT_6_CONTENT_FILTER_RESULTS,
-                    "finish_reason": "stop",
-                    "index": 0,
-                    "logprobs": None,
-                    "message": {
-                        "annotations": [],
-                        "content": "scripted answer 960e0935140f",
-                        "refusal": None,
-                        "role": "assistant",
-                    },
-                }
-            ],
-            "created": 1791852029,
-            "id": "chatcmpl-$REQUEST_ID",
-            "model": "gpt-6.1-sol-2026-09-29",
-            "object": "chat.completion",
-            "prompt_filter_results": _GPT_6_PROMPT_FILTER_RESULTS,
-            "routing": {"serving_pipereplica": "d20260922011332-060efdec-prefill-r0-dp0-prefill"},
-            "service_tier": "flex",
-            "system_fingerprint": None,
-            "usage": {
-                "completion_tokens": 412,
-                "completion_tokens_details": {
-                    "accepted_prediction_tokens": 0,
-                    "audio_tokens": 0,
-                    "reasoning_tokens": 0,
-                    "rejected_prediction_tokens": 0,
-                },
-                "latency_checkpoint": {
-                    "engine_tbt_ms": 4,
-                    "engine_ttft_ms": 131,
-                    "engine_ttlt_ms": 157,
-                    "pre_inference_ms": 55,
-                    "service_tbt_ms": 5,
-                    "service_ttft_ms": 1034,
-                    "service_ttlt_ms": 1058,
-                    "user_visible_ttft_ms": 979,
-                },
-                "prompt_tokens": 1840,
-                "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-                "total_tokens": 2252,
-            },
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.00468, input_cost=0.002208, output_cost=0.002472, prompt_tokens=1840, completion_tokens=412
-    ),
-)
 
-AZURE_GPT_6_1_SOL_SERVICE_TIER_PRIORITY: Final = CostTrackingTestCase(
-    name="azure-gpt-6.1-sol-service_tier_priority",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="azure/gpt-6.1-sol",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "6b36e2dc1f33 summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "service_tier": "priority",
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "choices": [
-                {
-                    "content_filter_results": _GPT_6_CONTENT_FILTER_RESULTS,
-                    "finish_reason": "stop",
-                    "index": 0,
-                    "logprobs": None,
-                    "message": {
-                        "annotations": [],
-                        "content": "scripted answer 6b36e2dc1f33",
-                        "refusal": None,
-                        "role": "assistant",
-                    },
-                }
-            ],
-            "created": 1791852029,
-            "id": "chatcmpl-$REQUEST_ID",
-            "model": "gpt-6.1-sol-2026-09-29",
-            "object": "chat.completion",
-            "prompt_filter_results": _GPT_6_PROMPT_FILTER_RESULTS,
-            "routing": {"serving_pipereplica": "d20260922011332-060efdec-prefill-r0-dp0-prefill"},
-            "service_tier": "default",
-            "system_fingerprint": None,
-            "usage": {
-                "completion_tokens": 412,
-                "completion_tokens_details": {
-                    "accepted_prediction_tokens": 0,
-                    "audio_tokens": 0,
-                    "reasoning_tokens": 0,
-                    "rejected_prediction_tokens": 0,
-                },
-                "latency_checkpoint": {
-                    "engine_tbt_ms": 4,
-                    "engine_ttft_ms": 131,
-                    "engine_ttlt_ms": 157,
-                    "pre_inference_ms": 55,
-                    "service_tbt_ms": 5,
-                    "service_ttft_ms": 1034,
-                    "service_ttlt_ms": 1058,
-                    "user_visible_ttft_ms": 979,
-                },
-                "prompt_tokens": 1840,
-                "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-                "total_tokens": 2252,
-            },
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.00936, input_cost=0.004416, output_cost=0.004944, prompt_tokens=1840, completion_tokens=412
-    ),
-)
 
 AZURE_GPT_6_SOL_REASONING: Final = CostTrackingTestCase(
     name="azure/gpt-6-sol-reasoning",
@@ -5995,31 +5507,7 @@ AZURE_GPT_6_LUNA_TIERED_AT_272K_BOUNDARY: Final = with_usage(
     ),
 )
 
-AZURE_GPT_6_LUNA_TIERED_FLEX_ABOVE_272K: Final = with_usage(
-    AZURE_GPT_6_LUNA_SERVICE_TIER_FLEX,
-    "azure-gpt-6-luna-tiered_flex_above_272k",
-    {
-        "prompt_tokens": 300000,
-        "total_tokens": 300412,
-        "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-    },
-    ExactExpected(
-        spend=0.0392678, input_cost=0.039, output_cost=0.0002678, prompt_tokens=300000, completion_tokens=412
-    ),
-)
 
-AZURE_GPT_6_LUNA_TIERED_PRIORITY_ABOVE_272K: Final = with_usage(
-    AZURE_GPT_6_LUNA_SERVICE_TIER_PRIORITY,
-    "azure-gpt-6-luna-tiered_priority_above_272k",
-    {
-        "prompt_tokens": 300000,
-        "total_tokens": 300412,
-        "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-    },
-    ExactExpected(
-        spend=0.0785356, input_cost=0.078, output_cost=0.0005356, prompt_tokens=300000, completion_tokens=412
-    ),
-)
 
 AZURE_GPT_6_ASTRA_TIERED_INPUT_ABOVE_272K: Final = with_usage(
     AZURE_GPT_6_ASTRA_INPUT_TEXT,
@@ -6054,27 +5542,7 @@ AZURE_GPT_6_ASTRA_TIERED_AT_272K_BOUNDARY: Final = with_usage(
     ExactExpected(spend=3.42575, input_cost=3.4, output_cost=0.02575, prompt_tokens=272000, completion_tokens=412),
 )
 
-AZURE_GPT_6_ASTRA_TIERED_FLEX_ABOVE_272K: Final = with_usage(
-    AZURE_GPT_6_ASTRA_SERVICE_TIER_FLEX,
-    "azure-gpt-6-astra-tiered_flex_above_272k",
-    {
-        "prompt_tokens": 300000,
-        "total_tokens": 300412,
-        "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-    },
-    ExactExpected(spend=3.77575, input_cost=3.75, output_cost=0.02575, prompt_tokens=300000, completion_tokens=412),
-)
 
-AZURE_GPT_6_ASTRA_TIERED_PRIORITY_ABOVE_272K: Final = with_usage(
-    AZURE_GPT_6_ASTRA_SERVICE_TIER_PRIORITY,
-    "azure-gpt-6-astra-tiered_priority_above_272k",
-    {
-        "prompt_tokens": 300000,
-        "total_tokens": 300412,
-        "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-    },
-    ExactExpected(spend=7.5515, input_cost=7.5, output_cost=0.0515, prompt_tokens=300000, completion_tokens=412),
-)
 
 AZURE_GPT_6_1_SOL_TIERED_INPUT_ABOVE_272K: Final = with_usage(
     AZURE_GPT_6_1_SOL_INPUT_TEXT,
@@ -6109,27 +5577,7 @@ AZURE_GPT_6_1_SOL_TIERED_AT_272K_BOUNDARY: Final = with_usage(
     ExactExpected(spend=0.657744, input_cost=0.6528, output_cost=0.004944, prompt_tokens=272000, completion_tokens=412),
 )
 
-AZURE_GPT_6_1_SOL_TIERED_FLEX_ABOVE_272K: Final = with_usage(
-    AZURE_GPT_6_1_SOL_SERVICE_TIER_FLEX,
-    "azure-gpt-6.1-sol-tiered_flex_above_272k",
-    {
-        "prompt_tokens": 300000,
-        "total_tokens": 300412,
-        "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-    },
-    ExactExpected(spend=0.724944, input_cost=0.72, output_cost=0.004944, prompt_tokens=300000, completion_tokens=412),
-)
 
-AZURE_GPT_6_1_SOL_TIERED_PRIORITY_ABOVE_272K: Final = with_usage(
-    AZURE_GPT_6_1_SOL_SERVICE_TIER_PRIORITY,
-    "azure-gpt-6.1-sol-tiered_priority_above_272k",
-    {
-        "prompt_tokens": 300000,
-        "total_tokens": 300412,
-        "prompt_tokens_details": {"audio_tokens": 0, "cache_write_tokens": 0, "cached_tokens": 0},
-    },
-    ExactExpected(spend=1.449888, input_cost=1.44, output_cost=0.009888, prompt_tokens=300000, completion_tokens=412),
-)
 
 AZURE_GPT_6_1_SOL_CACHE_WRITE_5M: Final = with_response_usage(
     AZURE_GPT_6_1_SOL_CACHE_READ,
@@ -6221,12 +5669,12 @@ AZURE_GPT_5_6_TERRA_STREAM: Final = AZURE_GPT_6_LUNA_STREAM.model_copy(
         ),
     }
 )
-AZURE_GPT_5_6_TERRA_SERVICE_TIER_FLEX: Final = AZURE_GPT_6_LUNA_SERVICE_TIER_FLEX.model_copy(
+AZURE_GPT_5_6_TERRA_SERVICE_TIER_FLEX: Final = AZURE_GPT_5_6_SERVICE_TIER_FLEX.model_copy(
     update={
         "name": "azure-gpt-5.6-terra-service_tier_flex",
         "model": "azure/gpt-5.6-terra",
         "response": _response_for_model(
-            cast(JsonResponse, AZURE_GPT_6_LUNA_SERVICE_TIER_FLEX.response), "gpt-5.6-terra-2026-07-09"
+            cast(JsonResponse, AZURE_GPT_5_6_SERVICE_TIER_FLEX.response), "gpt-5.6-terra-2026-07-09"
         ),
         "expected": ExactExpected(
             spend=0.0047432,
@@ -6237,12 +5685,14 @@ AZURE_GPT_5_6_TERRA_SERVICE_TIER_FLEX: Final = AZURE_GPT_6_LUNA_SERVICE_TIER_FLE
         ),
     }
 )
-AZURE_GPT_5_6_TERRA_SERVICE_TIER_PRIORITY: Final = AZURE_GPT_6_LUNA_SERVICE_TIER_PRIORITY.model_copy(
+AZURE_GPT_5_6_TERRA_SERVICE_TIER_PRIORITY: Final = AZURE_GPT_5_6_SERVICE_TIER_PRIORITY.model_copy(
     update={
         "name": "azure-gpt-5.6-terra-service_tier_priority",
         "model": "azure/gpt-5.6-terra",
         "response": _response_for_model(
-            cast(JsonResponse, AZURE_GPT_6_LUNA_SERVICE_TIER_PRIORITY.response), "gpt-5.6-terra-2026-07-09"
+            cast(JsonResponse, AZURE_GPT_5_6_SERVICE_TIER_PRIORITY.response),
+            "gpt-5.6-terra-2026-07-09",
+            service_tier="default",
         ),
         "expected": ExactExpected(
             spend=0.0189728,
@@ -6376,18 +5826,12 @@ CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     AZURE_GPT_6_LUNA_TIERED_INPUT_ABOVE_272K,
     AZURE_GPT_6_LUNA_TIERED_CACHE_READ_ABOVE_272K,
     AZURE_GPT_6_LUNA_TIERED_AT_272K_BOUNDARY,
-    AZURE_GPT_6_LUNA_TIERED_FLEX_ABOVE_272K,
-    AZURE_GPT_6_LUNA_TIERED_PRIORITY_ABOVE_272K,
     AZURE_GPT_6_ASTRA_TIERED_INPUT_ABOVE_272K,
     AZURE_GPT_6_ASTRA_TIERED_CACHE_READ_ABOVE_272K,
     AZURE_GPT_6_ASTRA_TIERED_AT_272K_BOUNDARY,
-    AZURE_GPT_6_ASTRA_TIERED_FLEX_ABOVE_272K,
-    AZURE_GPT_6_ASTRA_TIERED_PRIORITY_ABOVE_272K,
     AZURE_GPT_6_1_SOL_TIERED_INPUT_ABOVE_272K,
     AZURE_GPT_6_1_SOL_TIERED_CACHE_READ_ABOVE_272K,
     AZURE_GPT_6_1_SOL_TIERED_AT_272K_BOUNDARY,
-    AZURE_GPT_6_1_SOL_TIERED_FLEX_ABOVE_272K,
-    AZURE_GPT_6_1_SOL_TIERED_PRIORITY_ABOVE_272K,
     AZURE_GPT_5_4_MINI_INPUT_TEXT,
     AZURE_GPT_5_4_MINI_CACHE_READ,
     AZURE_GPT_5_4_MINI_AUDIO_INPUT,
@@ -6436,16 +5880,10 @@ CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     AZURE_GPT_6_SOL_SERVICE_TIER_PRIORITY,
     AZURE_GPT_6_LUNA_INPUT_TEXT,
     AZURE_GPT_6_LUNA_STREAM,
-    AZURE_GPT_6_LUNA_SERVICE_TIER_FLEX,
-    AZURE_GPT_6_LUNA_SERVICE_TIER_PRIORITY,
     AZURE_GPT_6_ASTRA_INPUT_TEXT,
     AZURE_GPT_6_ASTRA_STREAM,
-    AZURE_GPT_6_ASTRA_SERVICE_TIER_FLEX,
-    AZURE_GPT_6_ASTRA_SERVICE_TIER_PRIORITY,
     AZURE_GPT_6_1_SOL_INPUT_TEXT,
     AZURE_GPT_6_1_SOL_STREAM,
-    AZURE_GPT_6_1_SOL_SERVICE_TIER_FLEX,
-    AZURE_GPT_6_1_SOL_SERVICE_TIER_PRIORITY,
     AZURE_GPT_6_SOL_REASONING,
     AZURE_GPT_6_SOL_STREAM_NO_USAGE,
     AZURE_GPT_6_LUNA_REASONING,
diff --git a/tests/integration/cost_calculation/cases/bedrock_mantle.py b/tests/integration/cost_calculation/cases/bedrock_mantle.py
index 714c6f2811f..2fa940d66f4 100644
--- a/tests/integration/cost_calculation/cases/bedrock_mantle.py
+++ b/tests/integration/cost_calculation/cases/bedrock_mantle.py
@@ -2,9 +2,23 @@
 
 from __future__ import annotations
 
+import json
+from collections.abc import Mapping
 from typing import Final
 
 from integration.cost_calculation.cases.openai import with_usage
+from integration.cost_calculation.cases.anthropic import (
+    CLAUDE_OPUS_5_5_CACHE_READ,
+    CLAUDE_OPUS_5_5_CACHE_WRITE_1H,
+    CLAUDE_OPUS_5_5_CACHE_WRITE_5M,
+    CLAUDE_OPUS_5_5_INPUT_TEXT,
+    CLAUDE_OPUS_5_5_MESSAGES_INPUT_TEXT,
+    CLAUDE_OPUS_5_5_MESSAGES_STREAM,
+    CLAUDE_OPUS_5_5_STREAM,
+    CLAUDE_OPUS_5_5_THINKING,
+    CLAUDE_OPUS_5_5_TOOL_CALL,
+)
+from integration.cost_calculation.bridge_cost_parity.case import BridgeCostParityTestCase
 from integration.cost_calculation.cost_tracking_case import (
     CostTrackingTestCase,
     Deployment,
@@ -13,6 +27,7 @@ from integration.cost_calculation.cost_tracking_case import (
     SseResponse,
 )
 from integration.cost_calculation.stream_parity.case import StreamParityTestCase, sse_frames
+from pydantic import JsonValue
 
 
 BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_JSON: Final = CostTrackingTestCase(
@@ -503,6 +518,420 @@ BEDROCK_MANTLE_OPENAI_GPT_6_SOL_TIERED_AT_272K_BOUNDARY: Final = with_usage(
     ExactExpected(spend=0.602932, input_cost=0.5984, output_cost=0.004532, prompt_tokens=272000, completion_tokens=412),
 )
 
+_MANTLE_GPT_RESPONSES_REQUEST: Final = {
+    "model": "$MODEL",
+    "input": "cost tracking fixture",
+    "max_output_tokens": 64,
+    "stream": False,
+}
+_MANTLE_GPT_REASONING_REQUEST: Final = {
+    **_MANTLE_GPT_RESPONSES_REQUEST,
+    "max_output_tokens": 128,
+    "reasoning": {"effort": "medium"},
+}
+_MANTLE_GPT_STREAM_REQUEST: Final = {**_MANTLE_GPT_RESPONSES_REQUEST, "stream": True}
+_MANTLE_GPT_CHAT_REQUEST: Final = {
+    "model": "$MODEL",
+    "messages": [{"role": "user", "content": "cost tracking fixture"}],
+    "max_completion_tokens": 64,
+}
+
+
+def _mantle_gpt_usage(
+    input_tokens: int, output_tokens: int, reasoning_tokens: int, cached_tokens: int = 0
+) -> dict[str, JsonValue]:
+    return {
+        "input_tokens": input_tokens,
+        "input_tokens_details": {"cache_write_tokens": 0, "cached_tokens": cached_tokens},
+        "output_tokens": output_tokens,
+        "output_tokens_details": {"reasoning_tokens": reasoning_tokens},
+        "total_tokens": input_tokens + output_tokens,
+    }
+
+
+def _mantle_gpt_json_case(
+    base: CostTrackingTestCase,
+    provider_model: str,
+    shape: str,
+    usage: Mapping[str, JsonValue],
+    expected: ExactExpected,
+    request: Mapping[str, JsonValue],
+) -> CostTrackingTestCase:
+    case: Final = with_usage(base, f"bedrock_mantle-{provider_model}-{shape}", usage, expected)
+    if not isinstance(case.response, JsonResponse):
+        raise TypeError(f"{case.name}: expected a JSON response fixture")
+    response: Final = case.response.model_copy(update={"body": {**case.response.body, "model": provider_model}})
+    return case.model_copy(
+        update={"model": f"bedrock_mantle/{provider_model}", "request": dict(request), "response": response}
+    )
+
+
+def _mantle_gpt_stream_case(
+    provider_model: str, usage: Mapping[str, JsonValue], expected: ExactExpected
+) -> CostTrackingTestCase:
+    base: Final = BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_STREAM
+    if not isinstance(base.response, SseResponse):
+        raise TypeError(f"{base.name}: expected an SSE response fixture")
+    old_usage: Final = json.dumps(_mantle_gpt_usage(1840, 412, 0))
+    new_usage: Final = json.dumps(dict(usage))
+    frames: Final = tuple(
+        frame.replace("openai.gpt-6-sol", provider_model).replace(old_usage, new_usage)
+        for frame in base.response.frames
+    )
+    response: Final = base.response.model_copy(update={"frames": frames})
+    return base.model_copy(
+        update={
+            "name": f"bedrock_mantle-{provider_model}-responses_stream",
+            "model": f"bedrock_mantle/{provider_model}",
+            "request": dict(_MANTLE_GPT_STREAM_REQUEST),
+            "response": response,
+            "expected": expected,
+        }
+    )
+
+
+def _mantle_gpt_cases(
+    provider_model: str,
+    response_reasoning_tokens: int,
+    response_expected: ExactExpected,
+    reasoning_usage: Mapping[str, JsonValue],
+    reasoning_expected: ExactExpected,
+    cache_reasoning_tokens: int,
+    cache_expected: ExactExpected,
+    tiered_input_expected: ExactExpected,
+    tiered_cache_expected: ExactExpected,
+    tiered_boundary_expected: ExactExpected,
+) -> tuple[CostTrackingTestCase, ...]:
+    response_usage: Final = _mantle_gpt_usage(9, 64, response_reasoning_tokens)
+    response_case: Final = _mantle_gpt_json_case(
+        BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_JSON,
+        provider_model,
+        "responses_json",
+        response_usage,
+        response_expected,
+        _MANTLE_GPT_RESPONSES_REQUEST,
+    )
+    stream_case: Final = _mantle_gpt_stream_case(provider_model, response_usage, response_expected)
+    reasoning_case: Final = _mantle_gpt_json_case(
+        BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_REASONING,
+        provider_model,
+        "responses_reasoning",
+        reasoning_usage,
+        reasoning_expected,
+        _MANTLE_GPT_REASONING_REQUEST,
+    )
+    chat_case: Final = _mantle_gpt_json_case(
+        BEDROCK_MANTLE_OPENAI_GPT_6_SOL_CHAT_JSON,
+        provider_model,
+        "chat_json",
+        response_usage,
+        response_expected,
+        _MANTLE_GPT_CHAT_REQUEST,
+    )
+    cache_case: Final = _mantle_gpt_json_case(
+        BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_JSON,
+        provider_model,
+        "responses_cache_read",
+        _mantle_gpt_usage(3144, 16, cache_reasoning_tokens, cached_tokens=3142),
+        cache_expected,
+        {**_MANTLE_GPT_RESPONSES_REQUEST, "max_output_tokens": 16},
+    )
+    tiered_input: Final = _mantle_gpt_json_case(
+        BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_JSON,
+        provider_model,
+        "tiered_input_above_272k",
+        _mantle_gpt_usage(300000, 412, 0),
+        tiered_input_expected,
+        {**_MANTLE_GPT_RESPONSES_REQUEST, "max_output_tokens": 412},
+    )
+    tiered_cache: Final = _mantle_gpt_json_case(
+        BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_JSON,
+        provider_model,
+        "tiered_cache_read_above_272k",
+        _mantle_gpt_usage(300000, 412, 0, cached_tokens=200000),
+        tiered_cache_expected,
+        {**_MANTLE_GPT_RESPONSES_REQUEST, "max_output_tokens": 412},
+    )
+    tiered_boundary: Final = _mantle_gpt_json_case(
+        BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_JSON,
+        provider_model,
+        "tiered_at_272k_boundary",
+        _mantle_gpt_usage(272000, 412, 0),
+        tiered_boundary_expected,
+        {**_MANTLE_GPT_RESPONSES_REQUEST, "max_output_tokens": 412},
+    )
+    return (response_case, stream_case, reasoning_case, chat_case, cache_case, tiered_input, tiered_cache, tiered_boundary)
+
+
+def _mantle_gpt_bridge(case: CostTrackingTestCase) -> BridgeCostParityTestCase:
+    bridged: Final = case.model_copy(
+        update={
+            "name": case.name.removesuffix("responses_json") + "chat_bridged_json",
+            "endpoint": "/v1/chat/completions",
+            "request": dict(_MANTLE_GPT_CHAT_REQUEST),
+        }
+    )
+    return BridgeCostParityTestCase(native=case, bridged=bridged)
+
+
+_MANTLE_GPT_61_SOL_CASES: Final = _mantle_gpt_cases(
+    "openai.gpt-6.1-sol",
+    48,
+    ExactExpected(spend=0.00079618, input_cost=0.00002178, output_cost=0.0007744, prompt_tokens=9, completion_tokens=64),
+    _mantle_gpt_usage(16, 5, 0),
+    ExactExpected(spend=0.00009922, input_cost=0.00003872, output_cost=0.0000605, prompt_tokens=16, completion_tokens=5),
+    0,
+    ExactExpected(spend=0.000578622, input_cost=0.000385022, output_cost=0.0001936, prompt_tokens=3144, completion_tokens=16),
+    ExactExpected(spend=1.4594778, input_cost=1.452, output_cost=0.0074778, prompt_tokens=300000, completion_tokens=412),
+    ExactExpected(spend=0.5398778, input_cost=0.5324, output_cost=0.0074778, prompt_tokens=300000, completion_tokens=412),
+    ExactExpected(spend=0.6632252, input_cost=0.65824, output_cost=0.0049852, prompt_tokens=272000, completion_tokens=412),
+)
+_MANTLE_GPT_6_LUNA_CASES: Final = _mantle_gpt_cases(
+    "openai.gpt-6-luna",
+    64,
+    ExactExpected(spend=0.000043428, input_cost=0.000001188, output_cost=0.00004224, prompt_tokens=9, completion_tokens=64),
+    _mantle_gpt_usage(16, 18, 11),
+    ExactExpected(spend=0.000013992, input_cost=0.000002112, output_cost=0.00001188, prompt_tokens=16, completion_tokens=18),
+    16,
+    ExactExpected(spend=0.0000522984, input_cost=0.0000417384, output_cost=0.00001056, prompt_tokens=3144, completion_tokens=16),
+    ExactExpected(spend=0.07960788, input_cost=0.0792, output_cost=0.00040788, prompt_tokens=300000, completion_tokens=412),
+    ExactExpected(spend=0.03208788, input_cost=0.03168, output_cost=0.00040788, prompt_tokens=300000, completion_tokens=412),
+    ExactExpected(spend=0.03617592, input_cost=0.035904, output_cost=0.00027192, prompt_tokens=272000, completion_tokens=412),
+)
+_MANTLE_GPT_6_ASTRA_CASES: Final = _mantle_gpt_cases(
+    "openai.gpt-6-astra",
+    29,
+    ExactExpected(spend=0.0047047, input_cost=0.0001287, output_cost=0.004576, prompt_tokens=9, completion_tokens=64),
+    _mantle_gpt_usage(16, 5, 0),
+    ExactExpected(spend=0.0005863, input_cost=0.0002288, output_cost=0.0003575, prompt_tokens=16, completion_tokens=5),
+    0,
+    ExactExpected(spend=0.00566566, input_cost=0.00452166, output_cost=0.001144, prompt_tokens=3144, completion_tokens=16),
+    ExactExpected(spend=8.624187, input_cost=8.58, output_cost=0.044187, prompt_tokens=300000, completion_tokens=412),
+    ExactExpected(spend=3.476187, input_cost=3.432, output_cost=0.044187, prompt_tokens=300000, completion_tokens=412),
+    ExactExpected(spend=3.919058, input_cost=3.8896, output_cost=0.029458, prompt_tokens=272000, completion_tokens=412),
+)
+_MANTLE_GPT_56_TERRA_CASES: Final = _mantle_gpt_cases(
+    "openai.gpt-5.6-terra",
+    33,
+    ExactExpected(spend=0.00121044, input_cost=0.00002772, output_cost=0.00118272, prompt_tokens=9, completion_tokens=64),
+    _mantle_gpt_usage(16, 17, 10),
+    ExactExpected(spend=0.00036344, input_cost=0.00004928, output_cost=0.00031416, prompt_tokens=16, completion_tokens=17),
+    0,
+    ExactExpected(spend=0.001269576, input_cost=0.000973896, output_cost=0.00029568, prompt_tokens=3144, completion_tokens=16),
+    ExactExpected(spend=1.85942064, input_cost=1.848, output_cost=0.01142064, prompt_tokens=300000, completion_tokens=412),
+    ExactExpected(spend=0.75062064, input_cost=0.7392, output_cost=0.01142064, prompt_tokens=300000, completion_tokens=412),
+    ExactExpected(spend=0.84537376, input_cost=0.83776, output_cost=0.00761376, prompt_tokens=272000, completion_tokens=412),
+)
+
+_MANTLE_CLAUDE_OPUS_MODEL: Final = "bedrock_mantle/anthropic.claude-opus-5-5"
+_ADAPTIVE_USAGE: Final = {
+    "input_tokens": 24,
+    "cache_creation_input_tokens": 0,
+    "cache_read_input_tokens": 0,
+    "cache_creation": {"ephemeral_5m_input_tokens": 0, "ephemeral_1h_input_tokens": 0},
+    "output_tokens": 18,
+    "output_tokens_details": {"thinking_tokens": 6},
+    "service_tier": "standard",
+}
+_ADAPTIVE_EXPECTED: Final = ExactExpected(
+    spend=0.0007524, input_cost=0.0001584, output_cost=0.000594, prompt_tokens=24, completion_tokens=18
+)
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_INPUT_TEXT: Final = with_usage(
+    CLAUDE_OPUS_5_5_INPUT_TEXT,
+    "bedrock_mantle-anthropic.claude-opus-5-5-input_text",
+    _ADAPTIVE_USAGE,
+    _ADAPTIVE_EXPECTED,
+).model_copy(
+    update={
+        "model": _MANTLE_CLAUDE_OPUS_MODEL,
+        "request": {
+            **CLAUDE_OPUS_5_5_INPUT_TEXT.request,
+            "reasoning_effort": "medium",
+            "allowed_openai_params": ["reasoning_effort"],
+        },
+    }
+)
+
+_MANTLE_CLAUDE_STREAM_RESPONSE: Final = SseResponse(
+    content_type="text/event-stream",
+    frames=sse_frames(
+        {
+            "type": "message_start",
+            "message": {
+                "id": "msg_$REQUEST_ID",
+                "type": "message",
+                "role": "assistant",
+                "model": "claude-opus-5-5",
+                "content": [],
+                "stop_reason": None,
+                "stop_sequence": None,
+                "usage": {
+                    "input_tokens": 24,
+                    "cache_creation_input_tokens": 0,
+                    "cache_read_input_tokens": 0,
+                    "cache_creation": {"ephemeral_5m_input_tokens": 0, "ephemeral_1h_input_tokens": 0},
+                    "output_tokens": 5,
+                    "service_tier": "standard",
+                },
+            },
+        },
+        {"type": "content_block_start", "index": 0, "content_block": {"type": "thinking", "thinking": ""}},
+        {"type": "content_block_delta", "index": 0, "delta": {"type": "thinking_delta", "thinking": ""}},
+        {"type": "content_block_stop", "index": 0},
+        {"type": "content_block_start", "index": 1, "content_block": {"type": "text", "text": ""}},
+        {"type": "content_block_delta", "index": 1, "delta": {"type": "text_delta", "text": "4"}},
+        {"type": "content_block_stop", "index": 1},
+        {
+            "type": "message_delta",
+            "delta": {"stop_reason": "end_turn", "stop_sequence": None},
+            "usage": {
+                "input_tokens": 24,
+                "cache_creation_input_tokens": 0,
+                "cache_read_input_tokens": 0,
+                "output_tokens": 18,
+                "output_tokens_details": {"thinking_tokens": 6},
+            },
+        },
+        {"type": "message_stop"},
+    ),
+)
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_STREAM: Final = CLAUDE_OPUS_5_5_STREAM.model_copy(
+    update={
+        "name": "bedrock_mantle-anthropic.claude-opus-5-5-stream",
+        "model": _MANTLE_CLAUDE_OPUS_MODEL,
+        "request": {
+            **CLAUDE_OPUS_5_5_STREAM.request,
+            "reasoning_effort": "medium",
+            "allowed_openai_params": ["reasoning_effort"],
+        },
+        "response": _MANTLE_CLAUDE_STREAM_RESPONSE,
+        "expected": _ADAPTIVE_EXPECTED,
+    }
+)
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_MESSAGES_INPUT_TEXT: Final = with_usage(
+    CLAUDE_OPUS_5_5_MESSAGES_INPUT_TEXT,
+    "bedrock_mantle-anthropic.claude-opus-5-5-messages_input_text",
+    _ADAPTIVE_USAGE,
+    _ADAPTIVE_EXPECTED,
+).model_copy(
+    update={
+        "model": _MANTLE_CLAUDE_OPUS_MODEL,
+        "request": {
+            **CLAUDE_OPUS_5_5_MESSAGES_INPUT_TEXT.request,
+            "thinking": {"type": "adaptive"},
+            "output_config": {"effort": "medium"},
+        },
+    }
+)
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_MESSAGES_STREAM: Final = CLAUDE_OPUS_5_5_MESSAGES_STREAM.model_copy(
+    update={
+        "name": "bedrock_mantle-anthropic.claude-opus-5-5-messages_stream",
+        "model": _MANTLE_CLAUDE_OPUS_MODEL,
+        "request": {
+            **CLAUDE_OPUS_5_5_MESSAGES_STREAM.request,
+            "thinking": {"type": "adaptive"},
+            "output_config": {"effort": "medium"},
+        },
+        "response": _MANTLE_CLAUDE_STREAM_RESPONSE,
+        "expected": _ADAPTIVE_EXPECTED,
+    }
+)
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CACHE_READ: Final = with_usage(
+    CLAUDE_OPUS_5_5_CACHE_READ,
+    "bedrock_mantle-anthropic.claude-opus-5-5-cache_read",
+    {
+        "input_tokens": 22,
+        "cache_creation_input_tokens": 0,
+        "cache_read_input_tokens": 4203,
+        "cache_creation": {"ephemeral_5m_input_tokens": 0, "ephemeral_1h_input_tokens": 0},
+        "output_tokens": 47,
+        "output_tokens_details": {"thinking_tokens": 35},
+        "service_tier": "standard",
+    },
+    ExactExpected(
+        spend=0.00308319, input_cost=0.00153219, output_cost=0.001551, prompt_tokens=4225, completion_tokens=47
+    ),
+).model_copy(update={"model": _MANTLE_CLAUDE_OPUS_MODEL})
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CACHE_WRITE_5M: Final = with_usage(
+    CLAUDE_OPUS_5_5_CACHE_WRITE_5M,
+    "bedrock_mantle-anthropic.claude-opus-5-5-cache_write_5m",
+    {
+        "input_tokens": 22,
+        "cache_creation_input_tokens": 4203,
+        "cache_read_input_tokens": 0,
+        "cache_creation": {"ephemeral_5m_input_tokens": 4203, "ephemeral_1h_input_tokens": 0},
+        "output_tokens": 44,
+        "output_tokens_details": {"thinking_tokens": 32},
+        "service_tier": "standard",
+    },
+    ExactExpected(
+        spend=0.03627195, input_cost=0.03481995, output_cost=0.001452, prompt_tokens=4225, completion_tokens=44
+    ),
+).model_copy(update={"model": _MANTLE_CLAUDE_OPUS_MODEL})
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CACHE_WRITE_1H: Final = with_usage(
+    CLAUDE_OPUS_5_5_CACHE_WRITE_1H,
+    "bedrock_mantle-anthropic.claude-opus-5-5-cache_write_1h",
+    {
+        "input_tokens": 22,
+        "cache_creation_input_tokens": 9003,
+        "cache_read_input_tokens": 0,
+        "cache_creation": {"ephemeral_5m_input_tokens": 0, "ephemeral_1h_input_tokens": 9003},
+        "output_tokens": 12,
+        "output_tokens_details": {"thinking_tokens": 0},
+        "service_tier": "standard",
+    },
+    ExactExpected(
+        spend=0.1193808, input_cost=0.1189848, output_cost=0.000396, prompt_tokens=9025, completion_tokens=12
+    ),
+).model_copy(update={"model": _MANTLE_CLAUDE_OPUS_MODEL})
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_THINKING: Final = with_usage(
+    CLAUDE_OPUS_5_5_THINKING,
+    "bedrock_mantle-anthropic.claude-opus-5-5-thinking",
+    _ADAPTIVE_USAGE,
+    _ADAPTIVE_EXPECTED,
+).model_copy(update={"model": _MANTLE_CLAUDE_OPUS_MODEL})
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_TOOL_CALL: Final = with_usage(
+    CLAUDE_OPUS_5_5_TOOL_CALL,
+    "bedrock_mantle-anthropic.claude-opus-5-5-tool_call",
+    {
+        "input_tokens": 376,
+        "cache_creation_input_tokens": 0,
+        "cache_read_input_tokens": 0,
+        "cache_creation": {"ephemeral_5m_input_tokens": 0, "ephemeral_1h_input_tokens": 0},
+        "output_tokens": 12,
+        "output_tokens_details": {"thinking_tokens": 0},
+        "service_tier": "standard",
+    },
+    ExactExpected(spend=0.0028776, input_cost=0.0024816, output_cost=0.000396, prompt_tokens=376, completion_tokens=12),
+).model_copy(update={"model": _MANTLE_CLAUDE_OPUS_MODEL})
+
+BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CHAT_BRIDGED_JSON: Final = BEDROCK_MANTLE_CLAUDE_OPUS_5_5_INPUT_TEXT.model_copy(
+    update={
+        "name": "bedrock_mantle-anthropic.claude-opus-5-5-chat_bridged_json",
+        "response": BEDROCK_MANTLE_CLAUDE_OPUS_5_5_MESSAGES_INPUT_TEXT.response,
+    }
+)
+
+BRIDGE_COST_PARITY: Final[tuple[BridgeCostParityTestCase, ...]] = (
+    _mantle_gpt_bridge(_MANTLE_GPT_61_SOL_CASES[0]),
+    _mantle_gpt_bridge(_MANTLE_GPT_6_LUNA_CASES[0]),
+    _mantle_gpt_bridge(_MANTLE_GPT_6_ASTRA_CASES[0]),
+    _mantle_gpt_bridge(_MANTLE_GPT_56_TERRA_CASES[0]),
+    BridgeCostParityTestCase(
+        native=BEDROCK_MANTLE_CLAUDE_OPUS_5_5_MESSAGES_INPUT_TEXT,
+        bridged=BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CHAT_BRIDGED_JSON,
+    ),
+)
+
 CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_JSON,
     BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_STREAM,
@@ -512,10 +941,35 @@ CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     BEDROCK_MANTLE_OPENAI_GPT_6_SOL_TIERED_INPUT_ABOVE_272K,
     BEDROCK_MANTLE_OPENAI_GPT_6_SOL_TIERED_CACHE_READ_ABOVE_272K,
     BEDROCK_MANTLE_OPENAI_GPT_6_SOL_TIERED_AT_272K_BOUNDARY,
+    *_MANTLE_GPT_61_SOL_CASES,
+    *_MANTLE_GPT_6_LUNA_CASES,
+    *_MANTLE_GPT_6_ASTRA_CASES,
+    *_MANTLE_GPT_56_TERRA_CASES,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_INPUT_TEXT,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_STREAM,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_MESSAGES_INPUT_TEXT,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_MESSAGES_STREAM,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CHAT_BRIDGED_JSON,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CACHE_READ,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CACHE_WRITE_5M,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_CACHE_WRITE_1H,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_THINKING,
+    BEDROCK_MANTLE_CLAUDE_OPUS_5_5_TOOL_CALL,
 )
 
 PARITY: Final[tuple[StreamParityTestCase, ...]] = (
     StreamParityTestCase(
         plain=BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_JSON, streamed=BEDROCK_MANTLE_OPENAI_GPT_6_SOL_RESPONSES_STREAM
     ),
+    StreamParityTestCase(plain=_MANTLE_GPT_61_SOL_CASES[0], streamed=_MANTLE_GPT_61_SOL_CASES[1]),
+    StreamParityTestCase(plain=_MANTLE_GPT_6_LUNA_CASES[0], streamed=_MANTLE_GPT_6_LUNA_CASES[1]),
+    StreamParityTestCase(plain=_MANTLE_GPT_6_ASTRA_CASES[0], streamed=_MANTLE_GPT_6_ASTRA_CASES[1]),
+    StreamParityTestCase(plain=_MANTLE_GPT_56_TERRA_CASES[0], streamed=_MANTLE_GPT_56_TERRA_CASES[1]),
+    StreamParityTestCase(
+        plain=BEDROCK_MANTLE_CLAUDE_OPUS_5_5_INPUT_TEXT, streamed=BEDROCK_MANTLE_CLAUDE_OPUS_5_5_STREAM
+    ),
+    StreamParityTestCase(
+        plain=BEDROCK_MANTLE_CLAUDE_OPUS_5_5_MESSAGES_INPUT_TEXT,
+        streamed=BEDROCK_MANTLE_CLAUDE_OPUS_5_5_MESSAGES_STREAM,
+    ),
 )
diff --git a/tests/integration/cost_calculation/cases/gemini.py b/tests/integration/cost_calculation/cases/gemini.py
index 220ce2023be..bd64f4aeb11 100644
--- a/tests/integration/cost_calculation/cases/gemini.py
+++ b/tests/integration/cost_calculation/cases/gemini.py
@@ -87,6 +87,7 @@ GEMINI_GEMINI_3_1_PRO_INPUT_TEXT: Final = CostTrackingTestCase(
                 "candidatesTokenCount": 412,
                 "totalTokenCount": 2252,
                 "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 1840}],
+                "serviceTier": "standard",
             },
             "modelVersion": "gemini-3.1-pro",
         },
@@ -141,6 +142,7 @@ GEMINI_GEMINI_3_1_PRO_CACHE_READ: Final = CostTrackingTestCase(
                 "totalTokenCount": 13308,
                 "cachedContentTokenCount": 12288,
                 "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 12928}],
+                "serviceTier": "standard",
             },
             "modelVersion": "gemini-3.1-pro",
         },
@@ -386,6 +388,7 @@ GEMINI_GEMINI_3_1_PRO_REASONING: Final = CostTrackingTestCase(
                 "thoughtsTokenCount": 3480,
                 "totalTokenCount": 5280,
                 "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 1240}],
+                "serviceTier": "standard",
             },
             "modelVersion": "gemini-3.1-pro",
         },
@@ -1600,254 +1603,9 @@ GEMINI_GEMINI_3_8_FLASH_CACHE_READ: Final = CostTrackingTestCase(
     ),
 )
 
-GEMINI_GEMINI_3_8_FLASH_AUDIO_INPUT: Final = CostTrackingTestCase(
-    name="gemini-gemini-3.8-flash-audio_input",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini/gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "99e65f16c4b4 summarize the attached material in one line and name the city weather",
-                    },
-                    {
-                        "type": "input_audio",
-                        "input_audio": {
-                            "data": "UklGRmQGAABXQVZFZm10IBAAAAABAAEAQB8AAIA+AAACABAAZGF0YUAGAAAAAA8I4A85F+EdpCNYKNkrCy7eLkwuWSwTKZUk/x59GEERgQl4AWb5hPER6kbjVd1t2LLUQdIu0X/RM9M81oTa6t9E5mPtD/UP/SQFEw2fFI0bqSHEJrgqZi27LqouNi1pKlkmJSH0GvUTXgxpBFP8WPS27KflYt8U2ujV/dJp0TjRbNL71NPY1d3b47nqOPIh+jUCOQrwER0ZjB8JJW0plCxoLtou5i2VK/cnKSNOHZUWLw9VB0T/OPdv7yToj+Hi20nX5tPT0SDR09Hm00nX4tuP4STob+8490T/VQcvD5UWTh0pI/cnlSvmLdouaC6ULG0pCSWMHx0Z8BE5CjUCIfo48rnq2+PV3dPY+9Rs0jjRadH90ujVFNpi36fltuxY9FP8aQReDPUT9BolIVkmaSo2Laouuy5mLbgqxCapIY0bnxQTDSQFD/0P9WPtRObq34TaPNYz03/RLtFB0rLUbdhV3UbjEeqE8Wb5eAGBCUERfRj/HpUkEylZLEwu3i4LLtkrWCikI+EdORfgDw8IAADx9yDwx+gf4lzcqNcn1PXRItG00afT7dZr2wHhg+e/7n/2iP6aBnwO7xW6HKsikydOK78t0i6BLs0sxCl8JRYgvBmdEvEK8QLc+u3yYetz5FfePNlI1ZrSRdFW0crSl9Wn2dveDOUL7KLzl/utA6gLShNZGp4g7CUYKgMtly7ILpQtBSstJysiJRxHFcgN3wXL/cf1EO7j5nTg99qT1mzTmNEm0RrSa9QJ2NfcsuJr6dHwq/i8AMgIkRDcF3EeHiS3KBosLS7gLi0uGiy3KB4kcR7cF5EQyAi8AKv40fBr6bLi19wJ2GvUGtIm0ZjRbNOT1vfadODj5hDux/XL/d8FyA1HFSUcKyItJwUrlC3ILpcuAy0YKuwlniBZGkoTqAutA5f7ovML7Azl296n2ZfVytJW0UXRmtJI1TzZV95z5GHr7fLc+vEC8QqdErwZFiB8JcQpzSyBLtIuvy1OK5MnqyK6HO8VfA6aBoj+f/a/7oPnAeFr2+3Wp9O00SLR9dEn1KjXXNwf4sfoIPDx9wAADwjgDzkX4R2kI1go2SsLLt4uTC5ZLBMplST/Hn0YQRGBCXgBZvmE8RHqRuNV3W3YstRB0i7Rf9Ez0zzWhNrq30TmY+0P9Q/9JAUTDZ8UjRupIcQmuCpmLbsuqi42LWkqWSYlIfQa9RNeDGkEU/xY9Lbsp+Vi3xTa6NX90mnRONFs0vvU09jV3dvjueo48iH6NQI5CvARHRmMHwklbSmULGgu2i7mLZUr9ycpI04dlRYvD1UHRP8492/vJOiP4eLbSdfm09PRINHT0ebTSdfi24/hJOhv7zj3RP9VBy8PlRZOHSkj9yeVK+Yt2i5oLpQsbSkJJYwfHRnwETkKNQIh+jjyuerb49Xd09j71GzSONFp0f3S6NUU2mLfp+W27Fj0U/xpBF4M9RP0GiUhWSZpKjYtqi67LmYtuCrEJqkhjRufFBMNJAUP/Q/1Y+1E5urfhNo81jPTf9Eu0UHSstRt2FXdRuMR6oTxZvl4AYEJQRF9GP8elSQTKVksTC7eLgsu2StYKKQj4R05F+APDwgAAPH3IPDH6B/iXNyo1yfU9dEi0bTRp9Pt1mvbAeGD57/uf/aI/poGfA7vFbocqyKTJ04rvy3SLoEuzSzEKXwlFiC8GZ0S8QrxAtz67fJh63PkV9482UjVmtJF0VbRytKX1afZ294M5QvsovOX+60DqAtKE1kaniDsJRgqAy2XLsgulC0FKy0nKyIlHEcVyA3fBcv9x/UQ7uPmdOD32pPWbNOY0SbRGtJr1AnY19yy4mvp0fCr+LwAyAiRENwXcR4eJLcoGiwtLuAuLS4aLLcoHiRxHtwXkRDICLwAq/jR8GvpsuLX3AnYa9Qa0ibRmNFs05PW99p04OPmEO7H9cv93wXIDUcVJRwrIi0nBSuULcguly4DLRgq7CWeIFkaShOoC60Dl/ui8wvsDOXb3qfZl9XK0lbRRdGa0kjVPNlX3nPkYevt8tz68QLxCp0SvBkWIHwlxCnNLIEu0i6/LU4rkyerIroc7xV8DpoGiP5/9r/ug+cB4Wvb7dan07TRItH10SfUqNdc3B/ix+gg8PH3",
-                            "format": "wav",
-                        },
-                    },
-                ],
-            },
-        ],
-        "stream": False,
-        "modalities": ["text"],
-        "allowed_openai_params": ["modalities"],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "candidates": [
-                {
-                    "content": {"parts": [{"text": "scripted answer 99e65f16c4b4"}], "role": "model"},
-                    "finishReason": "STOP",
-                    "index": 0,
-                }
-            ],
-            "usageMetadata": {
-                "promptTokenCount": 1546,
-                "candidatesTokenCount": 210,
-                "totalTokenCount": 1756,
-                "promptTokensDetails": [
-                    {"modality": "TEXT", "tokenCount": 96},
-                    {"modality": "AUDIO", "tokenCount": 1450},
-                ],
-            },
-            "modelVersion": "gemini-3.8-flash",
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.002128, input_cost=0.001498, output_cost=0.00063, prompt_tokens=1546, completion_tokens=210
-    ),
-)
 
-GEMINI_GEMINI_3_8_FLASH_AUDIO_OUTPUT: Final = CostTrackingTestCase(
-    name="gemini-gemini-3.8-flash-audio_output",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini/gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "6fc6e4823e02 summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "modalities": ["text", "audio"],
-        "audio": {"voice": "alloy", "format": "pcm16"},
-        "allowed_openai_params": ["modalities", "audio"],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "candidates": [
-                {
-                    "content": {"parts": [{"text": "scripted answer 6fc6e4823e02"}], "role": "model"},
-                    "finishReason": "STOP",
-                    "index": 0,
-                }
-            ],
-            "usageMetadata": {
-                "promptTokenCount": 220,
-                "candidatesTokenCount": 1300,
-                "totalTokenCount": 1520,
-                "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 220}],
-                "candidatesTokensDetails": [
-                    {"modality": "TEXT", "tokenCount": 180},
-                    {"modality": "AUDIO", "tokenCount": 1120},
-                ],
-            },
-            "modelVersion": "gemini-3.8-flash",
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.00737, input_cost=0.00011, output_cost=0.00726, prompt_tokens=220, completion_tokens=1300
-    ),
-)
 
-GEMINI_GEMINI_3_8_FLASH_IMAGE_INPUT: Final = CostTrackingTestCase(
-    name="gemini-gemini-3.8-flash-image_input",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini/gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "ca377dd90846 summarize the attached material in one line and name the city weather",
-                    },
-                    {
-                        "type": "image_url",
-                        "image_url": {
-                            "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAMK0lEQVR4nAEgDN/zAM0HLNi+b59irEwJwoIG5+NVlKprNC9dCjpeSEL6tCj3YubiguXBZXx4w6lns2cR6zkGp8hgPXHUCeelTYe9wfcEQgJ6rx+pW3+GWJV430PkExZ66Nnc6zd2KDOBGnGnIwBzhiZIL2HGI3lifMEk1EYYPG5NnqGlpcz3LiFAwwS9/Goh5egSF1aINdSX+yErhrSeZWrPBkEWmgtZ9OYpQ58l2dRlT+yNSBn7QNa6ssjgEhxEGuYUp7jZKpIZrx7Oh1QAV1jeeB7zT4/0jccZhxGSWqLiJW9VRPJQuRZjnL/J8qO8F7vpSKdYNMGDc/cEMXKNBlAdehNaVHGe84Tdmm53hcOfr0ICjvEPuk0WzuaDIOumjneMSZ1+6qg8mAM8quAXAOyQPrjRNxDXsUwZZhYr07VMCinT0OP4yIEWDKvlaxGgReVKAJ1JpZx/Hlt+evT70yo3G94iWEhVavFwPnqJ87rKl0BT6+ohtOgz197MvB8QzMXpME/BwepPYkiRLpbBOAD37hU9bAWozdK3sPczg3okfSudzcFjAYtEIq5yw+1ZF9EYmBSexEP+IhnvUWC4BeDWZQiCjhF7/4syzu4C5kF9ETfrG+udK0232R+NA+uESn014bRJmPMfahYljDojL1UAbuaA0PuOGOzBBlCKXAkFNHIfvvZHQafMkl9qmqdFF4x3Em6WDuijSQXN6nFtM3UXbUGmmCF4Rcyl4YhifPspUXLdXZMIvPo9zAhTSlQFEi8m83sw5KxL0rWBzS9c4XAIAOaz3py4dTb7d9QaqDMLk0J87/15PZKvEaC6/hZ62sCtuFTywatjViHrBXTgOO5IJsiyYuzmaeQJKHmr11gnixR2rO7lqNEGs3shT+xK/lDUucFkigvA+a5C+itk/VV+1gDxc420UHpKhj31j0YnCZSFJebGz2/XSTyT6XfZhG4XNwZGIeUGCPKt0DX9lpB0RNN0yiPzQVJfa3LkZpRBN3RGgRpYc8WpHn5Q1wWpmnklpPHACv/N+kGz0Ki86g2GgvsAWloXy5pwfFtwZRYV9fMGU4Za35yfj4cddJuHfAyHSpYHVlGhNknUVQIBV9gOq7wwLZU3Pl5GJgSy4EK7f75iRVKD/B0ItpC0FBpwODhWP184ymnLgLGkK90WIVUY7hZtAEOu39BF2OsPDWrBGWN0esj6v3clX2z22gaLmrJHiwE4sXWUC8TLLtFp4uiS/VlbojLP9uiewb/vrTLBiFjYJ5rsFjuu/3XxEuiZ1QYyi9sfsFqPoiXjQjCA/jibX4aA1AAfp3GT1lykHtVMJmSxoW4Xvn3BXhXUdtWhIwP7NDO1HRP9UAlEUgKbd/iJBWS20DFBJQb2/UN/+CpSWi97Rta3+pe3H4kOr3qaV+g1Udgmupu6/cxmQqMP+DXd77Sy6a0AMxTVBR0DU4sVW/Vs2qPfnh3r+xlqt/3VIhyKQknN6xF5RIg4j7xsEpjsnKV/XhJNmN2sWekxom9lUCkuP3qgD25S7oCG6ZV3CrkUCm48s5hw+dUZANcGs4H6/PxIrSpkAC77CDPFF5hCvkfKWzerhufLBkq7AhZgeMKRnNboaP3m9qMh6+9Z3JEyaV8rfUacshIsMqwS/BI0uL9v9+fwcMQrbdwOstrkyWCPG61dXIAoEb9t2HnSdSlxy6FXa5+LhwCvCy1ANKkBHgVSx5hoE+LrBX47caskZapZ+MAsTFJhA3VxvHgKaWiuX4/vaG7TbOZdX7GRSzPz3yOeM4JeAuLqwOy6T0OBIKbnSm5b3A5+Y2j2cNYMiVmogx89QCIPRicA936Dj6rC2bDKBi8DmXw8dZvR170ELj4UjqD+VRopML3ww7ILyoVYi5P150ekt4QioS95PZdaHcPXSAD0GwVZe1t0K1qy2TGc7V2ySUwrZKwEnPRbLXAcl6praPJ8aVbkAJ1MPaI09ZDaZOT+npRQ4SFv1DK3halvT/cYVWNFxZy/HEwXatv4MtSF+5ymHEWqFC/kYwCJMTaYtzI7Ma9Q1rJ1WZtVBP36KFFdSj1G8Bw5b5ssozn/uHJxFO9g937ZtQBQvxvgA4h8rApfcpEHs+HfrYkWalhdEwiJ+fpmF/Um3ywbq7MF3kWROuUQa4H2rcVhq4WpdGuBte/A+QvHrGkq45kCcmvaWhAAslxCV5CWs7QlXig29URyTAgPh//Ji+IAJXC9fNNMdeirO7iPEEOemj9zZ8FMiAQAYKRF4o8E9glP+Jx+Vw9xU5oM40/363XW5T+Gd4xtwwwQoR3P38Wd0uURAeDvp2P53Wz6zxpyRmpc2iAwN5BujDYD2v+lpIn2AMUaEqKkrYP6sRheFZ0EY9Yt7r25gt9pITZVoPxxTMUDlHfdZgyMFfPLKLOtUk3gaiv88FD1Wd4AdI2pNnmYqAMKjqK35Ys3wVuBmgAbUPH6k4ae0ku7/qyRrkGHwRewnAAVZQgZavvBMFJ8cB4Ndb2bXEI2phv40TLtxqffTyNrTfbyrEdKKESwv/h/+pkLpi4bcaUZx0fBeRewm9oUozrsfuGNZcn0rKC8DdMUtqqXBWClU0bAHPTp2GD2c1FNwcwAFOXWyuK3ox0nFYLckD+pQW3ZJyKBKlCnanFXhVDRONHgupmm89QapXZ32FhAzncd/Xcy34ljiSee3UVHJtnq2YJJwQQVBNQKjuhoCv0YqzT/zVWuTbF5QtRm8I7cC5FQANj9TfJqwOxdaoY98K6RRZGzAezoRsF02Q3PwAowC6vYqUzHv85kEfb7BYqzoXGLm4fLxafznJZ+JhJdtsmV5qQiAxjnFQdrdTtL4KNZCXlvtdVYXxLGFN9os7WJoU2kLQB5RTU1rvAlYHfbTZZTTYFKXxRHAizqcSNldKkms7p4RYVAWlUXIGdWTb4kym3qAF4clO+3Njf9F3zxl1b73YfH8pXbnk9fIQnHRowK9vQFRcfD8ikeIUAmZrhe+3cOXZUAt7EeSjZgZFxWFhFll/ZC/Y93aYwMJjAhvbgcS/zZaR0ucmJ663gDu7xgXT3tgQrvb4daDFM10U5HZ/kt2r9m26me5oXdgom65hEkEgfTe03ZFzZnPz7n1fzuGVThCppMAAAyK2pIlNAb40xyGcWNko8VyJ3oghsue2leWHkJ6UpWCdZB13x+QcxkLOr5a8X0zx6N+VcXwNMfGGqlelK0sh1MrRizk4drf0prMW3Q264J3IVJTZ3tx1ULpBi8CnnmrwBeYvfkI5rZJ2W6cOv3bKMqoCpyoNo+gpCZcSVgB8hdzlfMfPl67dL9/IqNo2mBQBaVitoQ4y7KzqHnrBWSxLIyznP3v/VNlzgF7qcPaQiDYhyGAgLfihsZE5nQZLcedY4Apm3dhEOyMUpdzNNyViCP6ykfFn35Ss3JDUS7lfZV47bpxeatoe2dNzU5TGxY9GoVYvhKXmP0WjgOpwv91XPF/x1ty0JRgNGVMwnwxk4PpSpDgGRu/k4jMev9x1vlc3EdAIz+WBCWU23SZoIT3WfyVNpXi7azEQkSB7e1K+fS25uGiNScc4/Nn8BVsUqtwtGhM5nncB7tH0F/k0ngZeGmqEGNJw01v2UYpLQoxwqhCz7/X5it8liVJMxk2kQ3iCGYnwDwfHcl7gLJGiAqrjLBOlp17bPGYIGTlFw+TOCLsGS103TZvSbyptAazsca/TY3o5hZLqX7SBvnfL6s/SU7BVyQY4PpZwHLa6PI2w+uFmJZbBsaruCVPW+FL+zSfvPO560ABJLD6nKsReNBwoxShnNi1XPSmX+C7Ij/ik2nfzubk6IFlomrI0bs386ztTMDifWKNO0ZnC+Oau6ZgwE4PwF8AqKtGFd5yqG0aMFq9rvwPb8DZCXmUHN5Uc40cNG5HWNSAK1yFAkCcG2GPV/7JYEi3t9ZA8NBeh9Dmvsjv8jiaeknPCij14x6BmGOFzyVNqRcS8x517fM39S0cC6bzu8wbnh96fwQ9z/JzCEsqxV9KjuES+xv3rYkX+r3JxcK7p78EACPip85gRBoIU7cZgrwLepMArrpA9YvR8Icag3YILzWcgXVoVRTs6Xc2PsiKasZ98y5CBkmP9Ri3lwZ9acgvPJ1fw729yDzDl/0qEeBOf7ZYZ7dreaPeaGHIymfgKAwmwhnjvAGaqLWhgAAAABJRU5ErkJggg==",
-                            "detail": "high",
-                        },
-                    },
-                ],
-            },
-        ],
-        "stream": False,
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "candidates": [
-                {
-                    "content": {"parts": [{"text": "scripted answer ca377dd90846"}], "role": "model"},
-                    "finishReason": "STOP",
-                    "index": 0,
-                }
-            ],
-            "usageMetadata": {
-                "promptTokenCount": 2116,
-                "candidatesTokenCount": 240,
-                "totalTokenCount": 2356,
-                "promptTokensDetails": [
-                    {"modality": "TEXT", "tokenCount": 310},
-                    {"modality": "IMAGE", "tokenCount": 1806},
-                ],
-            },
-            "modelVersion": "gemini-3.8-flash",
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.0018683, input_cost=0.0011483, output_cost=0.00072, prompt_tokens=2116, completion_tokens=240
-    ),
-)
 
-GEMINI_GEMINI_3_8_FLASH_VIDEO_INPUT: Final = CostTrackingTestCase(
-    name="gemini-gemini-3.8-flash-video_input",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini/gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "030071a5c80f summarize the attached material in one line and name the city weather",
-                    },
-                    {
-                        "type": "file",
-                        "file": {
-                            "file_data": "data:video/mp4;base64,AAAAGGZ0eXBpc29tAAACAGlzb21pc282AAACCG1kYXQNFBsiKTA3PkVMU1phaG92fYSLkpmgp661vMPK0djf5u30+wIJEBceJSwzOkFIT1ZdZGtyeYCHjpWco6qxuL/GzdTb4unw9/4FDBMaISgvNj1ES1JZYGdudXyDipGYn6attLvCydDX3uXs8/oBCA8WHSQrMjlAR05VXGNqcXh/ho2Um6KpsLe+xczT2uHo7/b9BAsSGSAnLjU8Q0pRWF9mbXR7gomQl56lrLO6wcjP1t3k6/L5AAcOFRwjKjE4P0ZNVFtiaXB3foWMk5qhqK+2vcTL0tng5+71/AMKERgfJi00O0JJUFdeZWxzeoGIj5adpKuyucDHztXc4+rx+P8GDRQbIikwNz5FTFNaYWhvdn2Ei5KZoKeutbzDytHY3+bt9PsCCRAXHiUsMzpBSE9WXWRrcnmAh46VnKOqsbi/xs3U2+Lp8Pf+BQwTGiEoLzY9REtSWWBnbnV8g4qRmJ+mrbS7wsnQ197l7PP6AQgPFh0kKzI5QEdOVVxjanF4f4aNlJuiqbC3vsXM09rh6O/2/QQLEhkgJy41PENKUVhfZm10e4KJkJeepayzusHIz9bd5Ovy+QAHDhUcIyoxOD9GTVRbYmlwd36FjJOaoaivtr3Ey9LZ4Ofu9fwDChEYHyYtNDtCSVBXXmVsc3qBiI+WnaSrsrnAx87V3OPq8fj/Bg==",
-                            "format": "mp4",
-                        },
-                    },
-                ],
-            },
-        ],
-        "stream": False,
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "candidates": [
-                {
-                    "content": {"parts": [{"text": "scripted answer 030071a5c80f"}], "role": "model"},
-                    "finishReason": "STOP",
-                    "index": 0,
-                }
-            ],
-            "usageMetadata": {
-                "promptTokenCount": 8060,
-                "candidatesTokenCount": 300,
-                "totalTokenCount": 8360,
-                "promptTokensDetails": [
-                    {"modality": "TEXT", "tokenCount": 140},
-                    {"modality": "VIDEO", "tokenCount": 7920},
-                ],
-            },
-            "modelVersion": "gemini-3.8-flash",
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.005722, input_cost=0.004822, output_cost=0.0009, prompt_tokens=8060, completion_tokens=300
-    ),
-)
 
 GEMINI_GEMINI_3_8_FLASH_REASONING: Final = CostTrackingTestCase(
     name="gemini-gemini-3.8-flash-reasoning",
@@ -2316,60 +2074,6 @@ GEMINI_GEMINI_3_8_FLASH_STREAM_NO_USAGE_TOOL_CALL: Final = CostTrackingTestCase(
     expected=RecountExpected(recount=RecountRates(input_cost_per_token=5e-07, output_cost_per_token=3e-06)),
 )
 
-GEMINI_GEMINI_3_8_FLASH_STREAM_NO_USAGE_IMAGE_INPUT: Final = CostTrackingTestCase(
-    name="gemini-gemini-3.8-flash-stream_no_usage_image_input",
-    covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini/gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "5fca57bc9ae9 summarize the attached material in one line and name the city weather",
-                    },
-                    {
-                        "type": "image_url",
-                        "image_url": {
-                            "url": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAMK0lEQVR4nAEgDN/zAM0HLNi+b59irEwJwoIG5+NVlKprNC9dCjpeSEL6tCj3YubiguXBZXx4w6lns2cR6zkGp8hgPXHUCeelTYe9wfcEQgJ6rx+pW3+GWJV430PkExZ66Nnc6zd2KDOBGnGnIwBzhiZIL2HGI3lifMEk1EYYPG5NnqGlpcz3LiFAwwS9/Goh5egSF1aINdSX+yErhrSeZWrPBkEWmgtZ9OYpQ58l2dRlT+yNSBn7QNa6ssjgEhxEGuYUp7jZKpIZrx7Oh1QAV1jeeB7zT4/0jccZhxGSWqLiJW9VRPJQuRZjnL/J8qO8F7vpSKdYNMGDc/cEMXKNBlAdehNaVHGe84Tdmm53hcOfr0ICjvEPuk0WzuaDIOumjneMSZ1+6qg8mAM8quAXAOyQPrjRNxDXsUwZZhYr07VMCinT0OP4yIEWDKvlaxGgReVKAJ1JpZx/Hlt+evT70yo3G94iWEhVavFwPnqJ87rKl0BT6+ohtOgz197MvB8QzMXpME/BwepPYkiRLpbBOAD37hU9bAWozdK3sPczg3okfSudzcFjAYtEIq5yw+1ZF9EYmBSexEP+IhnvUWC4BeDWZQiCjhF7/4syzu4C5kF9ETfrG+udK0232R+NA+uESn014bRJmPMfahYljDojL1UAbuaA0PuOGOzBBlCKXAkFNHIfvvZHQafMkl9qmqdFF4x3Em6WDuijSQXN6nFtM3UXbUGmmCF4Rcyl4YhifPspUXLdXZMIvPo9zAhTSlQFEi8m83sw5KxL0rWBzS9c4XAIAOaz3py4dTb7d9QaqDMLk0J87/15PZKvEaC6/hZ62sCtuFTywatjViHrBXTgOO5IJsiyYuzmaeQJKHmr11gnixR2rO7lqNEGs3shT+xK/lDUucFkigvA+a5C+itk/VV+1gDxc420UHpKhj31j0YnCZSFJebGz2/XSTyT6XfZhG4XNwZGIeUGCPKt0DX9lpB0RNN0yiPzQVJfa3LkZpRBN3RGgRpYc8WpHn5Q1wWpmnklpPHACv/N+kGz0Ki86g2GgvsAWloXy5pwfFtwZRYV9fMGU4Za35yfj4cddJuHfAyHSpYHVlGhNknUVQIBV9gOq7wwLZU3Pl5GJgSy4EK7f75iRVKD/B0ItpC0FBpwODhWP184ymnLgLGkK90WIVUY7hZtAEOu39BF2OsPDWrBGWN0esj6v3clX2z22gaLmrJHiwE4sXWUC8TLLtFp4uiS/VlbojLP9uiewb/vrTLBiFjYJ5rsFjuu/3XxEuiZ1QYyi9sfsFqPoiXjQjCA/jibX4aA1AAfp3GT1lykHtVMJmSxoW4Xvn3BXhXUdtWhIwP7NDO1HRP9UAlEUgKbd/iJBWS20DFBJQb2/UN/+CpSWi97Rta3+pe3H4kOr3qaV+g1Udgmupu6/cxmQqMP+DXd77Sy6a0AMxTVBR0DU4sVW/Vs2qPfnh3r+xlqt/3VIhyKQknN6xF5RIg4j7xsEpjsnKV/XhJNmN2sWekxom9lUCkuP3qgD25S7oCG6ZV3CrkUCm48s5hw+dUZANcGs4H6/PxIrSpkAC77CDPFF5hCvkfKWzerhufLBkq7AhZgeMKRnNboaP3m9qMh6+9Z3JEyaV8rfUacshIsMqwS/BI0uL9v9+fwcMQrbdwOstrkyWCPG61dXIAoEb9t2HnSdSlxy6FXa5+LhwCvCy1ANKkBHgVSx5hoE+LrBX47caskZapZ+MAsTFJhA3VxvHgKaWiuX4/vaG7TbOZdX7GRSzPz3yOeM4JeAuLqwOy6T0OBIKbnSm5b3A5+Y2j2cNYMiVmogx89QCIPRicA936Dj6rC2bDKBi8DmXw8dZvR170ELj4UjqD+VRopML3ww7ILyoVYi5P150ekt4QioS95PZdaHcPXSAD0GwVZe1t0K1qy2TGc7V2ySUwrZKwEnPRbLXAcl6praPJ8aVbkAJ1MPaI09ZDaZOT+npRQ4SFv1DK3halvT/cYVWNFxZy/HEwXatv4MtSF+5ymHEWqFC/kYwCJMTaYtzI7Ma9Q1rJ1WZtVBP36KFFdSj1G8Bw5b5ssozn/uHJxFO9g937ZtQBQvxvgA4h8rApfcpEHs+HfrYkWalhdEwiJ+fpmF/Um3ywbq7MF3kWROuUQa4H2rcVhq4WpdGuBte/A+QvHrGkq45kCcmvaWhAAslxCV5CWs7QlXig29URyTAgPh//Ji+IAJXC9fNNMdeirO7iPEEOemj9zZ8FMiAQAYKRF4o8E9glP+Jx+Vw9xU5oM40/363XW5T+Gd4xtwwwQoR3P38Wd0uURAeDvp2P53Wz6zxpyRmpc2iAwN5BujDYD2v+lpIn2AMUaEqKkrYP6sRheFZ0EY9Yt7r25gt9pITZVoPxxTMUDlHfdZgyMFfPLKLOtUk3gaiv88FD1Wd4AdI2pNnmYqAMKjqK35Ys3wVuBmgAbUPH6k4ae0ku7/qyRrkGHwRewnAAVZQgZavvBMFJ8cB4Ndb2bXEI2phv40TLtxqffTyNrTfbyrEdKKESwv/h/+pkLpi4bcaUZx0fBeRewm9oUozrsfuGNZcn0rKC8DdMUtqqXBWClU0bAHPTp2GD2c1FNwcwAFOXWyuK3ox0nFYLckD+pQW3ZJyKBKlCnanFXhVDRONHgupmm89QapXZ32FhAzncd/Xcy34ljiSee3UVHJtnq2YJJwQQVBNQKjuhoCv0YqzT/zVWuTbF5QtRm8I7cC5FQANj9TfJqwOxdaoY98K6RRZGzAezoRsF02Q3PwAowC6vYqUzHv85kEfb7BYqzoXGLm4fLxafznJZ+JhJdtsmV5qQiAxjnFQdrdTtL4KNZCXlvtdVYXxLGFN9os7WJoU2kLQB5RTU1rvAlYHfbTZZTTYFKXxRHAizqcSNldKkms7p4RYVAWlUXIGdWTb4kym3qAF4clO+3Njf9F3zxl1b73YfH8pXbnk9fIQnHRowK9vQFRcfD8ikeIUAmZrhe+3cOXZUAt7EeSjZgZFxWFhFll/ZC/Y93aYwMJjAhvbgcS/zZaR0ucmJ663gDu7xgXT3tgQrvb4daDFM10U5HZ/kt2r9m26me5oXdgom65hEkEgfTe03ZFzZnPz7n1fzuGVThCppMAAAyK2pIlNAb40xyGcWNko8VyJ3oghsue2leWHkJ6UpWCdZB13x+QcxkLOr5a8X0zx6N+VcXwNMfGGqlelK0sh1MrRizk4drf0prMW3Q264J3IVJTZ3tx1ULpBi8CnnmrwBeYvfkI5rZJ2W6cOv3bKMqoCpyoNo+gpCZcSVgB8hdzlfMfPl67dL9/IqNo2mBQBaVitoQ4y7KzqHnrBWSxLIyznP3v/VNlzgF7qcPaQiDYhyGAgLfihsZE5nQZLcedY4Apm3dhEOyMUpdzNNyViCP6ykfFn35Ss3JDUS7lfZV47bpxeatoe2dNzU5TGxY9GoVYvhKXmP0WjgOpwv91XPF/x1ty0JRgNGVMwnwxk4PpSpDgGRu/k4jMev9x1vlc3EdAIz+WBCWU23SZoIT3WfyVNpXi7azEQkSB7e1K+fS25uGiNScc4/Nn8BVsUqtwtGhM5nncB7tH0F/k0ngZeGmqEGNJw01v2UYpLQoxwqhCz7/X5it8liVJMxk2kQ3iCGYnwDwfHcl7gLJGiAqrjLBOlp17bPGYIGTlFw+TOCLsGS103TZvSbyptAazsca/TY3o5hZLqX7SBvnfL6s/SU7BVyQY4PpZwHLa6PI2w+uFmJZbBsaruCVPW+FL+zSfvPO560ABJLD6nKsReNBwoxShnNi1XPSmX+C7Ij/ik2nfzubk6IFlomrI0bs386ztTMDifWKNO0ZnC+Oau6ZgwE4PwF8AqKtGFd5yqG0aMFq9rvwPb8DZCXmUHN5Uc40cNG5HWNSAK1yFAkCcG2GPV/7JYEi3t9ZA8NBeh9Dmvsjv8jiaeknPCij14x6BmGOFzyVNqRcS8x517fM39S0cC6bzu8wbnh96fwQ9z/JzCEsqxV9KjuES+xv3rYkX+r3JxcK7p78EACPip85gRBoIU7cZgrwLepMArrpA9YvR8Icag3YILzWcgXVoVRTs6Xc2PsiKasZ98y5CBkmP9Ri3lwZ9acgvPJ1fw729yDzDl/0qEeBOf7ZYZ7dreaPeaGHIymfgKAwmwhnjvAGaqLWhgAAAABJRU5ErkJggg==",
-                            "detail": "high",
-                        },
-                    },
-                ],
-            },
-        ],
-        "stream": True,
-        "stream_options": {"include_usage": True},
-        "allowed_openai_params": [],
-    },
-    response=SseResponse(
-        content_type="text/event-stream",
-        frames=sse_frames(
-            {
-                "candidates": [
-                    {
-                        "content": {"parts": [{"text": "scripted answer 5fca57bc9ae9"}], "role": "model"},
-                        "finishReason": "STOP",
-                        "index": 0,
-                    }
-                ],
-                "modelVersion": "gemini-3.8-flash",
-            }
-        ),
-    ),
-    expected=RecountExpected(recount=RecountRates(input_cost_per_token=5e-07, output_cost_per_token=3e-06)),
-)
 
 GEMINI_GEMINI_3_8_FLASH_PROMPT_BLOCKED: Final = CostTrackingTestCase(
     name="gemini-gemini-3.8-flash-prompt_blocked",
@@ -3641,10 +3345,6 @@ CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     GEMINI_GEMINI_3_1_PRO_STREAM_FULL_USAGE,
     GEMINI_GEMINI_3_8_FLASH_INPUT_TEXT,
     GEMINI_GEMINI_3_8_FLASH_CACHE_READ,
-    GEMINI_GEMINI_3_8_FLASH_AUDIO_INPUT,
-    GEMINI_GEMINI_3_8_FLASH_AUDIO_OUTPUT,
-    GEMINI_GEMINI_3_8_FLASH_IMAGE_INPUT,
-    GEMINI_GEMINI_3_8_FLASH_VIDEO_INPUT,
     GEMINI_GEMINI_3_8_FLASH_REASONING,
     GEMINI_GEMINI_3_8_FLASH_SERVICE_TIER_FLEX,
     GEMINI_GEMINI_3_8_FLASH_SERVICE_TIER_PRIORITY,
@@ -3653,7 +3353,6 @@ CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     GEMINI_GEMINI_3_8_FLASH_STREAM,
     GEMINI_GEMINI_3_8_FLASH_STREAM_NO_USAGE,
     GEMINI_GEMINI_3_8_FLASH_STREAM_NO_USAGE_TOOL_CALL,
-    GEMINI_GEMINI_3_8_FLASH_STREAM_NO_USAGE_IMAGE_INPUT,
     GEMINI_GEMINI_3_8_FLASH_PROMPT_BLOCKED,
     GEMINI_GEMINI_3_8_FLASH_STREAM_PROMPT_BLOCKED,
     GEMINI_GEMINI_3_8_FLASH_RESPONSE_MODEL_OVERRIDE,
diff --git a/tests/integration/cost_calculation/cases/misc.py b/tests/integration/cost_calculation/cases/misc.py
index c9729353c8e..f98dda5fb0c 100644
--- a/tests/integration/cost_calculation/cases/misc.py
+++ b/tests/integration/cost_calculation/cases/misc.py
@@ -834,6 +834,61 @@ AZURE_AI_GPT_5_4_MINI_LATEST_STREAM: Final = CostTrackingTestCase(
 )
 
 
+# azure_ai/grok-4.6 (Grok on Azure AI Foundry reports reasoning_tokens outside completion_tokens, like xai)
+AZURE_AI_GROK_4_6_REASONING_FOLDED_INTO_COMPLETION: Final = CostTrackingTestCase(
+    name="azure-ai-grok-4.6-reasoning_folded_into_completion",
+    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
+    model="azure_ai/grok-4.6",
+    request={
+        "model": "$MODEL",
+        "messages": [{"role": "user", "content": "azure-ai-grok-4.6-reasoning"}],
+        "stream": False,
+    },
+    response=JsonResponse(
+        content_type="application/json",
+        body={
+            "id": "chatcmpl-$REQUEST_ID",
+            "object": "chat.completion",
+            "model": "grok-4.6",
+            "choices": [{"index": 0, "message": {"role": "assistant", "content": "ok"}, "finish_reason": "stop"}],
+            "usage": {
+                "prompt_tokens": 1840,
+                "completion_tokens": 412,
+                "total_tokens": 2552,
+                "completion_tokens_details": {"reasoning_tokens": 300},
+            },
+        },
+    ),
+    expected=ExactExpected(
+        spend=0.0108, input_cost=0.00368, output_cost=0.00712, prompt_tokens=1840, completion_tokens=712
+    ),
+)
+
+AZURE_AI_GROK_4_6_REASONING_FOLDED_INTO_COMPLETION_STREAM: Final = CostTrackingTestCase(
+    name="azure-ai-grok-4.6-reasoning_folded_into_completion-stream",
+    covers="quota_management.spend_tracking.scripted_wire.logs_cost",
+    model="azure_ai/grok-4.6",
+    request={
+        "model": "$MODEL",
+        "messages": [{"role": "user", "content": "azure-ai-grok-4.6-reasoning-stream"}],
+        "stream": True,
+        "stream_options": {"include_usage": True},
+    },
+    response=SseResponse(
+        content_type="text/event-stream",
+        frames=(
+            'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1,"model":"grok-4.6","choices":[{"index":0,"delta":{"role":"assistant","content":"ok"},"finish_reason":null}]}\n\n',
+            'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1,"model":"grok-4.6","choices":[{"index":0,"delta":{},"finish_reason":"stop"}]}\n\n',
+            'data: {"id":"chatcmpl-$REQUEST_ID","object":"chat.completion.chunk","created":1,"model":"grok-4.6","choices":[],"usage":{"prompt_tokens":1840,"completion_tokens":412,"total_tokens":2552,"completion_tokens_details":{"reasoning_tokens":300}}}\n\n',
+            "data: [DONE]\n\n",
+        ),
+    ),
+    expected=ExactExpected(
+        spend=0.0108, input_cost=0.00368, output_cost=0.00712, prompt_tokens=1840, completion_tokens=712
+    ),
+)
+
+
 # azure_ai/claude-haiku-4-5 (Azure AI Foundry Anthropic, web search billed per server_tool_use.web_search_requests)
 AZURE_AI_CLAUDE_HAIKU_4_5_MESSAGES_WEB_SEARCH: Final = CostTrackingTestCase(
     name="azure-ai-claude-haiku-4-5-messages_web_search_two_requests",
@@ -1978,6 +2033,8 @@ CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     BEDROCK_INVOKE_HAIKU_STREAM,
     AZURE_AI_GPT_5_4_MINI_LATEST,
     AZURE_AI_GPT_5_4_MINI_LATEST_STREAM,
+    AZURE_AI_GROK_4_6_REASONING_FOLDED_INTO_COMPLETION,
+    AZURE_AI_GROK_4_6_REASONING_FOLDED_INTO_COMPLETION_STREAM,
     AZURE_AI_CLAUDE_HAIKU_4_5_MESSAGES_WEB_SEARCH,
     AZURE_AI_CLAUDE_HAIKU_4_5_MESSAGES_WEB_SEARCH_STREAM,
     AZURE_AI_CLAUDE_HAIKU_4_5_MESSAGES_WEB_SEARCH_ONE_REQUEST,
diff --git a/tests/integration/cost_calculation/cases/vertex_ai.py b/tests/integration/cost_calculation/cases/vertex_ai.py
index e35fd2307c2..761078ef593 100644
--- a/tests/integration/cost_calculation/cases/vertex_ai.py
+++ b/tests/integration/cost_calculation/cases/vertex_ai.py
@@ -248,7 +248,9 @@ GEMINI_3_1_PRO_INPUT_TEXT: Final = CostTrackingTestCase(
                 "promptTokenCount": 1840,
                 "candidatesTokenCount": 412,
                 "totalTokenCount": 2252,
+                "trafficType": "ON_DEMAND",
                 "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 1840}],
+                "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 412}],
             },
             "modelVersion": "gemini-3.1-pro",
         },
@@ -302,7 +304,9 @@ GEMINI_3_1_PRO_CACHE_READ: Final = CostTrackingTestCase(
                 "candidatesTokenCount": 380,
                 "totalTokenCount": 13308,
                 "cachedContentTokenCount": 12288,
+                "trafficType": "ON_DEMAND",
                 "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 12928}],
+                "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 380}],
             },
             "modelVersion": "gemini-3.1-pro",
         },
@@ -935,7 +939,9 @@ GEMINI_3_1_PRO_STREAM: Final = CostTrackingTestCase(
                     "promptTokenCount": 1840,
                     "candidatesTokenCount": 412,
                     "totalTokenCount": 2252,
+                    "trafficType": "ON_DEMAND",
                     "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 1840}],
+                    "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 412}],
                 },
                 "modelVersion": "gemini-3.1-pro",
             },
@@ -1667,9 +1673,9 @@ GEMINI_3_1_PRO_PASSTHROUGH_STREAM_GENERATE_CONTENT_PRICED_VIA_VERTEX_KEY: Final
 
 # gemini-3.8-flash
 GEMINI_3_8_FLASH_INPUT_TEXT: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-input_text",
+    name="vertex_ai/gemini-3.8-flash-input_text",
     covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -1720,9 +1726,9 @@ GEMINI_3_8_FLASH_INPUT_TEXT: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_CACHE_READ: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-cache_read",
+    name="vertex_ai/gemini-3.8-flash-cache_read",
     covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -1773,196 +1779,13 @@ GEMINI_3_8_FLASH_CACHE_READ: Final = CostTrackingTestCase(
     ),
 )
 
-GEMINI_3_8_FLASH_AUDIO_INPUT: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-audio_input",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "3e33892c4f9f summarize the attached material in one line and name the city weather",
-                    },
-                    {
-                        "type": "input_audio",
-                        "input_audio": {
-                            "data": "UklGRmQGAABXQVZFZm10IBAAAAABAAEAQB8AAIA+AAACABAAZGF0YUAGAAAAAA8I4A85F+EdpCNYKNkrCy7eLkwuWSwTKZUk/x59GEERgQl4AWb5hPER6kbjVd1t2LLUQdIu0X/RM9M81oTa6t9E5mPtD/UP/SQFEw2fFI0bqSHEJrgqZi27LqouNi1pKlkmJSH0GvUTXgxpBFP8WPS27KflYt8U2ujV/dJp0TjRbNL71NPY1d3b47nqOPIh+jUCOQrwER0ZjB8JJW0plCxoLtou5i2VK/cnKSNOHZUWLw9VB0T/OPdv7yToj+Hi20nX5tPT0SDR09Hm00nX4tuP4STob+8490T/VQcvD5UWTh0pI/cnlSvmLdouaC6ULG0pCSWMHx0Z8BE5CjUCIfo48rnq2+PV3dPY+9Rs0jjRadH90ujVFNpi36fltuxY9FP8aQReDPUT9BolIVkmaSo2Laouuy5mLbgqxCapIY0bnxQTDSQFD/0P9WPtRObq34TaPNYz03/RLtFB0rLUbdhV3UbjEeqE8Wb5eAGBCUERfRj/HpUkEylZLEwu3i4LLtkrWCikI+EdORfgDw8IAADx9yDwx+gf4lzcqNcn1PXRItG00afT7dZr2wHhg+e/7n/2iP6aBnwO7xW6HKsikydOK78t0i6BLs0sxCl8JRYgvBmdEvEK8QLc+u3yYetz5FfePNlI1ZrSRdFW0crSl9Wn2dveDOUL7KLzl/utA6gLShNZGp4g7CUYKgMtly7ILpQtBSstJysiJRxHFcgN3wXL/cf1EO7j5nTg99qT1mzTmNEm0RrSa9QJ2NfcsuJr6dHwq/i8AMgIkRDcF3EeHiS3KBosLS7gLi0uGiy3KB4kcR7cF5EQyAi8AKv40fBr6bLi19wJ2GvUGtIm0ZjRbNOT1vfadODj5hDux/XL/d8FyA1HFSUcKyItJwUrlC3ILpcuAy0YKuwlniBZGkoTqAutA5f7ovML7Azl296n2ZfVytJW0UXRmtJI1TzZV95z5GHr7fLc+vEC8QqdErwZFiB8JcQpzSyBLtIuvy1OK5MnqyK6HO8VfA6aBoj+f/a/7oPnAeFr2+3Wp9O00SLR9dEn1KjXXNwf4sfoIPDx9wAADwjgDzkX4R2kI1go2SsLLt4uTC5ZLBMplST/Hn0YQRGBCXgBZvmE8RHqRuNV3W3YstRB0i7Rf9Ez0zzWhNrq30TmY+0P9Q/9JAUTDZ8UjRupIcQmuCpmLbsuqi42LWkqWSYlIfQa9RNeDGkEU/xY9Lbsp+Vi3xTa6NX90mnRONFs0vvU09jV3dvjueo48iH6NQI5CvARHRmMHwklbSmULGgu2i7mLZUr9ycpI04dlRYvD1UHRP8492/vJOiP4eLbSdfm09PRINHT0ebTSdfi24/hJOhv7zj3RP9VBy8PlRZOHSkj9yeVK+Yt2i5oLpQsbSkJJYwfHRnwETkKNQIh+jjyuerb49Xd09j71GzSONFp0f3S6NUU2mLfp+W27Fj0U/xpBF4M9RP0GiUhWSZpKjYtqi67LmYtuCrEJqkhjRufFBMNJAUP/Q/1Y+1E5urfhNo81jPTf9Eu0UHSstRt2FXdRuMR6oTxZvl4AYEJQRF9GP8elSQTKVksTC7eLgsu2StYKKQj4R05F+APDwgAAPH3IPDH6B/iXNyo1yfU9dEi0bTRp9Pt1mvbAeGD57/uf/aI/poGfA7vFbocqyKTJ04rvy3SLoEuzSzEKXwlFiC8GZ0S8QrxAtz67fJh63PkV9482UjVmtJF0VbRytKX1afZ294M5QvsovOX+60DqAtKE1kaniDsJRgqAy2XLsgulC0FKy0nKyIlHEcVyA3fBcv9x/UQ7uPmdOD32pPWbNOY0SbRGtJr1AnY19yy4mvp0fCr+LwAyAiRENwXcR4eJLcoGiwtLuAuLS4aLLcoHiRxHtwXkRDICLwAq/jR8GvpsuLX3AnYa9Qa0ibRmNFs05PW99p04OPmEO7H9cv93wXIDUcVJRwrIi0nBSuULcguly4DLRgq7CWeIFkaShOoC60Dl/ui8wvsDOXb3qfZl9XK0lbRRdGa0kjVPNlX3nPkYevt8tz68QLxCp0SvBkWIHwlxCnNLIEu0i6/LU4rkyerIroc7xV8DpoGiP5/9r/ug+cB4Wvb7dan07TRItH10SfUqNdc3B/ix+gg8PH3",
-                            "format": "wav",
-                        },
-                    },
-                ],
-            },
-        ],
-        "stream": False,
-        "modalities": ["text"],
-        "allowed_openai_params": ["modalities"],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "candidates": [
-                {
-                    "content": {"parts": [{"text": "scripted answer 3e33892c4f9f"}], "role": "model"},
-                    "finishReason": "STOP",
-                    "index": 0,
-                }
-            ],
-            "usageMetadata": {
-                "promptTokenCount": 1546,
-                "candidatesTokenCount": 210,
-                "totalTokenCount": 1756,
-                "promptTokensDetails": [
-                    {"modality": "TEXT", "tokenCount": 96},
-                    {"modality": "AUDIO", "tokenCount": 1450},
-                ],
-            },
-            "modelVersion": "gemini-3.8-flash",
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.00221312, input_cost=0.00155792, output_cost=0.0006552, prompt_tokens=1546, completion_tokens=210
-    ),
-)
 
-GEMINI_3_8_FLASH_AUDIO_OUTPUT: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-audio_output",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "30bf1c0de6fe summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "modalities": ["text", "audio"],
-        "audio": {"voice": "alloy", "format": "pcm16"},
-        "allowed_openai_params": ["modalities", "audio"],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "candidates": [
-                {
-                    "content": {"parts": [{"text": "scripted answer 30bf1c0de6fe"}], "role": "model"},
-                    "finishReason": "STOP",
-                    "index": 0,
-                }
-            ],
-            "usageMetadata": {
-                "promptTokenCount": 220,
-                "candidatesTokenCount": 1300,
-                "totalTokenCount": 1520,
-                "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 220}],
-                "candidatesTokensDetails": [
-                    {"modality": "TEXT", "tokenCount": 180},
-                    {"modality": "AUDIO", "tokenCount": 1120},
-                ],
-            },
-            "modelVersion": "gemini-3.8-flash",
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.0076648, input_cost=0.0001144, output_cost=0.0075504, prompt_tokens=220, completion_tokens=1300
-    ),
-)
 
-GEMINI_3_8_FLASH_VIDEO_INPUT: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-video_input",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "5f5da5957185 summarize the attached material in one line and name the city weather",
-                    },
-                    {
-                        "type": "file",
-                        "file": {
-                            "file_data": "data:video/mp4;base64,AAAAGGZ0eXBpc29tAAACAGlzb21pc282AAACCG1kYXQNFBsiKTA3PkVMU1phaG92fYSLkpmgp661vMPK0djf5u30+wIJEBceJSwzOkFIT1ZdZGtyeYCHjpWco6qxuL/GzdTb4unw9/4FDBMaISgvNj1ES1JZYGdudXyDipGYn6attLvCydDX3uXs8/oBCA8WHSQrMjlAR05VXGNqcXh/ho2Um6KpsLe+xczT2uHo7/b9BAsSGSAnLjU8Q0pRWF9mbXR7gomQl56lrLO6wcjP1t3k6/L5AAcOFRwjKjE4P0ZNVFtiaXB3foWMk5qhqK+2vcTL0tng5+71/AMKERgfJi00O0JJUFdeZWxzeoGIj5adpKuyucDHztXc4+rx+P8GDRQbIikwNz5FTFNaYWhvdn2Ei5KZoKeutbzDytHY3+bt9PsCCRAXHiUsMzpBSE9WXWRrcnmAh46VnKOqsbi/xs3U2+Lp8Pf+BQwTGiEoLzY9REtSWWBnbnV8g4qRmJ+mrbS7wsnQ197l7PP6AQgPFh0kKzI5QEdOVVxjanF4f4aNlJuiqbC3vsXM09rh6O/2/QQLEhkgJy41PENKUVhfZm10e4KJkJeepayzusHIz9bd5Ovy+QAHDhUcIyoxOD9GTVRbYmlwd36FjJOaoaivtr3Ey9LZ4Ofu9fwDChEYHyYtNDtCSVBXXmVsc3qBiI+WnaSrsrnAx87V3OPq8fj/Bg==",
-                            "format": "mp4",
-                        },
-                    },
-                ],
-            },
-        ],
-        "stream": False,
-        "allowed_openai_params": [],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "candidates": [
-                {
-                    "content": {"parts": [{"text": "scripted answer 5f5da5957185"}], "role": "model"},
-                    "finishReason": "STOP",
-                    "index": 0,
-                }
-            ],
-            "usageMetadata": {
-                "promptTokenCount": 8060,
-                "candidatesTokenCount": 300,
-                "totalTokenCount": 8360,
-                "promptTokensDetails": [
-                    {"modality": "TEXT", "tokenCount": 140},
-                    {"modality": "VIDEO", "tokenCount": 7920},
-                ],
-            },
-            "modelVersion": "gemini-3.8-flash",
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.0059192, input_cost=0.0049832, output_cost=0.000936, prompt_tokens=8060, completion_tokens=300
-    ),
-)
 
 GEMINI_3_8_FLASH_SERVICE_TIER_FLEX: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-service_tier_flex",
+    name="vertex_ai/gemini-3.8-flash-service_tier_flex",
     covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2014,9 +1837,9 @@ GEMINI_3_8_FLASH_SERVICE_TIER_FLEX: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_SERVICE_TIER_PRIORITY: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-service_tier_priority",
+    name="vertex_ai/gemini-3.8-flash-service_tier_priority",
     covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2068,9 +1891,9 @@ GEMINI_3_8_FLASH_SERVICE_TIER_PRIORITY: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_WEB_SEARCH_PER_PROMPT: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-web_search_per_prompt",
+    name="vertex_ai/gemini-3.8-flash-web_search_per_prompt",
     covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2118,14 +1941,14 @@ GEMINI_3_8_FLASH_WEB_SEARCH_PER_PROMPT: Final = CostTrackingTestCase(
         },
     ),
     expected=ExactExpected(
-        spend=0.03724224, input_cost=0.0009568, output_cost=0.00128544, prompt_tokens=1840, completion_tokens=412
+        spend=0.10724224, input_cost=0.0009568, output_cost=0.00128544, prompt_tokens=1840, completion_tokens=412
     ),
 )
 
 GEMINI_3_8_FLASH_GOOGLE_MAPS_GROUNDING: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-google_maps_grounding",
+    name="vertex_ai/gemini-3.8-flash-google_maps_grounding",
     covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2181,65 +2004,10 @@ GEMINI_3_8_FLASH_GOOGLE_MAPS_GROUNDING: Final = CostTrackingTestCase(
     ),
 )
 
-GEMINI_3_8_FLASH_FALLBACK_REASONING_AT_OUTPUT_RATE: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-fallback_reasoning_at_output_rate",
-    covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
-    request={
-        "model": "$MODEL",
-        "messages": [
-            {
-                "role": "system",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "You are a deterministic pricing-harness assistant. Keep answers to a single short line.",
-                    }
-                ],
-            },
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": "f92946792f44 summarize the attached material in one line and name the city weather",
-                    }
-                ],
-            },
-        ],
-        "stream": False,
-        "reasoning_effort": "medium",
-        "allowed_openai_params": ["reasoning_effort"],
-    },
-    response=JsonResponse(
-        content_type="application/json",
-        body={
-            "candidates": [
-                {
-                    "content": {"parts": [{"text": "scripted answer f92946792f44"}], "role": "model"},
-                    "finishReason": "STOP",
-                    "index": 0,
-                }
-            ],
-            "usageMetadata": {
-                "promptTokenCount": 1240,
-                "candidatesTokenCount": 560,
-                "thoughtsTokenCount": 3480,
-                "totalTokenCount": 5280,
-                "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 1240}],
-            },
-            "modelVersion": "gemini-3.8-flash",
-        },
-    ),
-    expected=ExactExpected(
-        spend=0.0132496, input_cost=0.0006448, output_cost=0.0126048, prompt_tokens=1240, completion_tokens=4040
-    ),
-)
-
 GEMINI_3_8_FLASH_FALLBACK_IMAGE_TOKENS_AT_INPUT_RATE: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-fallback_image_tokens_at_input_rate",
+    name="vertex_ai/gemini-3.8-flash-fallback_image_tokens_at_input_rate",
     covers="quota_management.spend_tracking.cost_matrix.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2300,9 +2068,9 @@ GEMINI_3_8_FLASH_FALLBACK_IMAGE_TOKENS_AT_INPUT_RATE: Final = CostTrackingTestCa
 )
 
 GEMINI_3_8_FLASH_STREAM: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-stream",
+    name="vertex_ai/gemini-3.8-flash-stream",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2360,9 +2128,9 @@ GEMINI_3_8_FLASH_STREAM: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_STREAM_NO_USAGE: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-stream_no_usage",
+    name="vertex_ai/gemini-3.8-flash-stream_no_usage",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2412,9 +2180,9 @@ GEMINI_3_8_FLASH_STREAM_NO_USAGE: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_STREAM_NO_USAGE_TOOL_CALL: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-stream_no_usage_tool_call",
+    name="vertex_ai/gemini-3.8-flash-stream_no_usage_tool_call",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2496,9 +2264,9 @@ GEMINI_3_8_FLASH_STREAM_NO_USAGE_TOOL_CALL: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_STREAM_NO_USAGE_IMAGE_INPUT: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-stream_no_usage_image_input",
+    name="vertex_ai/gemini-3.8-flash-stream_no_usage_image_input",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2555,9 +2323,9 @@ GEMINI_3_8_FLASH_STREAM_NO_USAGE_IMAGE_INPUT: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_PROMPT_BLOCKED: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-prompt_blocked",
+    name="vertex_ai/gemini-3.8-flash-prompt_blocked",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2605,9 +2373,9 @@ GEMINI_3_8_FLASH_PROMPT_BLOCKED: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_STREAM_PROMPT_BLOCKED: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-stream_prompt_blocked",
+    name="vertex_ai/gemini-3.8-flash-stream_prompt_blocked",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2662,9 +2430,9 @@ GEMINI_3_8_FLASH_STREAM_PROMPT_BLOCKED: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_RESPONSE_MODEL_OVERRIDE: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-response_model_override",
+    name="vertex_ai/gemini-3.8-flash-response_model_override",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2715,9 +2483,9 @@ GEMINI_3_8_FLASH_RESPONSE_MODEL_OVERRIDE: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_STREAM_RESPONSE_MODEL_OVERRIDE: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-stream_response_model_override",
+    name="vertex_ai/gemini-3.8-flash-stream_response_model_override",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2775,9 +2543,9 @@ GEMINI_3_8_FLASH_STREAM_RESPONSE_MODEL_OVERRIDE: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_TOOL_CALL: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-tool_call",
+    name="vertex_ai/gemini-3.8-flash-tool_call",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2862,9 +2630,9 @@ GEMINI_3_8_FLASH_TOOL_CALL: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_STREAM_TOOL_CALL: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-stream_tool_call",
+    name="vertex_ai/gemini-3.8-flash-stream_tool_call",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -2956,9 +2724,9 @@ GEMINI_3_8_FLASH_STREAM_TOOL_CALL: Final = CostTrackingTestCase(
 )
 
 GEMINI_3_8_FLASH_STREAM_FULL_USAGE: Final = CostTrackingTestCase(
-    name="gemini-3.8-flash-stream_full_usage",
+    name="vertex_ai/gemini-3.8-flash-stream_full_usage",
     covers="quota_management.spend_tracking.scripted_wire.logs_cost",
-    model="gemini-3.8-flash",
+    model="vertex_ai/gemini-3.8-flash",
     request={
         "model": "$MODEL",
         "messages": [
@@ -3020,7 +2788,7 @@ GEMINI_3_8_FLASH_STREAM_FULL_USAGE: Final = CostTrackingTestCase(
         ),
     ),
     expected=ExactExpected(
-        spend=0.007460128, input_cost=0.001619488, output_cost=0.00584064, prompt_tokens=8314, completion_tokens=1592
+        spend=0.005775328, input_cost=0.001276288, output_cost=0.00449904, prompt_tokens=8314, completion_tokens=1592
     ),
 )
 
@@ -3356,26 +3124,182 @@ VERTEX_AI_CLAUDE_FABLE_5_1_TOOL_CALL: Final = _vertex_claude_shape_case(
 
 
 GEMINI_3_1_PRO_PREVIEW_INPUT_TEXT: Final = _gemini_case(
-    GEMINI_3_8_FLASH_INPUT_TEXT, "gemini-3.1-pro-preview-input_text", "gemini-3.1-pro-preview",
+    GEMINI_3_8_FLASH_INPUT_TEXT, "vertex_ai/gemini-3.1-pro-preview-input_text", "vertex_ai/gemini-3.1-pro-preview",
     ExactExpected(spend=0.0094864, input_cost=0.004048, output_cost=0.0054384, prompt_tokens=1840, completion_tokens=412)
 )
 GEMINI_3_1_PRO_PREVIEW_STREAM: Final = _gemini_case(
-    GEMINI_3_8_FLASH_STREAM, "gemini-3.1-pro-preview-stream", "gemini-3.1-pro-preview",
+    GEMINI_3_8_FLASH_STREAM, "vertex_ai/gemini-3.1-pro-preview-stream", "vertex_ai/gemini-3.1-pro-preview",
     ExactExpected(spend=0.0094864, input_cost=0.004048, output_cost=0.0054384, prompt_tokens=1840, completion_tokens=412)
 )
 GEMINI_3_1_PRO_PREVIEW_CACHE_READ: Final = _gemini_case(
-    GEMINI_3_8_FLASH_CACHE_READ, "gemini-3.1-pro-preview-cache_read", "gemini-3.1-pro-preview",
+    GEMINI_3_8_FLASH_CACHE_READ, "vertex_ai/gemini-3.1-pro-preview-cache_read", "vertex_ai/gemini-3.1-pro-preview",
     ExactExpected(spend=0.00912736, input_cost=0.00411136, output_cost=0.005016, prompt_tokens=12928, completion_tokens=380)
 )
 GEMINI_3_1_PRO_PREVIEW_REASONING: Final = _gemini_case(
-    GEMINI_3_8_FLASH_FALLBACK_REASONING_AT_OUTPUT_RATE, "gemini-3.1-pro-preview-reasoning", "gemini-3.1-pro-preview",
+    GEMINI_3_1_PRO_REASONING, "vertex_ai/gemini-3.1-pro-preview-reasoning", "vertex_ai/gemini-3.1-pro-preview",
     ExactExpected(spend=0.056056, input_cost=0.002728, output_cost=0.053328, prompt_tokens=1240, completion_tokens=4040)
 )
 GEMINI_3_1_PRO_PREVIEW_TOOL_CALL: Final = _gemini_case(
-    GEMINI_3_8_FLASH_TOOL_CALL, "gemini-3.1-pro-preview-tool_call", "gemini-3.1-pro-preview",
+    GEMINI_3_8_FLASH_TOOL_CALL, "vertex_ai/gemini-3.1-pro-preview-tool_call", "vertex_ai/gemini-3.1-pro-preview",
     ExactExpected(spend=0.0094864, input_cost=0.004048, output_cost=0.0054384, prompt_tokens=1840, completion_tokens=412)
 )
 
+GEMINI_4_ARGON_INPUT_TEXT: Final = GEMINI_3_8_FLASH_INPUT_TEXT.model_copy(
+    update={
+        "name": "vertex_ai/gemini-4-argon-input_text",
+        "model": "vertex_ai/gemini-4-argon",
+        "response": JsonResponse(
+            content_type="application/json",
+            body={
+                "candidates": [
+                    {
+                        "content": {"parts": [{"text": "Hello."}], "role": "model"},
+                        "finishReason": "STOP",
+                        "index": 0,
+                    }
+                ],
+                "usageMetadata": {
+                    "promptTokenCount": 37,
+                    "candidatesTokenCount": 6,
+                    "totalTokenCount": 43,
+                    "trafficType": "ON_DEMAND",
+                    "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 37}],
+                    "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 6}],
+                },
+                "modelVersion": "gemini-4-argon",
+            },
+        ),
+        "expected": ExactExpected(
+            spend=0.0001608, input_cost=0.0000888, output_cost=0.000072, prompt_tokens=37, completion_tokens=6
+        ),
+    }
+)
+GEMINI_4_ARGON_STREAM: Final = GEMINI_3_8_FLASH_STREAM.model_copy(
+    update={
+        "name": "vertex_ai/gemini-4-argon-stream",
+        "model": "vertex_ai/gemini-4-argon",
+        "response": SseResponse(
+            content_type="text/event-stream",
+            frames=sse_frames(
+                {
+                    "candidates": [{"content": {"role": "model", "parts": [{"text": "Hello."}]}}],
+                    "usageMetadata": {"trafficType": "ON_DEMAND"},
+                    "modelVersion": "gemini-4-argon",
+                },
+                {
+                    "candidates": [{"content": {"role": "model", "parts": [{"text": ""}]}, "finishReason": "STOP"}],
+                    "usageMetadata": {
+                        "promptTokenCount": 37,
+                        "candidatesTokenCount": 6,
+                        "totalTokenCount": 43,
+                        "trafficType": "ON_DEMAND",
+                        "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 37}],
+                        "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 6}],
+                    },
+                    "modelVersion": "gemini-4-argon",
+                },
+            ),
+        ),
+        "expected": ExactExpected(
+            spend=0.0001608, input_cost=0.0000888, output_cost=0.000072, prompt_tokens=37, completion_tokens=6
+        ),
+    }
+)
+GEMINI_4_ARGON_CACHE_READ: Final = GEMINI_3_8_FLASH_CACHE_READ.model_copy(
+    update={
+        "name": "vertex_ai/gemini-4-argon-cache_read",
+        "model": "vertex_ai/gemini-4-argon",
+        "response": JsonResponse(
+            content_type="application/json",
+            body={
+                "candidates": [
+                    {"content": {"parts": [{"text": "Understood."}], "role": "model"}, "finishReason": "STOP"}
+                ],
+                "usageMetadata": {
+                    "promptTokenCount": 13532,
+                    "candidatesTokenCount": 21,
+                    "totalTokenCount": 13553,
+                    "cachedContentTokenCount": 11478,
+                    "trafficType": "ON_DEMAND",
+                    "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 13532}],
+                    "cacheTokensDetails": [{"modality": "TEXT", "tokenCount": 11478}],
+                    "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 21}],
+                },
+                "modelVersion": "gemini-4-argon",
+            },
+        ),
+        "expected": ExactExpected(
+            spend=0.00655896, input_cost=0.00630696, output_cost=0.000252, prompt_tokens=13532, completion_tokens=21
+        ),
+    }
+)
+GEMINI_4_ARGON_REASONING: Final = GEMINI_3_1_PRO_REASONING.model_copy(
+    update={
+        "name": "vertex_ai/gemini-4-argon-reasoning",
+        "model": "vertex_ai/gemini-4-argon",
+        "response": JsonResponse(
+            content_type="application/json",
+            body={
+                "candidates": [
+                    {
+                        "content": {
+                            "parts": [{"text": "Hello.", "thought": True}, {"text": "Hello."}],
+                            "role": "model",
+                        },
+                        "finishReason": "STOP",
+                        "index": 0,
+                    }
+                ],
+                "usageMetadata": {
+                    "promptTokenCount": 37,
+                    "candidatesTokenCount": 6,
+                    "totalTokenCount": 162,
+                    "trafficType": "ON_DEMAND",
+                    "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 37}],
+                    "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 6}],
+                    "thoughtsTokenCount": 119,
+                },
+                "modelVersion": "gemini-4-argon",
+            },
+        ),
+        "expected": ExactExpected(
+            spend=0.0015888, input_cost=0.0000888, output_cost=0.0015, prompt_tokens=37, completion_tokens=125
+        ),
+    }
+)
+GEMINI_4_ARGON_TOOL_CALL: Final = GEMINI_3_8_FLASH_TOOL_CALL.model_copy(
+    update={
+        "name": "vertex_ai/gemini-4-argon-tool_call",
+        "model": "vertex_ai/gemini-4-argon",
+        "response": JsonResponse(
+            content_type="application/json",
+            body={
+                "candidates": [
+                    {
+                        "content": {
+                            "parts": [{"functionCall": {"name": "report_weather", "args": {"city": "Paris"}}}],
+                            "role": "model",
+                        },
+                        "finishReason": "STOP",
+                        "index": 0,
+                    }
+                ],
+                "usageMetadata": {
+                    "promptTokenCount": 90,
+                    "candidatesTokenCount": 22,
+                    "totalTokenCount": 112,
+                    "trafficType": "ON_DEMAND",
+                    "promptTokensDetails": [{"modality": "TEXT", "tokenCount": 90}],
+                    "candidatesTokensDetails": [{"modality": "TEXT", "tokenCount": 22}],
+                },
+                "modelVersion": "gemini-4-argon",
+            },
+        ),
+        "expected": ExactExpected(
+            spend=0.00048, input_cost=0.000216, output_cost=0.000264, prompt_tokens=90, completion_tokens=22
+        ),
+    }
+)
 
 CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     GEMINI_3_1_PRO_INPUT_TEXT,
@@ -3403,14 +3327,10 @@ CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     GEMINI_3_1_PRO_STREAM_FULL_USAGE,
     GEMINI_3_8_FLASH_INPUT_TEXT,
     GEMINI_3_8_FLASH_CACHE_READ,
-    GEMINI_3_8_FLASH_AUDIO_INPUT,
-    GEMINI_3_8_FLASH_AUDIO_OUTPUT,
-    GEMINI_3_8_FLASH_VIDEO_INPUT,
     GEMINI_3_8_FLASH_SERVICE_TIER_FLEX,
     GEMINI_3_8_FLASH_SERVICE_TIER_PRIORITY,
     GEMINI_3_8_FLASH_WEB_SEARCH_PER_PROMPT,
     GEMINI_3_8_FLASH_GOOGLE_MAPS_GROUNDING,
-    GEMINI_3_8_FLASH_FALLBACK_REASONING_AT_OUTPUT_RATE,
     GEMINI_3_8_FLASH_FALLBACK_IMAGE_TOKENS_AT_INPUT_RATE,
     GEMINI_3_8_FLASH_STREAM,
     GEMINI_3_8_FLASH_STREAM_NO_USAGE,
@@ -3452,6 +3372,11 @@ CASES: Final[tuple[CostTrackingTestCase, ...]] = (
     GEMINI_3_1_PRO_PREVIEW_CACHE_READ,
     GEMINI_3_1_PRO_PREVIEW_REASONING,
     GEMINI_3_1_PRO_PREVIEW_TOOL_CALL,
+    GEMINI_4_ARGON_INPUT_TEXT,
+    GEMINI_4_ARGON_STREAM,
+    GEMINI_4_ARGON_CACHE_READ,
+    GEMINI_4_ARGON_REASONING,
+    GEMINI_4_ARGON_TOOL_CALL,
 )
 
 PARITY: Final[tuple[StreamParityTestCase, ...]] = (
@@ -3473,6 +3398,7 @@ PARITY: Final[tuple[StreamParityTestCase, ...]] = (
     StreamParityTestCase(plain=VERTEX_AI_CLAUDE_OPUS_5_5_INPUT_TEXT, streamed=VERTEX_AI_CLAUDE_OPUS_5_5_STREAM),
     StreamParityTestCase(plain=VERTEX_AI_CLAUDE_FABLE_5_1_INPUT_TEXT, streamed=VERTEX_AI_CLAUDE_FABLE_5_1_STREAM),
     StreamParityTestCase(plain=GEMINI_3_1_PRO_PREVIEW_INPUT_TEXT, streamed=GEMINI_3_1_PRO_PREVIEW_STREAM),
+    StreamParityTestCase(plain=GEMINI_4_ARGON_INPUT_TEXT, streamed=GEMINI_4_ARGON_STREAM),
 )
 
 BRIDGE_COST_PARITY: Final[tuple[BridgeCostParityTestCase, ...]] = (
@@ -3481,4 +3407,5 @@ BRIDGE_COST_PARITY: Final[tuple[BridgeCostParityTestCase, ...]] = (
         ("/v1/responses", "/v1/messages"),
     ),
     *bridge_pairs((GEMINI_3_1_PRO_PREVIEW_INPUT_TEXT,), ("/v1/responses",)),
+    *bridge_pairs((GEMINI_4_ARGON_INPUT_TEXT,), ("/v1/responses",)),
 )
diff --git a/tests/integration/cost_calculation/catalog.py b/tests/integration/cost_calculation/catalog.py
index 66eb7497bd7..568a89ad967 100644
--- a/tests/integration/cost_calculation/catalog.py
+++ b/tests/integration/cost_calculation/catalog.py
@@ -60,6 +60,7 @@ REALTIME_CASES: Final[tuple[RealtimeCostCase, ...]] = batch_realtime.REALTIME_CA
 BRIDGE_COST_PARITY_CASES: Final[tuple[BridgeCostParityTestCase, ...]] = (
     *openai.BRIDGE_COST_PARITY,
     *bedrock_converse.BRIDGE_COST_PARITY,
+    *bedrock_mantle.BRIDGE_COST_PARITY,
     *azure.BRIDGE_COST_PARITY,
     *anthropic.BRIDGE_COST_PARITY,
     *gemini.BRIDGE_COST_PARITY,
diff --git a/tests/integration/cost_calculation/cost_map.py b/tests/integration/cost_calculation/cost_map.py
index 40072bfcaf6..2ef42249a7e 100644
--- a/tests/integration/cost_calculation/cost_map.py
+++ b/tests/integration/cost_calculation/cost_map.py
@@ -492,18 +492,14 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "cache_read_input_token_cost_flex": 2.5e-08,
         "cache_read_input_token_cost_priority": 9e-08,
         "google_maps_grounding_cost_per_query": 0.025,
-        "input_cost_per_audio_token": 1e-06,
-        "input_cost_per_image_token": 5.5e-07,
         "input_cost_per_token": 5e-07,
         "input_cost_per_token_flex": 2.5e-07,
         "input_cost_per_token_priority": 6.25e-07,
-        "input_cost_per_video_token": 6e-07,
         "litellm_provider": "gemini",
         "max_input_tokens": 1048576,
         "max_output_tokens": 65536,
         "max_tokens": 65536,
         "mode": "chat",
-        "output_cost_per_audio_token": 6e-06,
         "output_cost_per_reasoning_token": 3.5e-06,
         "output_cost_per_token": 3e-06,
         "output_cost_per_token_flex": 1.5e-06,
@@ -536,7 +532,7 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "supports_function_calling": True,
         "web_search_billing_unit": "per_query",
     },
-    "gemini-3.1-pro-preview": {
+    "vertex_ai/gemini-3.1-pro-preview": {
         "cache_creation_input_token_cost_above_200k_tokens": 2.75e-07,
         "cache_read_input_token_cost": 2.2e-07,
         "cache_read_input_token_cost_above_200k_tokens": 4.4e-07,
@@ -547,7 +543,7 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "input_cost_per_token_above_200k_tokens_priority": 7.92e-06,
         "input_cost_per_token_flex": 1.1e-06,
         "input_cost_per_token_priority": 3.96e-06,
-        "litellm_provider": "vertex_ai-language-models",
+        "litellm_provider": "vertex_ai",
         "max_input_tokens": 1048576,
         "max_output_tokens": 65536,
         "max_tokens": 65536,
@@ -558,32 +554,70 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "output_cost_per_token_above_200k_tokens_priority": 3.564e-05,
         "output_cost_per_token_flex": 6.6e-06,
         "output_cost_per_token_priority": 2.376e-05,
+        "google_maps_grounding_cost_per_query": 0.0154,
+        "search_context_cost_per_query": {
+            "search_context_size_high": 0.0154,
+            "search_context_size_low": 0.0154,
+            "search_context_size_medium": 0.0154,
+        },
         "supports_function_calling": True,
         "supports_prompt_caching": True,
         "supports_reasoning": True,
     },
-    "gemini-3.8-flash": {
+    "vertex_ai/gemini-3.8-flash": {
         "cache_read_input_token_cost": 5.2e-08,
         "cache_read_input_token_cost_flex": 2.6e-08,
         "cache_read_input_token_cost_priority": 9.36e-08,
         "google_maps_grounding_cost_per_query": 0.025,
-        "input_cost_per_audio_token": 1.04e-06,
         "input_cost_per_token": 5.2e-07,
         "input_cost_per_token_flex": 2.6e-07,
         "input_cost_per_token_priority": 6.5e-07,
-        "input_cost_per_video_token": 6.2e-07,
-        "litellm_provider": "vertex_ai-language-models",
+        "litellm_provider": "vertex_ai",
         "max_input_tokens": 1048576,
         "max_output_tokens": 65536,
         "max_tokens": 65536,
         "mode": "chat",
-        "output_cost_per_audio_token": 6.24e-06,
         "output_cost_per_token": 3.12e-06,
+        "output_cost_per_reasoning_token": 2.6e-06,
         "output_cost_per_token_flex": 1.56e-06,
         "output_cost_per_token_priority": 3.9e-06,
-        "search_context_cost_per_query": {"search_context_size_medium": 0.035},
+        "search_context_cost_per_query": {
+            "search_context_size_high": 0.035,
+            "search_context_size_low": 0.035,
+            "search_context_size_medium": 0.035,
+        },
         "supports_function_calling": True,
-        "web_search_billing_unit": "per_prompt",
+        "supports_prompt_caching": True,
+        "supports_reasoning": True,
+        "web_search_billing_unit": "per_query",
+    },
+    "vertex_ai/gemini-4-argon": {
+        "cache_read_input_token_cost": 1.2e-07,
+        "cache_read_input_token_cost_flex": 6e-08,
+        "cache_read_input_token_cost_priority": 2.16e-07,
+        "google_maps_grounding_cost_per_query": 0.0168,
+        "input_cost_per_audio_token": 2.4e-06,
+        "input_cost_per_token": 2.4e-06,
+        "input_cost_per_token_flex": 1.2e-06,
+        "input_cost_per_token_priority": 4.32e-06,
+        "litellm_provider": "vertex_ai",
+        "max_input_tokens": 1048576,
+        "max_output_tokens": 1048576,
+        "max_tokens": 1048576,
+        "mode": "chat",
+        "output_cost_per_reasoning_token": 1.2e-05,
+        "output_cost_per_token": 1.2e-05,
+        "output_cost_per_token_flex": 6e-06,
+        "output_cost_per_token_priority": 2.16e-05,
+        "search_context_cost_per_query": {
+            "search_context_size_high": 0.0168,
+            "search_context_size_low": 0.0168,
+            "search_context_size_medium": 0.0168,
+        },
+        "supports_function_calling": True,
+        "supports_prompt_caching": True,
+        "supports_reasoning": True,
+        "web_search_billing_unit": "per_query",
     },
     "together_ai/moonshotai/Kimi-K3": {
         "input_cost_per_token": 1.15e-06,
@@ -730,6 +764,12 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "input_cost_per_token": 7.5e-07,
         "output_cost_per_token": 4.5e-06,
     },
+    "azure_ai/grok-4.6": {
+        "litellm_provider": "azure_ai",
+        "mode": "chat",
+        "input_cost_per_token": 2e-06,
+        "output_cost_per_token": 1e-05,
+    },
     "azure_ai/claude-haiku-4-5": {
         "litellm_provider": "azure_ai",
         "mode": "chat",
@@ -1077,6 +1117,126 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "supports_reasoning": True,
         "supports_prompt_caching": True,
         "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "use_openai_responses_path": True,
+    },
+    "bedrock_mantle/openai.gpt-6.1-sol": {
+        "litellm_provider": "bedrock_mantle",
+        "mode": "responses",
+        "input_cost_per_token": 2.42e-06,
+        "output_cost_per_token": 1.21e-05,
+        "cache_read_input_token_cost": 1.21e-07,
+        "cache_creation_input_token_cost": 3.025e-06,
+        "input_cost_per_token_above_272k_tokens": 4.84e-06,
+        "output_cost_per_token_above_272k_tokens": 1.815e-05,
+        "cache_read_input_token_cost_above_272k_tokens": 2.42e-07,
+        "cache_creation_input_token_cost_above_272k_tokens": 6.05e-06,
+        "input_cost_per_token_ultrafast": 1.452e-05,
+        "output_cost_per_token_ultrafast": 7.26e-05,
+        "cache_read_input_token_cost_ultrafast": 7.26e-07,
+        "cache_creation_input_token_cost_ultrafast": 1.815e-05,
+        "input_cost_per_token_above_272k_tokens_ultrafast": 2.904e-05,
+        "output_cost_per_token_above_272k_tokens_ultrafast": 1.089e-04,
+        "cache_read_input_token_cost_above_272k_tokens_ultrafast": 1.452e-06,
+        "cache_creation_input_token_cost_above_272k_tokens_ultrafast": 3.63e-05,
+        "max_tokens": 131072,
+        "max_input_tokens": 1000000,
+        "max_output_tokens": 131072,
+        "supports_function_calling": True,
+        "supports_none_reasoning_effort": False,
+        "supports_reasoning": True,
+        "supports_prompt_caching": True,
+        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "use_openai_responses_path": True,
+    },
+    "bedrock_mantle/openai.gpt-6-luna": {
+        "litellm_provider": "bedrock_mantle",
+        "mode": "responses",
+        "input_cost_per_token": 1.32e-07,
+        "output_cost_per_token": 6.6e-07,
+        "cache_read_input_token_cost": 1.32e-08,
+        "cache_creation_input_token_cost": 1.65e-07,
+        "input_cost_per_token_above_272k_tokens": 2.64e-07,
+        "output_cost_per_token_above_272k_tokens": 9.9e-07,
+        "cache_read_input_token_cost_above_272k_tokens": 2.64e-08,
+        "cache_creation_input_token_cost_above_272k_tokens": 3.3e-07,
+        "max_tokens": 128000,
+        "max_input_tokens": 1050000,
+        "max_output_tokens": 128000,
+        "supports_function_calling": True,
+        "supports_none_reasoning_effort": False,
+        "supports_reasoning": True,
+        "supports_prompt_caching": True,
+        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "use_openai_responses_path": True,
+    },
+    "bedrock_mantle/openai.gpt-6-astra": {
+        "litellm_provider": "bedrock_mantle",
+        "mode": "responses",
+        "input_cost_per_token": 1.43e-05,
+        "output_cost_per_token": 7.15e-05,
+        "cache_read_input_token_cost": 1.43e-06,
+        "cache_creation_input_token_cost": 1.7875e-05,
+        "input_cost_per_token_above_272k_tokens": 2.86e-05,
+        "output_cost_per_token_above_272k_tokens": 1.0725e-04,
+        "cache_read_input_token_cost_above_272k_tokens": 2.86e-06,
+        "cache_creation_input_token_cost_above_272k_tokens": 3.575e-05,
+        "input_cost_per_token_ultrafast": 8.58e-05,
+        "output_cost_per_token_ultrafast": 4.29e-04,
+        "cache_read_input_token_cost_ultrafast": 8.58e-06,
+        "cache_creation_input_token_cost_ultrafast": 1.0725e-04,
+        "input_cost_per_token_above_272k_tokens_ultrafast": 1.716e-04,
+        "output_cost_per_token_above_272k_tokens_ultrafast": 6.435e-04,
+        "cache_read_input_token_cost_above_272k_tokens_ultrafast": 1.716e-05,
+        "cache_creation_input_token_cost_above_272k_tokens_ultrafast": 2.145e-04,
+        "max_tokens": 128000,
+        "max_input_tokens": 1050000,
+        "max_output_tokens": 128000,
+        "supports_function_calling": True,
+        "supports_none_reasoning_effort": False,
+        "supports_reasoning": True,
+        "supports_prompt_caching": True,
+        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "use_openai_responses_path": True,
+    },
+    "bedrock_mantle/openai.gpt-5.6-terra": {
+        "litellm_provider": "bedrock_mantle",
+        "mode": "responses",
+        "input_cost_per_token": 3.08e-06,
+        "output_cost_per_token": 1.848e-05,
+        "cache_read_input_token_cost": 3.08e-07,
+        "cache_creation_input_token_cost": 3.85e-06,
+        "input_cost_per_token_above_272k_tokens": 6.16e-06,
+        "output_cost_per_token_above_272k_tokens": 2.772e-05,
+        "cache_read_input_token_cost_above_272k_tokens": 6.16e-07,
+        "cache_creation_input_token_cost_above_272k_tokens": 7.7e-06,
+        "max_tokens": 128000,
+        "max_input_tokens": 1050000,
+        "max_output_tokens": 128000,
+        "supports_function_calling": True,
+        "supports_reasoning": True,
+        "supports_prompt_caching": True,
+        "supported_endpoints": ["/v1/chat/completions", "/v1/responses"],
+        "use_openai_responses_path": True,
+        "search_context_cost_per_query": {
+            "search_context_size_high": 0.0168,
+            "search_context_size_low": 0.0168,
+            "search_context_size_medium": 0.0168,
+        },
+    },
+    "bedrock_mantle/anthropic.claude-opus-5-5": {
+        "litellm_provider": "bedrock_mantle",
+        "mode": "chat",
+        "input_cost_per_token": 6.6e-06,
+        "output_cost_per_token": 3.3e-05,
+        "cache_read_input_token_cost": 3.3e-07,
+        "cache_creation_input_token_cost": 8.25e-06,
+        "cache_creation_input_token_cost_above_1hr": 1.32e-05,
+        "max_tokens": 128000,
+        "max_input_tokens": 1000000,
+        "max_output_tokens": 128000,
+        "supports_function_calling": True,
+        "supports_reasoning": True,
+        "supports_prompt_caching": True,
     },
     "us.anthropic.claude-opus-5-5": {
         "cache_creation_input_token_cost_above_1hr": 8.8e-06,
@@ -1409,24 +1569,16 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "cache_creation_input_token_cost": 1.625e-07,
         "cache_creation_input_token_cost_above_272k_tokens": 3.25e-07,
         "input_cost_per_token": 1.3e-07,
-        "input_cost_per_token_flex": 6.5e-08,
-        "input_cost_per_token_priority": 2.6e-07,
         "litellm_provider": "azure",
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 6.5e-07,
-        "output_cost_per_token_flex": 3.25e-07,
-        "output_cost_per_token_priority": 1.3e-06,
         "supports_function_calling": True,
         "supports_none_reasoning_effort": True,
         "input_cost_per_token_above_272k_tokens": 2.6e-07,
-        "input_cost_per_token_above_272k_tokens_flex": 1.3e-07,
-        "input_cost_per_token_above_272k_tokens_priority": 5.2e-07,
         "output_cost_per_token_above_272k_tokens": 1.3e-06,
-        "output_cost_per_token_above_272k_tokens_flex": 6.5e-07,
-        "output_cost_per_token_above_272k_tokens_priority": 2.6e-06,
         "cache_read_input_token_cost_above_272k_tokens": 2.6e-08,
     },
     "azure/gpt-6-astra": {
@@ -1434,24 +1586,16 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "cache_creation_input_token_cost": 1.5625e-05,
         "cache_creation_input_token_cost_above_272k_tokens": 3.125e-05,
         "input_cost_per_token": 1.25e-05,
-        "input_cost_per_token_flex": 6.25e-06,
-        "input_cost_per_token_priority": 2.5e-05,
         "litellm_provider": "azure",
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 6.25e-05,
-        "output_cost_per_token_flex": 3.125e-05,
-        "output_cost_per_token_priority": 0.000125,
         "supports_function_calling": True,
         "supports_none_reasoning_effort": True,
         "input_cost_per_token_above_272k_tokens": 2.5e-05,
-        "input_cost_per_token_above_272k_tokens_flex": 1.25e-05,
-        "input_cost_per_token_above_272k_tokens_priority": 5e-05,
         "output_cost_per_token_above_272k_tokens": 0.000125,
-        "output_cost_per_token_above_272k_tokens_flex": 6.25e-05,
-        "output_cost_per_token_above_272k_tokens_priority": 0.00025,
         "cache_read_input_token_cost_above_272k_tokens": 2.5e-06,
     },
     "azure/gpt-6.1-sol": {
@@ -1459,24 +1603,16 @@ COST_MAP_ENTRIES: Final[dict[str, dict[str, JsonValue]]] = {
         "cache_creation_input_token_cost": 3e-06,
         "cache_creation_input_token_cost_above_272k_tokens": 6e-06,
         "input_cost_per_token": 2.4e-06,
-        "input_cost_per_token_flex": 1.2e-06,
-        "input_cost_per_token_priority": 4.8e-06,
         "litellm_provider": "azure",
         "max_input_tokens": 922000,
         "max_output_tokens": 128000,
         "max_tokens": 128000,
         "mode": "chat",
         "output_cost_per_token": 1.2e-05,
-        "output_cost_per_token_flex": 6e-06,
-        "output_cost_per_token_priority": 2.4e-05,
         "supports_function_calling": True,
         "supports_none_reasoning_effort": True,
         "input_cost_per_token_above_272k_tokens": 4.8e-06,
-        "input_cost_per_token_above_272k_tokens_flex": 2.4e-06,
-        "input_cost_per_token_above_272k_tokens_priority": 9.6e-06,
         "output_cost_per_token_above_272k_tokens": 2.4e-05,
-        "output_cost_per_token_above_272k_tokens_flex": 1.2e-05,
-        "output_cost_per_token_above_272k_tokens_priority": 4.8e-05,
         "cache_read_input_token_cost_above_272k_tokens": 4.8e-07,
     },
 }
diff --git a/tests/integration/cost_calculation/cost_tracking_case.py b/tests/integration/cost_calculation/cost_tracking_case.py
index 208d95e6a14..3efa97407f7 100644
--- a/tests/integration/cost_calculation/cost_tracking_case.py
+++ b/tests/integration/cost_calculation/cost_tracking_case.py
@@ -48,6 +48,7 @@ class CostMapEntry(BaseModel):
     supports_reasoning: bool | None = None
     supports_prompt_caching: bool | None = None
     supported_endpoints: tuple[str, ...] | None = None
+    use_openai_responses_path: bool | None = None
     supports_bedrock_runtime_chat_completions_tools_with_reasoning: bool | None = None
     supports_bedrock_runtime_chat_completions_response_format: bool | None = None
     cache_creation_input_token_cost_above_100k_tokens: float | None = None
@@ -572,6 +573,7 @@ _PROVIDER_PREFIXES: Final[Mapping[str, str]] = MappingProxyType(
         "deepgram": "deepgram",
         "text-completion-openai": "text-completion-openai",
         "cohere": "cohere",
+        "vertex_ai": "vertex_ai",
         "vertex_ai-language-models": "vertex_ai",
         "vertex_ai-image-models": "vertex_ai",
         "vertex_ai-anthropic_models": "vertex_ai",
@@ -621,6 +623,9 @@ _LITELLM_PARAMS: Final[Mapping[str, Mapping[str, str]]] = MappingProxyType(
         "deepgram": MappingProxyType({}),
         "text-completion-openai": MappingProxyType({}),
         "cohere": MappingProxyType({}),
+        "vertex_ai": MappingProxyType(
+            {"vertex_project": "cc-scripted-project", "vertex_location": "us-central1"}
+        ),
         "vertex_ai-language-models": MappingProxyType(
             {"vertex_project": "cc-scripted-project", "vertex_location": "us-central1"}
         ),
diff --git a/tests/integration/database/test_harness_lifecycle.py b/tests/integration/database/test_harness_lifecycle.py
index c8de39c0d38..60bd7ae72a3 100644
--- a/tests/integration/database/test_harness_lifecycle.py
+++ b/tests/integration/database/test_harness_lifecycle.py
@@ -106,6 +106,82 @@ def test_runner_environment_drops_inherited_provider_api_keys() -> None:
     assert inherited["OPENAI_API_KEY"] == "ambient-openai"
 
 
+@pytest.mark.parametrize("fails", (False, True), ids=("passing-test", "failing-test"))
+def test_sdk_teardown_delivers_logging_before_restoring_callbacks(tmp_path: Path, fails: bool) -> None:
+    root: Final = Path(__file__).resolve().parents[3]
+    events: Final = tmp_path / "callbacks.json"
+    probe: Final = tmp_path / "test_callback_teardown.py"
+    probe.write_text(
+        "import asyncio, json, litellm, pytest\n"
+        "from pathlib import Path\n"
+        "from litellm.integrations.custom_logger import CustomLogger\n"
+        f"EVENTS = Path({str(events)!r})\n"
+        "ORIGINAL = tuple(litellm.callbacks)\n"
+        "@pytest.fixture\n"
+        "def release():\n"
+        "    gate = asyncio.Event()\n"
+        "    yield gate\n"
+        "    gate.set()\n"
+        "async def test_request(release):\n"
+        "    started = asyncio.Event()\n"
+        "    request_loop = asyncio.get_running_loop()\n"
+        "    class Recorder(CustomLogger):\n"
+        "        async def async_log_success_event(self, kwargs, response_obj, start_time, end_time):\n"
+        "            started.set()\n"
+        "            await release.wait()\n"
+        "            EVENTS.write_text(json.dumps({\n"
+        "                'registered': self in litellm.callbacks,\n"
+        "                'same_loop': asyncio.get_running_loop() is request_loop,\n"
+        "                'call_id': kwargs['litellm_call_id'],\n"
+        "            }))\n"
+        "    litellm.callbacks.append(Recorder())\n"
+        "    response = await litellm.acompletion(model='gpt-4o-mini',\n"
+        "        messages=[{'role': 'user', 'content': 'teardown'}],\n"
+        "        mock_response='done', litellm_call_id='teardown-request')\n"
+        "    await asyncio.wait_for(started.wait(), timeout=5)\n"
+        "    assert response.choices[0].message.content == 'done'\n"
+        "    assert not EVENTS.exists()\n"
+        f"    assert not {fails}, 'intentional test failure'\n"
+        "def test_next():\n"
+        "    assert EVENTS.exists(), 'logging did not finish before the next test'\n"
+        "    assert json.loads(EVENTS.read_text()) == {\n"
+        "        'registered': True, 'same_loop': True, 'call_id': 'teardown-request'}\n"
+        "    assert tuple(litellm.callbacks) == ORIGINAL\n"
+    )
+    result: Final = subprocess.run(
+        (
+            sys.executable,
+            "-P",
+            "-m",
+            "pytest",
+            str(probe),
+            "--noconftest",
+            "-p",
+            "tests.integration.sdk.conftest",
+            "-o",
+            "addopts=",
+            "-o",
+            "asyncio_mode=auto",
+            "-o",
+            "asyncio_default_fixture_loop_scope=session",
+            f"--junitxml={tmp_path / 'junit.xml'}",
+            "-q",
+        ),
+        cwd=root,
+        env=_nested_pytest_environment(os.environ),
+        capture_output=True,
+        text=True,
+        timeout=60,
+        check=False,
+    )
+    assert result.returncode == (1 if fails else 0), result.stdout + result.stderr
+    cases: Final = ElementTree.parse(tmp_path / "junit.xml").findall(".//testcase")
+    assert tuple(case.attrib["name"] for case in cases) == ("test_request", "test_next")
+    assert all(case.find("error") is None for case in cases), result.stdout + result.stderr
+    assert (cases[0].find("failure") is not None) == fails, result.stdout + result.stderr
+    assert cases[1].find("failure") is None, result.stdout + result.stderr
+
+
 def test_owned_readiness_rejects_a_healthy_listener_from_another_process(
     monkeypatch: pytest.MonkeyPatch, tmp_path: Path
 ) -> None:
diff --git a/tests/integration/management/test_model_health_check.py b/tests/integration/management/test_model_health_check.py
index 2b9ec658d87..9945d16af07 100644
--- a/tests/integration/management/test_model_health_check.py
+++ b/tests/integration/management/test_model_health_check.py
@@ -1352,3 +1352,40 @@ def test_evaluation_mode_health_check_of_databricks_ai_decide_resolves_the_mode_
                 },
             )
         ]
+
+
+def _openai_gpt_transcribe_health_reply(request: Request) -> Reply:
+    if _multipart_text_fields(_multipart_parts(request)).get("response_format") == "verbose_json":
+        return Reply(
+            status=400,
+            body=json.dumps(
+                {
+                    "error": {
+                        "message": "response_format 'verbose_json' is not compatible with model 'gpt-transcribe'",
+                        "type": "invalid_request_error",
+                        "param": "response_format",
+                        "code": "unsupported_value",
+                    }
+                }
+            ).encode(),
+        )
+    return Reply(body=json.dumps({"text": "healthy", "usage": {"type": "duration", "seconds": 1}}).encode())
+
+
+def test_health_check_of_gpt_transcribe_probes_without_verbose_json_and_reports_it_healthy(gateway: Gateway) -> None:
+    with wire_server(_openai_gpt_transcribe_health_reply) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model="openai/gpt-transcribe",
+            api_base=f"{wire.url}/v1",
+            api_key="synthetic-openai-key",
+            model_info={"mode": "audio_transcription"},
+        )
+        report: Final = _health_report(gateway, model)
+        requests: Final = wire.drain()
+
+    assert (report["healthy_count"], report["unhealthy_count"]) == (1, 0), report
+    assert requests, report
+    assert {
+        (request.method, request.target, tuple(sorted(_multipart_text_fields(_multipart_parts(request)).items())))
+        for request in requests
+    } == {("POST", "/v1/audio/transcriptions", (("model", "gpt-transcribe"),))}
diff --git a/tests/integration/management/test_team_delete_large_membership.py b/tests/integration/management/test_team_delete_large_membership.py
index 90d204722ac..3e4bb568394 100644
--- a/tests/integration/management/test_team_delete_large_membership.py
+++ b/tests/integration/management/test_team_delete_large_membership.py
@@ -53,6 +53,13 @@ SELECT encode(sha256(convert_to(%s || '-' || n::text, 'UTF8')), 'hex'), %s, '{}'
 FROM generate_series(1, %s::int) AS n
 """
 TAKE_TEAM_LOCK_SQL: Final = "SELECT pg_advisory_xact_lock(hashtext(%s))"
+LOCK_MODEL_ROW_SQL: Final = 'SELECT model_id FROM "LiteLLM_ProxyModelTable" WHERE model_id = %s FOR UPDATE'
+LOCK_HELD_PAST_DEFAULT_TRANSACTION_SECONDS: Final = 7
+OLDEST_TRANSACTION_BLOCKED_BY_SQL: Final = """
+SELECT coalesce(max(extract(epoch FROM clock_timestamp() - xact_start)), 0)::float AS age
+FROM pg_stat_activity
+WHERE %s::int = ANY(pg_blocking_pids(pid))
+"""
 # Sessions blocked on the advisory lock the given backend holds, and nothing else on the shared rig.
 WAITERS_ON_HELD_LOCK_SQL: Final = """
 SELECT count(*)::int AS waiting
@@ -131,6 +138,13 @@ def _waiters_on_lock_held_by(backend_pid: int) -> int:
     return waiting
 
 
+def _oldest_transaction_blocked_by(backend_pid: int) -> float:
+    rows: Final = read_rows(OLDEST_TRANSACTION_BLOCKED_BY_SQL, (str(backend_pid),))
+    age: Final = rows[0]["age"]
+    assert isinstance(age, float)
+    return age
+
+
 def _remove_team_by_sql(team_id: str) -> None:
     """Cleanup for a team the test expects to have deleted itself. Whatever a failed delete left behind
     (row, memberships, `teams` references) goes by SQL so the shared rig stays clean without sending
@@ -161,6 +175,38 @@ def _create_team(scenario: Scenario, **fields: JsonValue) -> str:
     return team_id
 
 
+def _create_team_model(scenario: Scenario, team_id: str) -> str:
+    created: Final = scenario.gateway.post(
+        "/model/new",
+        {
+            "model_name": f"integration-{uuid.uuid4().hex}",
+            "litellm_params": {"model": "openai/gpt-4o-mini", "api_key": "sk-integration"},
+            "model_info": {"team_id": team_id},
+        },
+    )
+    model_id: Final = string_value(object_value(created["model_info"])["id"])
+    scenario.cleanups.callback(write_rows, 'DELETE FROM "LiteLLM_ProxyModelTable" WHERE model_id = %s', (model_id,))
+    return model_id
+
+
+def _team_model_rows(model_id: str) -> list[dict[str, JsonValue]]:
+    return read_rows('SELECT model_id FROM "LiteLLM_ProxyModelTable" WHERE model_id = %s', (model_id,))
+
+
+def _delete_while_locked(gateway: Gateway, team_id: str, lock_sql: str, lock_target: str) -> httpx.Response:
+    with ThreadPoolExecutor(max_workers=1) as pool:
+        with psycopg.connect(os.environ["DATABASE_URL"]) as holder:
+            holder.execute(lock_sql, (lock_target,))
+            pending: Final = _post_in_background(pool, gateway, "/team/delete", {"team_ids": [team_id]})
+            eventually(
+                lambda: _oldest_transaction_blocked_by(holder.info.backend_pid),
+                lambda age: age > LOCK_HELD_PAST_DEFAULT_TRANSACTION_SECONDS,
+                seconds=30,
+            )
+            assert not pending.done(), "delete returned while the lock was still held"
+        return pending.result(timeout=60)
+
+
 def _generate_key(scenario: Scenario, **fields: JsonValue) -> str:
     """A key the team delete is expected to remove; cleanup only deletes it if it is still live."""
     key: Final = string_value(scenario.gateway.post("/key/generate", fields)["key"])
@@ -392,6 +438,36 @@ def test_delete_waits_for_the_team_advisory_lock_and_completes_after_release(
         assert len(_tombstones(team)) == 1, _tombstones(team)
 
 
+def test_delete_completes_after_waiting_on_a_locked_team_model_row_past_the_default_transaction_timeout(
+    gateway: Gateway,
+) -> None:
+    with gateway.scenario() as scenario:
+        team: Final = _create_team(scenario)
+        model_id: Final = _create_team_model(scenario, team)
+        response: Final = _delete_while_locked(gateway, team, LOCK_MODEL_ROW_SQL, model_id)
+        assert response.status_code == 200, response.text
+        assert response.json() == {"deleted_teams": [team]}
+        assert _team_rows(team) == []
+        assert _team_model_rows(model_id) == []
+        assert len(_tombstones(team)) == 1, _tombstones(team)
+
+
+def test_delete_completes_after_waiting_on_the_team_lock_past_the_default_transaction_timeout(
+    gateway: Gateway,
+) -> None:
+    with gateway.scenario() as scenario:
+        user: Final = scenario.user()
+        team: Final = _create_team(scenario)
+        _bulk_member_add(gateway, team, [user])
+        response: Final = _delete_while_locked(gateway, team, TAKE_TEAM_LOCK_SQL, team)
+        assert response.status_code == 200, response.text
+        assert response.json() == {"deleted_teams": [team]}
+        assert _team_rows(team) == []
+        assert _membership_user_ids(team) == []
+        assert _user_teams(user) == []
+        assert len(_tombstones(team)) == 1, _tombstones(team)
+
+
 def test_deleting_two_teams_sharing_a_member_in_one_call_clears_both_from_the_member(gateway: Gateway) -> None:
     with gateway.scenario() as scenario:
         user: Final = scenario.user()
diff --git a/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_messages_pre_content_retry_wire.py b/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_messages_pre_content_retry_wire.py
index cb7f4c2b9ce..e0b2e4a336f 100644
--- a/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_messages_pre_content_retry_wire.py
+++ b/tests/integration/messages_endpoint/providers/anthropic/test_anthropic_messages_pre_content_retry_wire.py
@@ -40,6 +40,7 @@ FirstAttempt = Literal[
     "drop_after_message_start",
     "error_frame",
     "error_frame_after_message_start",
+    "error_frame_after_content",
     "http_status",
     "drop_after_content",
 ]
@@ -66,6 +67,8 @@ class _Failure:
                 return status_reply(self.status)
             case "drop_after_content":
                 return dropping_reply(chunks, abort_after=3)
+            case "error_frame_after_content":
+                return stream_reply((*chunks[:3], error_frame(self.status, f"scripted {self.status}")))
 
 
 _MID_STREAM_FAILURES: Final = (
@@ -124,12 +127,12 @@ def _stream(gateway: Gateway, body: Mapping[str, JsonValue]) -> tuple[int, tuple
     return response.status_code, parse_sse(response.text)
 
 
+def _rows(request_id: str) -> list[dict[str, JsonValue]]:
+    return read_rows('SELECT status, model_group FROM "LiteLLM_SpendLogs" WHERE request_id=%s', (request_id,))
+
+
 def _success_rows(request_id: str) -> list[dict[str, JsonValue]]:
-    return eventually(
-        lambda: read_rows('SELECT status, model_group FROM "LiteLLM_SpendLogs" WHERE request_id=%s', (request_id,)),
-        lambda rows: len(rows) >= 1,
-        seconds=70,
-    )
+    return eventually(lambda: _rows(request_id), lambda rows: len(rows) >= 1, seconds=70)
 
 
 def _assert_completed_by_retry(
@@ -141,6 +144,8 @@ def _assert_completed_by_retry(
     assert delta_text(events) == _TEXT, events
     assert [request.target for request in wire.drain()] == ["/v1/messages"] * attempts
     assert _success_rows(_served_id(prompt, attempts)) == [{"status": "success", "model_group": model}]
+    superseded_rows: Final = {attempt: _rows(_served_id(prompt, attempt)) for attempt in range(1, attempts)}
+    assert not any(superseded_rows.values()), superseded_rows
 
 
 def _assert_rejected_before_content(
@@ -302,6 +307,23 @@ def test_stream_dropping_after_content_is_not_retried(gateway: Gateway) -> None:
         assert [request.target for request in wire.drain()] == ["/v1/messages"]
 
 
+def test_stream_error_frame_after_content_is_not_retried_and_keeps_its_spend_row(gateway: Gateway) -> None:
+    prompt: Final = _prompt()
+    attempts: Final = Attempts()
+    with (
+        wire_server(_upstream(prompt, _Failure("error_frame_after_content", 529), attempts)) as wire,
+        gateway.scenario() as scenario,
+    ):
+        model: Final = scenario.model(model=f"anthropic/{_MODEL}", api_base=wire.url, api_key=_API_KEY, num_retries=1)
+        status, events = _stream(gateway, _body(model, prompt, "deployment"))
+        assert status == 200, events
+        assert event_types(events) == (*LIFECYCLE[:3], "error"), events
+        assert message_id(events) == _served_id(prompt, 1), events
+        assert delta_text(events) == _TEXT, events
+        assert [request.target for request in wire.drain()] == ["/v1/messages"]
+        assert [row["model_group"] for row in _success_rows(_served_id(prompt, 1))] == [model]
+
+
 def test_stream_rejected_with_401_before_it_opens_is_not_retried(gateway: Gateway) -> None:
     prompt: Final = _prompt()
     attempts: Final = Attempts()
diff --git a/tests/integration/messages_endpoint/test_anthropic_messages_caller_tools_wire.py b/tests/integration/messages_endpoint/test_anthropic_messages_caller_tools_wire.py
index 2e8a9d0d7e4..15c0593f80d 100644
--- a/tests/integration/messages_endpoint/test_anthropic_messages_caller_tools_wire.py
+++ b/tests/integration/messages_endpoint/test_anthropic_messages_caller_tools_wire.py
@@ -364,7 +364,7 @@ def test_spend_log_keeps_the_tools_the_caller_sent(rig: Rig, model: str, guardra
     assert object_value(rows[0]["proxy_server_request"])["tools"] == [strict_tool()]
 
 
-@pytest.mark.parametrize("tools", [7, "x" * 5000, ["lint"]], ids=["int", "five_kb", "list_of_str"])
+@pytest.mark.parametrize("tools", [7, "x" * 5000, ["lint"], ""], ids=["int", "five_kb", "list_of_str", "empty_string"])
 def test_a_malformed_tools_field_is_answered_with_an_error_and_the_proxy_keeps_serving(
     rig: Rig, tools: JsonValue
 ) -> None:
@@ -379,14 +379,6 @@ def test_a_malformed_tools_field_is_answered_with_an_error_and_the_proxy_keeps_s
     assert reply_text(control_status, control_raw, streaming=False) == f"linted {control_nonce.removeprefix('nonce-')}"
 
 
-def test_an_empty_string_tools_field_reaches_claude_as_sent(rig: Rig) -> None:
-    request_nonce: Final = nonce()
-    status, raw = rig.send(messages_body(CLAUDE_MODEL, request_nonce, tools=""))
-
-    assert reply_text(status, raw, streaming=False) == f"linted {request_nonce.removeprefix('nonce-')}"
-    assert sent_body(rig.received(request_nonce), CLAUDE_TARGET)["tools"] == ""
-
-
 @pytest.mark.parametrize(
     ("model", "target"),
     [(CLAUDE_MODEL, CLAUDE_TARGET), (OPENAI_MODEL, RESPONSES_TARGET)],
diff --git a/tests/integration/observability/test_batch_line_items_cold_storage.py b/tests/integration/observability/test_batch_line_items_cold_storage.py
index 9c2a1ecd2c4..587a21e4b62 100644
--- a/tests/integration/observability/test_batch_line_items_cold_storage.py
+++ b/tests/integration/observability/test_batch_line_items_cold_storage.py
@@ -817,7 +817,7 @@ def test_a_failing_bucket_still_bills_the_batch_and_the_other_sink_keeps_its_lin
     assert [record["custom_id"] for record in _records(gcs_body)] == [custom_id]
     assert spend > 0
     s3_name: Final = _object_name(f"{S3_PREFIX}/", batch.batch_id)
-    assert rig.s3.tried(s3_name) >= 1
+    eventually(lambda: rig.s3.tried(s3_name), lambda tries: tries >= 1, POLLER_SECONDS)
     assert s3_name not in rig.s3.objects()
 
 
diff --git a/tests/integration/observability/test_cache_hit_guardrail_metrics.py b/tests/integration/observability/test_cache_hit_guardrail_metrics.py
index 605130acd38..2ca9e0c6410 100644
--- a/tests/integration/observability/test_cache_hit_guardrail_metrics.py
+++ b/tests/integration/observability/test_cache_hit_guardrail_metrics.py
@@ -577,7 +577,6 @@ def test_two_identical_cache_hit_rejects_increment_populated_series(gateway: Gat
 
 def test_two_identical_cache_hit_rejects_write_matching_spend_rows(gateway: Gateway, tmp_path: Path) -> None:
     """E1b: both cache-hit rejects land a failure spend row."""
-    pytest.skip("BUG: roughly one in four back-to-back cache-hit rejects never lands its LiteLLM_SpendLogs row")
     marker: Final = uuid.uuid4().hex
     with _rig(gateway, tmp_path, marker) as rig:
         text: Final = "cache hit control e1b " + marker
diff --git a/tests/integration/observability/test_generic_guardrail_api_wire.py b/tests/integration/observability/test_generic_guardrail_api_wire.py
new file mode 100644
index 00000000000..0796feb5f37
--- /dev/null
+++ b/tests/integration/observability/test_generic_guardrail_api_wire.py
@@ -0,0 +1,308 @@
+import json
+import threading
+from collections.abc import Iterator, Mapping
+from contextlib import ExitStack
+from dataclasses import dataclass
+from pathlib import Path
+from types import MappingProxyType
+from typing import Final
+
+import pytest
+import yaml
+from integration._support.anthropic_sse import message_json
+from integration._support.client import Gateway, eventually
+from integration._support.openai_wire import chat_reply
+from integration._support.ports import allocate_port
+from integration._support.process import OwnedProxy, owned_proxy_process
+from integration._support.wire import Reply, Request, Wire, wire_server
+from pydantic import JsonValue, TypeAdapter
+
+GEMINI_MODEL: Final = "gemini/gemini-3.8-flash"
+ANTHROPIC_MODEL: Final = "anthropic/claude-sonnet-5-5"
+OPENAI_MODEL: Final = "openai/gpt-5.6"
+ECHO_GEMINI_TOOLS: Final = "echo-gemini-tools"
+NONE_CHAT_ROWS: Final = "none-chat-rows"
+NONE_CHAT_ROWS_DEFAULT: Final = "none-chat-rows-default"
+NONE_ANTHROPIC_IMAGE: Final = "none-anthropic-image"
+ECHO_ANTHROPIC_MESSAGES: Final = "echo-anthropic-messages"
+FORWARDS_MESSAGES_AS_SENT: Final = frozenset({NONE_CHAT_ROWS, NONE_ANTHROPIC_IMAGE, ECHO_ANTHROPIC_MESSAGES})
+FAIL_OPEN_CONNECT_ERROR: Final = "fail-open-connect-error"
+FAIL_OPEN_TIMEOUT: Final = "fail-open-timeout"
+FAIL_OPEN_HTTP_STATUS: Final = "fail-open-http-status"
+FAIL_OPEN_LINE: Final = "Generic Guardrail API error (fail-open)"
+PNG: Final = (
+    "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAFklEQVR4nGO4IydHEmIY1TCqYfhqAACaMxgQdGu1YAAAAABJRU5ErkJggg=="
+)
+_CONFIG: Final = Path(__file__).resolve().parents[1] / "proxy_config.yaml"
+_JSON: Final = TypeAdapter(dict[str, JsonValue])
+
+
+def _verdict_none(_request: Request) -> Reply:
+    return Reply(body=json.dumps({"action": "NONE"}).encode())
+
+
+def _verdict_echo(request: Request) -> Reply:
+    body: Final = _JSON.validate_json(request.body)
+    echoed: Final = {key: body[key] for key in ("structured_messages", "tools") if body.get(key)}
+    return Reply(body=json.dumps({"action": "NONE", **echoed}).encode())
+
+
+def _unavailable(_request: Request) -> Reply:
+    return Reply(status=503, body=b'{"error": "guardrail unavailable"}')
+
+
+def _gemini_reply(_request: Request) -> Reply:
+    return Reply(
+        body=json.dumps(
+            {
+                "candidates": [{"content": {"role": "model", "parts": [{"text": "ok"}]}, "finishReason": "STOP"}],
+                "usageMetadata": {"promptTokenCount": 3, "candidatesTokenCount": 1, "totalTokenCount": 4},
+            }
+        ).encode()
+    )
+
+
+def _anthropic_reply(_request: Request) -> Reply:
+    return Reply(body=message_json("msg_guardrail_wire", "claude-sonnet-5-5", "ok"))
+
+
+def _openai_reply(_request: Request) -> Reply:
+    return chat_reply("chatcmpl-guardrail-wire", "gpt-5.6", "ok", stream=False)
+
+
+def _guardrail(name: str, api_base: str, **params: JsonValue) -> dict[str, JsonValue]:
+    return {
+        "guardrail_name": name,
+        "litellm_params": {
+            "guardrail": "generic_guardrail_api",
+            "mode": "pre_call",
+            "default_on": False,
+            "api_base": api_base,
+            "api_key": "synthetic-guardrail-key",
+            **params,
+        },
+    }
+
+
+@dataclass(frozen=True, slots=True)
+class GuardrailRig:
+    owned: OwnedProxy
+    policies: Mapping[str, Wire]
+
+
+@pytest.fixture(scope="module")
+def rig(session_gateway: Gateway, tmp_path_factory: pytest.TempPathFactory) -> Iterator[GuardrailRig]:
+    directory: Final = tmp_path_factory.mktemp("generic-guardrail-wire")
+    release: Final = threading.Event()
+
+    def held_until_teardown(request: Request) -> Reply:
+        release.wait()
+        return _verdict_none(request)
+
+    with ExitStack() as stack:
+        policies: Final = MappingProxyType(
+            {
+                ECHO_GEMINI_TOOLS: stack.enter_context(wire_server(_verdict_echo)),
+                NONE_CHAT_ROWS: stack.enter_context(wire_server(_verdict_none)),
+                NONE_CHAT_ROWS_DEFAULT: stack.enter_context(wire_server(_verdict_none)),
+                NONE_ANTHROPIC_IMAGE: stack.enter_context(wire_server(_verdict_none)),
+                ECHO_ANTHROPIC_MESSAGES: stack.enter_context(wire_server(_verdict_echo)),
+            }
+        )
+        stalled: Final = stack.enter_context(wire_server(held_until_teardown))
+        stack.callback(release.set)
+        unavailable: Final = stack.enter_context(wire_server(_unavailable))
+        config: Final = _JSON.validate_python(yaml.safe_load(_CONFIG.read_text()))
+        path: Final = directory / "generic-guardrail-wire.yaml"
+        path.write_text(
+            yaml.safe_dump(
+                {
+                    **config,
+                    "guardrails": [
+                        *(
+                            _guardrail(name, wire.url, forward_messages_as_sent=name in FORWARDS_MESSAGES_AS_SENT)
+                            for name, wire in policies.items()
+                        ),
+                        _guardrail(FAIL_OPEN_CONNECT_ERROR, f"http://127.0.0.1:{allocate_port()}", fail_on_error=False),
+                        _guardrail(FAIL_OPEN_TIMEOUT, stalled.url, fail_on_error=False, timeout=1),
+                        _guardrail(FAIL_OPEN_HTTP_STATUS, unavailable.url, fail_on_error=False),
+                    ],
+                }
+            )
+        )
+        owned: Final = stack.enter_context(owned_proxy_process(session_gateway, directory, {}, config=path))
+        yield GuardrailRig(owned, policies)
+
+
+def _bodies(wire: Wire) -> list[dict[str, JsonValue]]:
+    return [_JSON.validate_json(request.body) for request in wire.drain()]
+
+
+def _fail_open_lines(log: Path, guardrail: str) -> list[str]:
+    return [
+        line
+        for line in log.read_text(errors="replace").splitlines()
+        if FAIL_OPEN_LINE in line and f"guardrail_name={guardrail} " in line
+    ]
+
+
+def test_gemini_native_tools_reach_the_guardrail_and_gemini_as_sent(rig: GuardrailRig) -> None:
+    tools: Final = [
+        {"function_declarations": [{"name": "get_weather", "parameters": {"type": "object", "properties": {}}}]},
+        {"googleSearch": {}},
+    ]
+    with wire_server(_gemini_reply) as gemini, rig.owned.gateway.scenario() as scenario:
+        model: Final = scenario.model(model=GEMINI_MODEL, api_base=gemini.url, api_key="synthetic-gemini-key")
+        response: Final = rig.owned.gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {
+                "model": model,
+                "messages": [{"role": "user", "content": "weather in Paris?"}],
+                "tools": tools,
+                "guardrails": [ECHO_GEMINI_TOOLS],
+            },
+        )
+        assert response.status_code == 200, response.text
+        assert [body["tools"] for body in _bodies(rig.policies[ECHO_GEMINI_TOOLS])] == [tools]
+        sent: Final = _bodies(gemini)
+        assert len(sent) == 1, sent
+        assert {"googleSearch": {}} in sent[0]["tools"], sent
+        assert [tool for tool in sent[0]["tools"] if "type" in tool] == [], sent
+
+
+CHAT_ROWS: Final = (
+    {"role": "user", "name": "pat", "content": "weather in Paris?"},
+    {
+        "role": "assistant",
+        "content": None,
+        "tool_calls": [
+            {"index": 0, "id": "call_1", "type": "function", "function": {"name": "get_weather", "arguments": "{}"}}
+        ],
+    },
+    {"role": "tool", "tool_call_id": "call_1", "content": "sunny"},
+)
+OPENAI_CHAT_ROWS: Final = (
+    {"role": "user", "content": "weather in Paris?"},
+    {
+        "role": "assistant",
+        "content": None,
+        "tool_calls": [{"id": "call_1", "type": "function", "function": {"name": "get_weather", "arguments": "{}"}}],
+    },
+    {"role": "tool", "tool_call_id": "call_1", "content": "sunny"},
+)
+
+
+@pytest.mark.parametrize(
+    ("guardrail", "seen"),
+    [(NONE_CHAT_ROWS, CHAT_ROWS), (NONE_CHAT_ROWS_DEFAULT, OPENAI_CHAT_ROWS)],
+    ids=["forward_messages_as_sent", "default"],
+)
+def test_guardrail_sees_chat_rows_as_sent_only_when_configured(
+    rig: GuardrailRig, guardrail: str, seen: tuple[dict[str, JsonValue], ...]
+) -> None:
+    messages: Final = list(CHAT_ROWS)
+    with wire_server(_openai_reply) as openai_peer, rig.owned.gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=OPENAI_MODEL, api_base=f"{openai_peer.url}/v1", api_key="synthetic-openai-key"
+        )
+        response: Final = rig.owned.gateway.request(
+            "POST", "/v1/chat/completions", {"model": model, "messages": messages, "guardrails": [guardrail]}
+        )
+        assert response.status_code == 200, response.text
+        assert [body["structured_messages"] for body in _bodies(rig.policies[guardrail])] == [list(seen)]
+        assert len(openai_peer.drain()) == 1
+
+
+def test_guardrail_sees_an_anthropic_image_block_on_chat_completions_as_sent(rig: GuardrailRig) -> None:
+    image: Final = [{"type": "image", "source": {"type": "base64", "media_type": "image/png", "data": PNG}}]
+    with wire_server(_anthropic_reply) as anthropic_peer, rig.owned.gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=ANTHROPIC_MODEL, api_base=anthropic_peer.url, api_key="synthetic-anthropic-key"
+        )
+        rig.owned.gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {
+                "model": model,
+                "max_tokens": 16,
+                "messages": [{"role": "user", "content": image}, {"role": "user", "content": "what color?"}],
+                "guardrails": [NONE_ANTHROPIC_IMAGE],
+            },
+        )
+        seen: Final = _bodies(rig.policies[NONE_ANTHROPIC_IMAGE])
+        assert [body["structured_messages"][0]["content"] for body in seen] == [image], seen
+
+
+def test_echoing_guardrail_leaves_the_anthropic_messages_request_unchanged(rig: GuardrailRig) -> None:
+    messages: Final = [
+        {
+            "role": "user",
+            "content": [
+                {"type": "text", "text": "What color is this square? Also check the weather in Paris."},
+                {"type": "image", "source": {"type": "base64", "media_type": "image/png", "data": PNG}},
+                {"type": "document", "source": {"type": "text", "media_type": "text/plain", "data": "Trip notes."}},
+            ],
+        },
+        {
+            "role": "assistant",
+            "content": [{"type": "tool_use", "id": "toolu_1", "name": "get_weather", "input": {"city": "Paris"}}],
+        },
+        {
+            "role": "user",
+            "content": [
+                {"type": "tool_result", "tool_use_id": "toolu_1", "content": "sunny, 21C"},
+                {"type": "text", "text": "Answer both in one sentence."},
+            ],
+        },
+    ]
+    tools: Final = [
+        {
+            "name": "get_weather",
+            "description": "Weather for a city",
+            "input_schema": {"type": "object", "properties": {"city": {"type": "string"}}},
+        }
+    ]
+    with wire_server(_anthropic_reply) as anthropic_peer, rig.owned.gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=ANTHROPIC_MODEL, api_base=anthropic_peer.url, api_key="synthetic-anthropic-key"
+        )
+        response: Final = rig.owned.gateway.request(
+            "POST",
+            "/v1/messages",
+            {
+                "model": model,
+                "max_tokens": 64,
+                "messages": messages,
+                "tools": tools,
+                "guardrails": [ECHO_ANTHROPIC_MESSAGES],
+            },
+        )
+        assert response.status_code == 200, response.text
+        assert len(rig.policies[ECHO_ANTHROPIC_MESSAGES].drain()) == 1
+        assert [body["messages"] for body in _bodies(anthropic_peer)] == [messages]
+
+
+@pytest.mark.parametrize(
+    ("guardrail", "tokens"),
+    [
+        (FAIL_OPEN_CONNECT_ERROR, ("error_type=ConnectError",)),
+        (FAIL_OPEN_TIMEOUT, ("error_type=Timeout",)),
+        (FAIL_OPEN_HTTP_STATUS, ("error_type=HTTPStatusError", "http_status_code=503")),
+    ],
+    ids=["connect_error", "timeout", "http_status"],
+)
+def test_fail_open_log_line_names_the_error_type(rig: GuardrailRig, guardrail: str, tokens: tuple[str, ...]) -> None:
+    with wire_server(_openai_reply) as openai_peer, rig.owned.gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=OPENAI_MODEL, api_base=f"{openai_peer.url}/v1", api_key="synthetic-openai-key"
+        )
+        response: Final = rig.owned.gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {"model": model, "messages": [{"role": "user", "content": "hi"}], "guardrails": [guardrail]},
+        )
+        assert response.status_code == 200, response.text
+        assert len(openai_peer.drain()) == 1
+    lines: Final = eventually(lambda: _fail_open_lines(rig.owned.log, guardrail), bool, seconds=30)
+    assert [line for line in lines if not all(token in line for token in tokens)] == [], lines
diff --git a/tests/integration/observability/test_s3_v2_upload_fanout.py b/tests/integration/observability/test_s3_v2_upload_fanout.py
index 01c1f563be4..d845d332237 100644
--- a/tests/integration/observability/test_s3_v2_upload_fanout.py
+++ b/tests/integration/observability/test_s3_v2_upload_fanout.py
@@ -420,7 +420,16 @@ def test_s3_v2_object_rejected_with_a_bucket_wide_code_is_delivered_once_the_fau
 def test_s3_v2_terminal_object_is_put_once_and_dropped_by_default(gateway: Gateway, tmp_path: Path) -> None:
     marker: Final = "s3toolarge" + uuid.uuid4().hex[:8]
     sink: Final = RejectingS3Sink(reject_marker=f"{marker}-huge", reject_status=400, reject_code="EntityTooLarge")
-    with wire_server(_chat_reply) as provider, wire_server(sink.respond) as bucket:
+    flushing: Final = threading.Event()
+    release: Final = threading.Event()
+
+    def respond(request: Request) -> Reply:
+        if f"{marker}-held".encode() in request.body:
+            flushing.set()
+            assert release.wait(timeout=60), "the held flush was never released"
+        return sink.respond(request)
+
+    with wire_server(_chat_reply) as provider, wire_server(respond) as bucket:
         config: Final = _s3_config(tmp_path, bucket.url, {"s3_batch_file_upload": False})
         with (
             owned_proxy(gateway, tmp_path, {"DEFAULT_S3_FLUSH_INTERVAL_SECONDS": "2"}, config=config) as candidate,
@@ -428,11 +437,16 @@ def test_s3_v2_terminal_object_is_put_once_and_dropped_by_default(gateway: Gatew
         ):
             model: Final = scenario.model(api_base=provider.url + "/v1", api_key="synthetic-provider-key")
             key: Final = scenario.key(models=[model])
+            _send(candidate, model, key, f"{marker}-held")
+            eventually(flushing.is_set, bool, seconds=30)
             _send(candidate, model, key, f"{marker}-huge")
-            _send_and_wait_until_landed(candidate, model, key, sink, f"{marker}-sibling")
+            _send(candidate, model, key, f"{marker}-sibling")
+            release.set()
+            eventually(sink.landed_ids, lambda landed: f"{marker}-sibling" in landed, seconds=60)
             _send_and_wait_until_landed(candidate, model, key, sink, f"{marker}-second-flush")
             _send_and_wait_until_landed(candidate, model, key, sink, f"{marker}-third-flush")
-    assert sum(1 for r in provider.drain() if r.method == "POST") == 4
+    assert sum(1 for r in provider.drain() if r.method == "POST") == 5
+    assert sink.landed_ids() == {f"{marker}-{name}" for name in ("held", "sibling", "second-flush", "third-flush")}
     assert sink.rejected_attempts == 1, (
         f"an EntityTooLarge object was PUT {sink.rejected_attempts} times next to delivered siblings; "
         "with the default s3_drop_on_terminal_error it must be attempted once and dropped"
diff --git a/tests/integration/providers/test_azure_reasoning_effort_none_wire.py b/tests/integration/providers/test_azure_reasoning_effort_none_wire.py
new file mode 100644
index 00000000000..c95e497c672
--- /dev/null
+++ b/tests/integration/providers/test_azure_reasoning_effort_none_wire.py
@@ -0,0 +1,58 @@
+from typing import Final
+
+from integration._support.client import Gateway
+from integration._support.openai_wire import chat_reply
+from integration._support.wire import Reply, Request, wire_server
+from pydantic import JsonValue, TypeAdapter
+
+_DEPLOYMENT: Final = "gpt-6.1-sol"
+_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue])
+_MESSAGES: Final[list[JsonValue]] = [{"role": "user", "content": "no reasoning please"}]
+
+
+def _reply(_request: Request) -> Reply:
+    return chat_reply("chatcmpl-effort-none", _DEPLOYMENT, "answered without reasoning", stream=False)
+
+
+def test_reasoning_effort_none_is_rejected_by_litellm_before_reaching_azure(gateway: Gateway) -> None:
+    with wire_server(_reply) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=f"azure/{_DEPLOYMENT}",
+            api_base=wire.url,
+            api_key="synthetic-azure-key",
+            api_version="2025-04-01-preview",
+        )
+        response: Final = gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {"model": model, "messages": _MESSAGES, "reasoning_effort": "none"},
+            key=scenario.key(),
+        )
+
+        assert response.status_code == 400, response.text
+        assert "reasoning_effort='none'" in response.text, response.text
+        assert wire.drain() == ()
+
+
+def test_reasoning_effort_none_is_dropped_when_the_deployment_drops_params(gateway: Gateway) -> None:
+    with wire_server(_reply) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=f"azure/{_DEPLOYMENT}",
+            api_base=wire.url,
+            api_key="synthetic-azure-key",
+            api_version="2025-04-01-preview",
+            drop_params=True,
+        )
+        response: Final = gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {"model": model, "messages": _MESSAGES, "reasoning_effort": "none"},
+            key=scenario.key(),
+        )
+
+        assert response.status_code == 200, response.text
+        assert "answered without reasoning" in response.text, response.text
+        received: Final = wire.drain()
+        assert [request.method for request in received] == ["POST"], [request.target for request in received]
+        body: Final = _JSON_OBJECT.validate_json(received[0].body)
+        assert "reasoning_effort" not in body and "reasoning" not in body, body
diff --git a/tests/integration/providers/test_azure_responses_api_version_wire.py b/tests/integration/providers/test_azure_responses_api_version_wire.py
new file mode 100644
index 00000000000..13c2f48dee2
--- /dev/null
+++ b/tests/integration/providers/test_azure_responses_api_version_wire.py
@@ -0,0 +1,108 @@
+from typing import Final
+from urllib.parse import parse_qs, urlsplit
+
+from integration._support.client import Gateway, Scenario
+from integration._support.openai_wire import chat_reply, responses_reply
+from integration._support.wire import Reply, Request, Wire, wire_server
+from pydantic import JsonValue, TypeAdapter
+
+_DEPLOYMENT: Final = "gpt-5.4-nano"
+_DATED_GA_API_VERSION: Final = "2024-10-21"
+_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue])
+
+
+def _reply(request: Request) -> Reply:
+    if urlsplit(request.target).path.endswith("/responses"):
+        return responses_reply("resp_azure_version", _DEPLOYMENT, "azure answered", stream=False)
+    return chat_reply("chatcmpl-azure-version", _DEPLOYMENT, "azure answered", stream=False)
+
+
+def _dated_azure_model(scenario: Scenario, wire: Wire, model: str, responses_api_version: str | None = None) -> str:
+    if responses_api_version is None:
+        return scenario.model(
+            model=model, api_base=wire.url, api_key="synthetic-azure-key", api_version=_DATED_GA_API_VERSION
+        )
+    return scenario.model(
+        model=model,
+        api_base=wire.url,
+        api_key="synthetic-azure-key",
+        api_version=_DATED_GA_API_VERSION,
+        responses_api_version=responses_api_version,
+    )
+
+
+def _only_post(wire: Wire) -> tuple[str, dict[str, str], dict[str, JsonValue]]:
+    posts: Final = tuple(request for request in wire.drain() if request.method == "POST")
+    assert len(posts) == 1, [request.target for request in posts]
+    target: Final = urlsplit(posts[0].target)
+    query: Final = {name: values[-1] for name, values in parse_qs(target.query).items()}
+    return target.path, query, _JSON_OBJECT.validate_json(posts[0].body)
+
+
+def test_chat_keeps_the_dated_api_version_and_never_sends_responses_api_version(gateway: Gateway) -> None:
+    with wire_server(_reply) as wire, gateway.scenario() as scenario:
+        model: Final = _dated_azure_model(scenario, wire, f"azure/{_DEPLOYMENT}", responses_api_version="preview")
+        response: Final = gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {"model": model, "messages": [{"role": "user", "content": "dated chat"}]},
+            key=scenario.key(),
+        )
+
+        assert response.status_code == 200, response.text
+        path, query, body = _only_post(wire)
+        assert (path, query) == (
+            f"/openai/deployments/{_DEPLOYMENT}/chat/completions",
+            {"api-version": _DATED_GA_API_VERSION},
+        )
+        assert body == {
+            "model": _DEPLOYMENT,
+            "messages": [{"role": "user", "content": "dated chat"}],
+            "stream": False,
+        }, body
+
+
+def test_responses_on_a_dated_ga_deployment_reaches_the_v1_responses_route(gateway: Gateway) -> None:
+    with wire_server(_reply) as wire, gateway.scenario() as scenario:
+        model: Final = _dated_azure_model(scenario, wire, f"azure/{_DEPLOYMENT}")
+        response: Final = gateway.request(
+            "POST", "/v1/responses", {"model": model, "input": "dated responses"}, key=scenario.key()
+        )
+
+        assert response.status_code == 200, response.text
+        path, query, body = _only_post(wire)
+        assert (path, query) == ("/openai/v1/responses", {"api-version": "preview"})
+        assert body["input"] == "dated responses", body
+
+
+def test_responses_api_version_overrides_the_chat_api_version_and_stays_out_of_the_body(gateway: Gateway) -> None:
+    with wire_server(_reply) as wire, gateway.scenario() as scenario:
+        model: Final = _dated_azure_model(
+            scenario, wire, f"azure/{_DEPLOYMENT}", responses_api_version="2025-04-01-preview"
+        )
+        response: Final = gateway.request(
+            "POST", "/v1/responses", {"model": model, "input": "override responses"}, key=scenario.key()
+        )
+
+        assert response.status_code == 200, response.text
+        path, query, body = _only_post(wire)
+        assert (path, query) == ("/openai/responses", {"api-version": "2025-04-01-preview"})
+        assert "responses_api_version" not in body and "api_version" not in body, body
+
+
+def test_chat_bridged_through_azure_responses_on_a_dated_ga_deployment_reaches_v1_responses(
+    gateway: Gateway,
+) -> None:
+    with wire_server(_reply) as wire, gateway.scenario() as scenario:
+        model: Final = _dated_azure_model(scenario, wire, f"azure/responses/{_DEPLOYMENT}")
+        response: Final = gateway.request(
+            "POST",
+            "/v1/chat/completions",
+            {"model": model, "messages": [{"role": "user", "content": "bridged chat"}]},
+            key=scenario.key(),
+        )
+
+        assert response.status_code == 200, response.text
+        assert "azure answered" in response.text, response.text
+        path, query, _ = _only_post(wire)
+        assert (path, query) == ("/openai/v1/responses", {"api-version": "preview"})
diff --git a/tests/integration/providers/test_bedrock_invoke_dangerous_tool_use_beta_wire.py b/tests/integration/providers/test_bedrock_invoke_dangerous_tool_use_beta_wire.py
new file mode 100644
index 00000000000..ca22ab4f23d
--- /dev/null
+++ b/tests/integration/providers/test_bedrock_invoke_dangerous_tool_use_beta_wire.py
@@ -0,0 +1,138 @@
+import json
+from collections.abc import Callable, Mapping
+from typing import Final
+from urllib.parse import unquote
+
+import pytest
+from integration._support.client import Gateway
+from integration._support.wire import Reply, Request, Wire, wire_server
+from pydantic import JsonValue, TypeAdapter
+
+CLAUDE_ID: Final = "us.anthropic.claude-sonnet-4-5-20250929-v1:0"
+MANTLE_CLAUDE_ID: Final = "anthropic.claude-haiku-4-5"
+TOKEN: Final = "synthetic-bedrock-bearer"
+DANGEROUS_TOOL_USE_BETA: Final = "dangerous-tool-use-2026-09-03"
+KEPT_BETA: Final = "context-1m-2025-08-07"
+SAFEGUARDS: Final[JsonValue] = [{"type": "dangerous_tool_use"}]
+NO_CACHE: Final[JsonValue] = {"no-cache": True}
+INVOKE_TARGET: Final = f"/model/{CLAUDE_ID}/invoke"
+MANTLE_TARGET: Final = "/anthropic/v1/messages"
+REPLY: Final = json.dumps(
+    {
+        "id": "msg_scripted",
+        "type": "message",
+        "role": "assistant",
+        "model": CLAUDE_ID,
+        "content": [{"type": "text", "text": "scripted reply"}],
+        "stop_reason": "end_turn",
+        "stop_sequence": None,
+        "usage": {"input_tokens": 3, "output_tokens": 2},
+    }
+).encode()
+_OBJECT: Final = TypeAdapter(dict[str, JsonValue])
+_BETAS: Final = TypeAdapter(tuple[str, ...])
+
+
+def _peer(request: Request) -> Reply:
+    if unquote(request.target) not in (INVOKE_TARGET, MANTLE_TARGET):
+        return Reply(status=404, body=json.dumps({"error": f"unscripted target {request.target}"}).encode())
+    assert request.headers["authorization"] == f"Bearer {TOKEN}", request.headers
+    return Reply(body=REPLY)
+
+
+def _invoke_body_betas(request: Request) -> frozenset[str]:
+    return frozenset(_BETAS.validate_python(_OBJECT.validate_json(request.body).get("anthropic_beta") or ()))
+
+
+def _mantle_header_betas(request: Request) -> frozenset[str]:
+    return frozenset(beta.strip() for beta in request.headers.get("anthropic-beta", "").split(",") if beta.strip())
+
+
+def _delivered(gateway: Gateway, wire: Wire, path: str, body: Mapping[str, JsonValue], client_betas: str) -> Request:
+    response: Final = gateway.request("POST", path, body, headers={"anthropic-beta": client_betas})
+    assert response.status_code == 200, response.text
+    (sent,) = wire.drain()
+    return sent
+
+
+def _messages_body(model: str, **extra: JsonValue) -> dict[str, JsonValue]:
+    return {
+        "model": model,
+        "max_tokens": 16,
+        "messages": [{"role": "user", "content": "hi"}],
+        "cache": NO_CACHE,
+        **extra,
+    }
+
+
+def _chat_body(model: str, **extra: JsonValue) -> dict[str, JsonValue]:
+    return {"model": model, "messages": [{"role": "user", "content": "hi"}], "cache": NO_CACHE, **extra}
+
+
+def _responses_body(model: str, **extra: JsonValue) -> dict[str, JsonValue]:
+    return {"model": model, "input": "hi", "cache": NO_CACHE, **extra}
+
+
+def test_invoke_messages_without_safeguards_sends_the_betas_of_a_request_that_never_had_the_beta(
+    gateway: Gateway,
+) -> None:
+    with wire_server(_peer) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=f"bedrock/{CLAUDE_ID}", api_key=TOKEN, aws_region_name="us-east-1", api_base=wire.url
+        )
+        with_beta: Final = _invoke_body_betas(
+            _delivered(gateway, wire, "/v1/messages", _messages_body(model), f"{KEPT_BETA},{DANGEROUS_TOOL_USE_BETA}")
+        )
+        without_beta: Final = _invoke_body_betas(
+            _delivered(gateway, wire, "/v1/messages", _messages_body(model), KEPT_BETA)
+        )
+    assert KEPT_BETA in without_beta, without_beta
+    assert with_beta == without_beta, (with_beta, without_beta)
+
+
+def test_invoke_messages_with_safeguards_keeps_the_dangerous_beta(gateway: Gateway) -> None:
+    with wire_server(_peer) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=f"bedrock/{CLAUDE_ID}", api_key=TOKEN, aws_region_name="us-east-1", api_base=wire.url
+        )
+        sent: Final = _invoke_body_betas(
+            _delivered(
+                gateway,
+                wire,
+                "/v1/messages",
+                _messages_body(model, safeguards=SAFEGUARDS),
+                f"{KEPT_BETA},{DANGEROUS_TOOL_USE_BETA}",
+            )
+        )
+    assert {KEPT_BETA, DANGEROUS_TOOL_USE_BETA} <= sent, sent
+
+
+@pytest.mark.parametrize(
+    ("path", "build"),
+    [("/v1/chat/completions", _chat_body), ("/v1/responses", _responses_body)],
+    ids=["chat_completions", "responses"],
+)
+def test_invoke_chat_shaped_routes_without_safeguards_drop_only_the_dangerous_beta(
+    gateway: Gateway, path: str, build: Callable[[str], dict[str, JsonValue]]
+) -> None:
+    with wire_server(_peer) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=f"bedrock/invoke/{CLAUDE_ID}", api_key=TOKEN, aws_region_name="us-east-1", api_base=wire.url
+        )
+        with_beta: Final = _invoke_body_betas(
+            _delivered(gateway, wire, path, build(model), f"{KEPT_BETA},{DANGEROUS_TOOL_USE_BETA}")
+        )
+        without_beta: Final = _invoke_body_betas(_delivered(gateway, wire, path, build(model), KEPT_BETA))
+    assert KEPT_BETA in without_beta, without_beta
+    assert with_beta == without_beta, (with_beta, without_beta)
+
+
+def test_mantle_messages_without_safeguards_keeps_the_dangerous_beta(gateway: Gateway) -> None:
+    with wire_server(_peer) as wire, gateway.scenario() as scenario:
+        model: Final = scenario.model(
+            model=f"bedrock_mantle/{MANTLE_CLAUDE_ID}", api_key=TOKEN, aws_region_name="us-east-1", api_base=wire.url
+        )
+        sent: Final = _mantle_header_betas(
+            _delivered(gateway, wire, "/v1/messages", _messages_body(model), f"{KEPT_BETA},{DANGEROUS_TOOL_USE_BETA}")
+        )
+    assert DANGEROUS_TOOL_USE_BETA in sent, sent
diff --git a/tests/integration/providers/test_bedrock_mantle_count_tokens_wire.py b/tests/integration/providers/test_bedrock_mantle_count_tokens_wire.py
index 5179514b2b8..701d185b241 100644
--- a/tests/integration/providers/test_bedrock_mantle_count_tokens_wire.py
+++ b/tests/integration/providers/test_bedrock_mantle_count_tokens_wire.py
@@ -1147,8 +1147,8 @@ def test_messages_count_tokens_surfaces_the_mantle_error_for_a_non_text_system(
 
 @pytest.mark.parametrize(
     "tools",
-    ["", "x" * 5120, ["get_weather"]],
-    ids=["empty_string", "5kb_string", "list_of_strings"],
+    [5, "", "x" * 5120, ["get_weather"]],
+    ids=["int", "empty_string", "5kb_string", "list_of_strings"],
 )
 def test_messages_count_tokens_rejects_malformed_tools_without_calling_either_peer(
     counting_proxy: OwnedProxy, mantle_port: int, tools: JsonValue
@@ -1161,8 +1161,8 @@ def test_messages_count_tokens_rejects_malformed_tools_without_calling_either_pe
     ):
         model: Final = _deployment(scenario, runtime.url)
         refused: Final = _count(gateway, {**_bare(model), "tools": tools})
-        assert 400 <= refused.status_code < 600, refused.text
-        assert "input_tokens" not in refused.text, refused.text
+        assert refused.status_code == 400, refused.text
+        assert object_value(_JSON_OBJECT.validate_json(refused.content)["error"])["type"] == "invalid_request_error"
         assert runtime.drain() == () and mantle.drain() == ()
         assert _generated_then_counted(gateway.client, gateway.key, model, _bare(model)) == (200, 200, _MANTLE_COUNT)
         assert _mantle_bodies(mantle) == (_MANTLE_BARE,)
@@ -1185,8 +1185,13 @@ def test_messages_count_tokens_without_messages_is_rejected(
         assert runtime.drain() == () and mantle.drain() == ()
 
 
+@pytest.mark.parametrize(
+    "fields",
+    [{}, {"tools": 5}, {"web_search_options": None}],
+    ids=["well_formed", "int_tools", "null_web_search_options"],
+)
 def test_messages_count_tokens_unauthenticated_request_never_reaches_either_peer(
-    counting_proxy: OwnedProxy, mantle_port: int
+    counting_proxy: OwnedProxy, mantle_port: int, fields: dict[str, JsonValue]
 ) -> None:
     gateway: Final = counting_proxy.gateway
     with (
@@ -1196,7 +1201,7 @@ def test_messages_count_tokens_unauthenticated_request_never_reaches_either_peer
     ):
         model: Final = _deployment(scenario, runtime.url)
         response: Final = gateway.request(
-            "POST", "/v1/messages/count_tokens", _full(model), key="sk-not-a-key-this-proxy-issued"
+            "POST", "/v1/messages/count_tokens", {**_full(model), **fields}, key="sk-not-a-key-this-proxy-issued"
         )
         assert response.status_code == 401, response.text
         assert "input_tokens" not in response.text, response.text
diff --git a/tests/integration/providers/test_bedrock_runtime_chat_completions_sad_wire.py b/tests/integration/providers/test_bedrock_runtime_chat_completions_sad_wire.py
index 0860d79459e..54923fe0c97 100644
--- a/tests/integration/providers/test_bedrock_runtime_chat_completions_sad_wire.py
+++ b/tests/integration/providers/test_bedrock_runtime_chat_completions_sad_wire.py
@@ -27,6 +27,7 @@ BAD_KEY: Final = "sk-synthetic-bad-key"
 NATIVE_TARGET: Final = "/openai/v1/chat/completions"
 CONVERSE_TARGET: Final = f"/model/{GPT}/converse"
 LONG_VERSION_GPT: Final = "openai.gpt-" + "1" * 30000
+LONG_UNVERSIONED_GPT: Final = "openai.gpt-x" + "1" * 30000
 PNG_DATA_URL: Final = (
     "data:image/png;base64,"
     "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4nGP4z8DwHwAFAAH/iZk9HQAAAABJRU5ErkJggg=="
@@ -258,11 +259,12 @@ def test_thirty_thousand_digit_version_is_classified_quickly_and_served_by_conve
     marker: Final = uuid.uuid4().hex
     control_marker: Final = uuid.uuid4().hex
     with wire_server(respond) as wire, gateway.scenario() as scenario, ThreadPoolExecutor(max_workers=1) as pool:
-        control_model: Final = _deployment(scenario, wire)
+        control_model: Final = _deployment(scenario, wire, model=f"bedrock/{LONG_UNVERSIONED_GPT}")
         model: Final = _deployment(scenario, wire, model=f"bedrock/{LONG_VERSION_GPT}")
         control: Final = timed(lambda: _chat(gateway, control_model, control_marker))
         assert _content(control.value) == answer(control_marker), control.value.text
-        _only_request(wire, control_marker)
+        control_request: Final = _only_request(wire, control_marker)
+        assert target_of(control_request) == f"/model/{LONG_UNVERSIONED_GPT}/converse", control_request.target
         liveliness: Final = pool.submit(_timed_liveliness, gateway)
         served: Final = timed(lambda: _chat(gateway, model, marker))
         response: Final = served.value
diff --git a/tests/integration/providers/test_malformed_tools_chaos.py b/tests/integration/providers/test_malformed_tools_chaos.py
new file mode 100644
index 00000000000..0ab50a5afbe
--- /dev/null
+++ b/tests/integration/providers/test_malformed_tools_chaos.py
@@ -0,0 +1,619 @@
+from __future__ import annotations
+
+import json
+import os
+import re
+import threading
+import uuid
+from collections.abc import Iterator
+from concurrent.futures import Future, ThreadPoolExecutor
+from contextlib import ExitStack
+from dataclasses import dataclass
+from pathlib import Path
+from queue import SimpleQueue
+from typing import Final, Literal, TypeAlias
+
+import httpx
+import psutil
+import pytest
+from integration._support.anthropic_sse import error_body, message_json, message_stream
+from integration._support.client import Gateway, eventually, gateway_from_environment
+from integration._support.database import write_rows
+from integration._support.openai_wire import chat_reply, responses_reply
+from integration._support.process import OwnedProxy, graceful_stop_seconds, owned_proxy_process
+from integration._support.wire import Reply, Request, Wire, wire_server
+from integration._support.worker_readiness import wait_for_worker_readiness
+from pydantic import JsonValue, TypeAdapter
+
+_OPENAI_BACKEND: Final = "gpt-4o-mini"
+_CLAUDE_BACKEND: Final = "claude-haiku-4-5"
+_GEMINI_BACKEND: Final = "gemini-2.5-flash"
+_PROVIDER_KEY: Final = "scripted-malformed-tools-chaos-key"
+_OWNED_CHAT: Final = "malformed-tools-owned-chat"
+_OWNED_STORE: Final = "vs_malformed_tools_owned_store"
+_MARKER: Final = re.compile(r"marker-([0-9a-f]{32})")
+_STARTED_WORKER: Final = re.compile(r"Started server process \[(\d+)\]")
+_OWNED_PROXY_CELL_SECONDS: Final = 2 * graceful_stop_seconds() + 120
+_RESPAWN_SECONDS: Final = graceful_stop_seconds() + 60
+_PROXY_WORKERS: Final = max(1, int(os.environ.get("INTEGRATION_PROXY_WORKERS", "1")))
+_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue])
+_NOT_A_LIST: Final = "tools: Input should be a valid list"
+_WEATHER_SCHEMA: Final[dict[str, JsonValue]] = {
+    "type": "object",
+    "properties": {"city": {"type": "string"}},
+    "required": ["city"],
+}
+_CHAT_TOOL: Final[dict[str, JsonValue]] = {
+    "type": "function",
+    "function": {"name": "get_weather", "description": "Look up the weather", "parameters": _WEATHER_SCHEMA},
+}
+_CLAUDE_TOOL: Final[dict[str, JsonValue]] = {
+    "name": "get_weather",
+    "description": "Look up the weather",
+    "input_schema": _WEATHER_SCHEMA,
+}
+_RESPONSES_TOOL: Final[dict[str, JsonValue]] = {
+    "type": "function",
+    "name": "get_weather",
+    "description": "Look up the weather",
+    "parameters": _WEATHER_SCHEMA,
+}
+_GEMINI_TOOL: Final[dict[str, JsonValue]] = {
+    "functionDeclarations": [
+        {"name": "get_weather", "description": "Look up the weather", "parameters": _WEATHER_SCHEMA}
+    ]
+}
+Kind: TypeAlias = Literal["valid", "rejected", "dropped"]
+
+
+def _marker(label: str) -> str:
+    return f"{label} marker-{uuid.uuid4().hex}"
+
+
+def _tag(text: str) -> str:
+    found: Final = _MARKER.search(text)
+    return found.group(1) if found else "none"
+
+
+def _answer(tag: str) -> str:
+    return f"answer {tag}"
+
+
+def _gemini_body(tag: str) -> bytes:
+    return json.dumps(
+        {
+            "candidates": [
+                {"content": {"role": "model", "parts": [{"text": _answer(tag)}]}, "index": 0, "finishReason": "STOP"}
+            ],
+            "usageMetadata": {"promptTokenCount": 9, "candidatesTokenCount": 2, "totalTokenCount": 11},
+            "modelVersion": _GEMINI_BACKEND,
+        }
+    ).encode()
+
+
+def _scripted(request: Request) -> Reply:
+    text: Final = request.body.decode()
+    tag: Final = _tag(text)
+    path: Final = request.target.split("?")[0]
+    stream: Final = bool(text) and _JSON_OBJECT.validate_json(request.body).get("stream") is True
+    if path == "/v1/chat/completions":
+        return chat_reply(f"chatcmpl-{tag}", _OPENAI_BACKEND, _answer(tag), stream=stream)
+    if path == "/v1/responses":
+        return responses_reply(f"resp_{tag}", _OPENAI_BACKEND, _answer(tag), stream=stream)
+    if path == "/v1/messages" and _JSON_OBJECT.validate_json(request.body).get("tools") == 5:
+        return Reply(status=400, body=error_body(400, _NOT_A_LIST))
+    if path == "/v1/messages" and stream:
+        return Reply(
+            content_type="text/event-stream", chunks=message_stream(f"msg_{tag}", _CLAUDE_BACKEND, _answer(tag))
+        )
+    if path == "/v1/messages":
+        return Reply(body=message_json(f"msg_{tag}", _CLAUDE_BACKEND, _answer(tag)))
+    if path.endswith(":streamGenerateContent"):
+        return Reply(content_type="text/event-stream", chunks=(b"data: " + _gemini_body(tag) + b"\r\n\r\n",))
+    if path.endswith(":generateContent"):
+        return Reply(body=_gemini_body(tag))
+    return Reply(status=404, body=json.dumps({"error": f"unscripted {request.target}"}).encode())
+
+
+@dataclass(frozen=True, slots=True)
+class _Switchboard:
+    down: threading.Event
+    holding: threading.Event
+    release: threading.Event
+    held: SimpleQueue[str]
+
+    def respond(self, request: Request) -> Reply:
+        if self.down.is_set():
+            return Reply(drop_connection=True)
+        if self.holding.is_set():
+            self.held.put(request.target)
+            assert self.release.wait(timeout=120), "Held request was never released"
+        return _scripted(request)
+
+    def reset(self) -> None:
+        self.down.clear()
+        self.release.set()
+        self.holding.clear()
+
+
+@dataclass(frozen=True, slots=True)
+class _Rig:
+    gateway: Gateway
+    wire: Wire
+    switchboard: _Switchboard
+    chat: str
+    claude: str
+    gemini: str
+
+
+@pytest.fixture(scope="module")
+def rig() -> Iterator[_Rig]:
+    switchboard: Final = _Switchboard(threading.Event(), threading.Event(), threading.Event(), SimpleQueue())
+    with (
+        gateway_from_environment() as gateway,
+        wire_server(switchboard.respond) as wire,
+        gateway.scenario() as scenario,
+    ):
+        built: Final = _Rig(
+            gateway=gateway,
+            wire=wire,
+            switchboard=switchboard,
+            chat=scenario.model(api_base=f"{wire.url}/v1", api_key=_PROVIDER_KEY),
+            claude=scenario.model(model=f"anthropic/{_CLAUDE_BACKEND}", api_base=wire.url, api_key=_PROVIDER_KEY),
+            gemini=scenario.model(model=f"gemini/{_GEMINI_BACKEND}", api_base=wire.url, api_key=_PROVIDER_KEY),
+        )
+        for group in (built.chat, built.claude, built.gemini):
+            wait_for_worker_readiness(gateway, group, 1, _PROXY_WORKERS)
+        try:
+            yield built
+        finally:
+            switchboard.reset()
+
+
+@pytest.fixture(autouse=True)
+def _reset(rig: _Rig) -> Iterator[None]:
+    rig.switchboard.reset()
+    rig.wire.drain()
+    yield
+    rig.switchboard.reset()
+
+
+@dataclass(frozen=True, slots=True)
+class _Call:
+    path: str
+    body: dict[str, JsonValue]
+    marker: str
+    kind: Kind
+
+
+def _tools_for(kind: Kind, tool: dict[str, JsonValue]) -> dict[str, JsonValue]:
+    if kind == "rejected":
+        return {"tools": 5}
+    if kind == "dropped":
+        return {"tools": [tool, 5], "drop_params": True}
+    return {"tools": [tool]}
+
+
+def _call(rig: _Rig, index: int, kind: Kind, label: str) -> _Call:
+    marker: Final = _marker(label)
+    stream: Final = (index // 4) % 2 == 1
+    family: Final = index % 4
+    if family == 0:
+        return _Call(
+            "/v1/chat/completions",
+            {
+                "model": rig.chat,
+                "messages": [{"role": "user", "content": marker}],
+                "stream": stream,
+                **_tools_for(kind, _CHAT_TOOL),
+            },
+            marker,
+            kind,
+        )
+    if family == 1:
+        return _Call(
+            "/v1/messages",
+            {
+                "model": rig.claude,
+                "max_tokens": 16,
+                "messages": [{"role": "user", "content": marker}],
+                "stream": stream,
+                **_tools_for(kind, _CLAUDE_TOOL),
+            },
+            marker,
+            kind,
+        )
+    if family == 2:
+        return _Call(
+            "/v1/responses",
+            {"model": rig.chat, "input": marker, "stream": stream, **_tools_for(kind, _RESPONSES_TOOL)},
+            marker,
+            kind,
+        )
+    action: Final = "streamGenerateContent?alt=sse" if stream else "generateContent"
+    return _Call(
+        f"/v1beta/models/{rig.gemini}:{action}",
+        {"contents": [{"role": "user", "parts": [{"text": marker}]}], **_tools_for(kind, _GEMINI_TOOL)},
+        marker,
+        kind,
+    )
+
+
+def _kind(index: int) -> Kind:
+    kinds: Final[tuple[Kind, ...]] = ("valid", "rejected", "dropped")
+    return kinds[index % 3]
+
+
+def _clients(stack: ExitStack, base_url: str, count: int) -> tuple[httpx.Client, ...]:
+    return tuple(
+        stack.enter_context(httpx.Client(base_url=base_url, timeout=120, trust_env=False)) for _ in range(count)
+    )
+
+
+def _post(client: httpx.Client, key: str, call: _Call) -> httpx.Response:
+    return client.post(call.path, json=call.body, headers={"Authorization": f"Bearer {key}"})
+
+
+def _status_or_dropped(client: httpx.Client, key: str, call: _Call) -> int | None:
+    try:
+        return _post(client, key, call).status_code
+    except httpx.TransportError:
+        return None
+
+
+def _deliveries(wire: Wire) -> tuple[str, ...]:
+    return tuple(request.body.decode() for request in wire.drain())
+
+
+def _seen(deliveries: tuple[str, ...], marker: str) -> int:
+    return sum(marker in body for body in deliveries)
+
+
+def _delivered_tool_names(deliveries: tuple[str, ...], marker: str) -> tuple[str, ...]:
+    (body,) = tuple(body for body in deliveries if marker in body)
+    return tuple(re.findall(r'"name": ?"([a-z_]+)"', body))
+
+
+def _assert_wave(calls: tuple[_Call, ...], statuses: tuple[int | None, ...], deliveries: tuple[str, ...]) -> None:
+    expected_statuses: Final = tuple(400 if call.kind == "rejected" else 200 for call in calls)
+    assert statuses == expected_statuses, tuple(zip(statuses, (call.marker for call in calls), strict=True))
+    seen: Final = tuple(_seen(deliveries, call.marker) for call in calls)
+    assert seen == tuple(0 if call.kind == "rejected" else 1 for call in calls), seen
+    names: Final = tuple(_delivered_tool_names(deliveries, call.marker) for call in calls if call.kind != "rejected")
+    assert all("get_weather" in found for found in names), names
+
+
+def test_mixed_burst_rejects_malformed_tools_and_forwards_the_rest_once(rig: _Rig) -> None:
+    with ExitStack() as stack:
+        calls: Final = tuple(_call(rig, index, _kind(index), "burst") for index in range(40))
+        clients: Final = _clients(stack, str(rig.gateway.client.base_url), len(calls))
+        pool: Final = stack.enter_context(ThreadPoolExecutor(max_workers=len(calls)))
+        statuses: Final = tuple(
+            pool.map(
+                lambda pair: _status_or_dropped(pair[0], rig.gateway.key, pair[1]), zip(clients, calls, strict=True)
+            )
+        )
+        _assert_wave(calls, statuses, _deliveries(rig.wire))
+
+
+def test_upstream_outage_still_rejects_malformed_tools_and_recovers(rig: _Rig) -> None:
+    with ExitStack() as stack:
+        clients: Final = _clients(stack, str(rig.gateway.client.base_url), 12)
+        pool: Final = stack.enter_context(ThreadPoolExecutor(max_workers=len(clients)))
+
+        def wave(label: str) -> tuple[tuple[_Call, ...], tuple[int | None, ...]]:
+            calls: Final = tuple(_call(rig, index, _kind(index), label) for index in range(len(clients)))
+            statuses: Final = tuple(
+                pool.map(
+                    lambda pair: _status_or_dropped(pair[0], rig.gateway.key, pair[1]), zip(clients, calls, strict=True)
+                )
+            )
+            return calls, statuses
+
+        before_calls, before_statuses = wave("before outage")
+        _assert_wave(before_calls, before_statuses, _deliveries(rig.wire))
+        rig.switchboard.down.set()
+        outage_calls, outage_statuses = wave("during outage")
+        for call, status in zip(outage_calls, outage_statuses, strict=True):
+            assert (status == 400) if call.kind == "rejected" else (status is not None and status >= 500), (
+                call.kind,
+                status,
+            )
+        assert rig.gateway.request("GET", "/health/liveliness").status_code == 200
+        rig.wire.drain()
+        rig.switchboard.down.clear()
+        after_calls, after_statuses = wave("after outage")
+        _assert_wave(after_calls, after_statuses, _deliveries(rig.wire))
+
+
+def test_held_upstream_does_not_delay_malformed_tools_rejections(rig: _Rig) -> None:
+    with ExitStack() as stack:
+        held_calls: Final = tuple(_call(rig, index * 4, "valid", "held") for index in range(8))
+        rejected_calls: Final = tuple(_call(rig, index, "rejected", "rejected") for index in range(8))
+        clients: Final = _clients(stack, str(rig.gateway.client.base_url), len(held_calls) + len(rejected_calls))
+        pool: Final = stack.enter_context(ThreadPoolExecutor(max_workers=len(clients)))
+        rig.switchboard.release.clear()
+        rig.switchboard.holding.set()
+        stack.callback(rig.switchboard.release.set)
+        pending: Final[tuple[Future[int | None], ...]] = tuple(
+            pool.submit(_status_or_dropped, client, rig.gateway.key, call)
+            for client, call in zip(clients[: len(held_calls)], held_calls, strict=True)
+        )
+        eventually(rig.switchboard.held.qsize, lambda size: size == len(held_calls), seconds=60)
+        rejected: Final = tuple(
+            pool.map(
+                lambda pair: _status_or_dropped(pair[0], rig.gateway.key, pair[1]),
+                zip(clients[len(held_calls) :], rejected_calls, strict=True),
+            )
+        )
+        assert rejected == (400,) * len(rejected_calls), rejected
+        assert not any(future.done() for future in pending), "a held request finished before its release"
+        rig.switchboard.release.set()
+        assert tuple(future.result(timeout=120) for future in pending) == (200,) * len(held_calls)
+        deliveries: Final = _deliveries(rig.wire)
+        assert tuple(_seen(deliveries, call.marker) for call in held_calls) == (1,) * len(held_calls)
+        assert tuple(_seen(deliveries, call.marker) for call in rejected_calls) == (0,) * len(rejected_calls)
+
+
+@dataclass(frozen=True, slots=True)
+class _Owned:
+    proxy: OwnedProxy
+    wire: Wire
+    held: SimpleQueue[str]
+    holding: threading.Event
+    release: threading.Event
+    blocked_tool: str
+    denied_tool: str
+
+
+def _owned_config(path: Path, upstream: str, denied_tool: str) -> Path:
+    path.write_text(
+        json.dumps(
+            {
+                "model_list": [
+                    {
+                        "model_name": _OWNED_CHAT,
+                        "litellm_params": {
+                            "model": f"openai/{_OPENAI_BACKEND}",
+                            "api_base": f"{upstream}/v1",
+                            "api_key": _PROVIDER_KEY,
+                        },
+                    }
+                ],
+                "general_settings": {
+                    "master_key": "os.environ/LITELLM_MASTER_KEY",
+                    "database_url": "os.environ/DATABASE_URL",
+                },
+                "litellm_settings": {"drop_params": True},
+                "router_settings": {"disable_cooldowns": True},
+                "guardrails": [
+                    {
+                        "guardrail_name": "malformed-tools-policy",
+                        "litellm_params": {"guardrail": "tool_policy", "mode": "pre_call", "default_on": True},
+                    },
+                    {
+                        "guardrail_name": "malformed-tools-permission",
+                        "litellm_params": {
+                            "guardrail": "tool_permission",
+                            "mode": "pre_call",
+                            "default_on": False,
+                            "default_action": "allow",
+                            "on_disallowed_action": "block",
+                            "rules": [{"id": "deny_tool", "tool_name": f"^{denied_tool}$", "decision": "deny"}],
+                        },
+                    },
+                ],
+                "vector_store_registry": [
+                    {
+                        "vector_store_name": "malformed-tools-owned-store",
+                        "litellm_params": {
+                            "vector_store_id": _OWNED_STORE,
+                            "custom_llm_provider": "openai",
+                            "api_base": upstream,
+                            "api_key": _PROVIDER_KEY,
+                        },
+                    }
+                ],
+            }
+        )
+    )
+    return path
+
+
+@pytest.fixture(scope="module")
+def owned(tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Owned]:
+    suffix: Final = uuid.uuid4().hex[:12]
+    blocked_tool: Final = f"wipe_disk_{suffix}"
+    denied_tool: Final = f"run_shell_{suffix}"
+    held: Final[SimpleQueue[str]] = SimpleQueue()
+    holding: Final = threading.Event()
+    release: Final = threading.Event()
+
+    def respond(request: Request) -> Reply:
+        if holding.is_set():
+            held.put(request.target)
+            assert release.wait(timeout=120), "Held request was never released"
+        return _scripted(request)
+
+    directory: Final = tmp_path_factory.mktemp("malformed-tools-owned")
+    with ExitStack() as stack:
+        gateway: Final = stack.enter_context(gateway_from_environment())
+        policy: Final = gateway.request(
+            "POST", "/v1/tool/policy", {"tool_name": blocked_tool, "input_policy": "blocked"}
+        )
+        assert policy.status_code == 200, policy.text
+        stack.callback(write_rows, 'DELETE FROM "LiteLLM_ToolTable" WHERE tool_name = %s', (blocked_tool,))
+        wire: Final = stack.enter_context(wire_server(respond))
+        stack.callback(release.set)
+        proxy: Final = stack.enter_context(
+            owned_proxy_process(
+                gateway,
+                directory,
+                {"ANTHROPIC_API_BASE": wire.url, "ANTHROPIC_API_KEY": _PROVIDER_KEY},
+                config=_owned_config(directory / "malformed-tools.yaml", wire.url, denied_tool),
+                workers=2,
+            )
+        )
+        yield _Owned(proxy, wire, held, holding, release, blocked_tool, denied_tool)
+
+
+def _owned_chat(owned: _Owned, marker: str, **fields: JsonValue) -> httpx.Response:
+    return owned.proxy.gateway.request(
+        "POST",
+        "/v1/chat/completions",
+        {"model": _OWNED_CHAT, "messages": [{"role": "user", "content": marker}], **fields},
+    )
+
+
+def _named_tool(name: str) -> dict[str, JsonValue]:
+    return {"type": "function", "function": {"name": name, "parameters": _WEATHER_SCHEMA}}
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_global_drop_params_wins_over_an_explicit_request_false(owned: _Owned) -> None:
+    marker: Final = _marker("global drop")
+    response: Final = _owned_chat(owned, marker, tools=5, drop_params=False)
+    assert response.status_code == 200, response.text
+    assert _answer(_tag(marker)) in response.text, response.text
+    (sent,) = tuple(request for request in owned.wire.drain() if marker in request.body.decode())
+    assert "tools" not in _JSON_OBJECT.validate_json(sent.body), sent.body
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_tool_policy_still_blocks_a_tool_kept_beside_a_dropped_entry(owned: _Owned) -> None:
+    marker: Final = _marker("tool policy")
+    response: Final = _owned_chat(owned, marker, tools=[_named_tool(owned.blocked_tool), 5])
+    assert response.status_code == 400, response.text
+    assert "Violated tool policy" in response.text and owned.blocked_tool in response.text, response.text
+    assert tuple(request for request in owned.wire.drain() if marker in request.body.decode()) == ()
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_tool_permission_still_denies_a_tool_kept_beside_a_dropped_entry(owned: _Owned) -> None:
+    marker: Final = _marker("tool permission")
+    response: Final = _owned_chat(
+        owned, marker, tools=[_named_tool(owned.denied_tool), "x"], guardrails=["malformed-tools-permission"]
+    )
+    assert response.status_code == 400, response.text
+    assert "Violated guardrail policy" in response.text and owned.denied_tool in response.text, response.text
+    assert tuple(request for request in owned.wire.drain() if marker in request.body.decode()) == ()
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_anthropic_pass_through_forwards_malformed_tools_unchanged(owned: _Owned) -> None:
+    marker: Final = _marker("pass-through")
+    body: Final[dict[str, JsonValue]] = {
+        "model": _CLAUDE_BACKEND,
+        "max_tokens": 16,
+        "messages": [{"role": "user", "content": marker}],
+        "tools": 5,
+    }
+    response: Final = owned.proxy.gateway.request("POST", "/anthropic/v1/messages", body)
+    assert response.status_code == 400, response.text
+    assert _JSON_OBJECT.validate_json(response.content) == _JSON_OBJECT.validate_json(error_body(400, _NOT_A_LIST))
+    (sent,) = tuple(request for request in owned.wire.drain() if marker in request.body.decode())
+    assert sent.target == "/v1/messages", sent.target
+    assert _JSON_OBJECT.validate_json(sent.body) == body, sent.body
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_anthropic_pass_through_streams_well_formed_tools(owned: _Owned) -> None:
+    marker: Final = _marker("pass-through stream")
+    body: Final[dict[str, JsonValue]] = {
+        "model": _CLAUDE_BACKEND,
+        "max_tokens": 16,
+        "messages": [{"role": "user", "content": marker}],
+        "tools": [_CLAUDE_TOOL],
+        "stream": True,
+    }
+    response: Final = owned.proxy.gateway.request("POST", "/anthropic/v1/messages", body)
+    assert response.status_code == 200, response.text
+    assert response.content == b"".join(message_stream(f"msg_{_tag(marker)}", _CLAUDE_BACKEND, _answer(_tag(marker))))
+    (sent,) = tuple(request for request in owned.wire.drain() if marker in request.body.decode())
+    assert _JSON_OBJECT.validate_json(sent.body) == body, sent.body
+
+
+def _local_port(client: httpx.Client) -> int:
+    with client.stream("GET", "/health/liveliness") as response:
+        port: Final = int(response.extensions["network_stream"].get_extra_info("client_addr")[1])
+        response.read()
+    assert response.status_code == 200, response.text
+    return port
+
+
+def _accepted_client_ports(pid: int, proxy_port: int) -> frozenset[int]:
+    return frozenset(
+        connection.raddr.port
+        for connection in psutil.Process(pid).net_connections(kind="tcp")
+        if connection.raddr and connection.laddr.port == proxy_port
+    )
+
+
+def _owned_call(index: int, label: str) -> _Call:
+    marker: Final = _marker(label)
+    tools: Final[JsonValue] = [_CHAT_TOOL, 5] if index % 2 else [_CHAT_TOOL]
+    return _Call(
+        "/v1/chat/completions",
+        {
+            "model": _OWNED_CHAT,
+            "messages": [{"role": "user", "content": marker}],
+            "stream": index % 4 == 1,
+            "tools": tools,
+        },
+        marker,
+        "dropped" if index % 2 else "valid",
+    )
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_worker_sigkill_mid_burst_leaves_the_replacement_dropping_bad_entries(owned: _Owned) -> None:
+    proxy_url: Final = owned.proxy.gateway.client.base_url
+    workers: Final = eventually(
+        lambda: tuple(int(pid) for pid in _STARTED_WORKER.findall(owned.proxy.log.read_text())),
+        lambda pids: len(pids) >= 2,
+        seconds=30,
+    )
+    started_before: Final = len(workers)
+    serving: Final = owned.proxy.worker_pids()
+    owned.wire.drain()
+    with ExitStack() as stack:
+        clients: Final = _clients(stack, str(proxy_url), 12)
+        pool: Final = stack.enter_context(ThreadPoolExecutor(max_workers=len(clients)))
+        ports: Final = tuple(_local_port(client) for client in clients)
+        calls: Final = tuple(_owned_call(index, "worker kill") for index in range(len(clients)))
+        owned.release.clear()
+        owned.holding.set()
+        stack.callback(owned.holding.clear)
+        stack.callback(owned.release.set)
+        futures: Final = tuple(
+            pool.submit(_status_or_dropped, client, owned.proxy.gateway.key, call)
+            for client, call in zip(clients, calls, strict=True)
+        )
+        eventually(owned.held.qsize, lambda size: size == len(clients), seconds=60)
+        shares: Final = {pid: _accepted_client_ports(pid, proxy_url.port or 0) & frozenset(ports) for pid in serving}
+        assert sum(map(len, shares.values())) == len(clients), shares
+        victim: Final = min((pid for pid in serving if shares[pid]), key=lambda pid: len(shares[pid]))
+        with owned.proxy.replacing_worker(victim) as kill:
+            kill()
+            owned.holding.clear()
+            owned.release.set()
+            results: Final = tuple(future.result(timeout=120) for future in futures)
+            for port, result in zip(ports, results, strict=True):
+                assert result == (None if port in shares[victim] else 200), (port, result, shares)
+        eventually(
+            lambda: len(_STARTED_WORKER.findall(owned.proxy.log.read_text())),
+            lambda started: started > started_before,
+            _RESPAWN_SECONDS,
+        )
+        second_wave: Final = tuple(_owned_call(index * 2 + 1, "after kill") for index in range(6))
+        (fresh,) = _clients(stack, str(proxy_url), 1)
+        assert tuple(_post(fresh, owned.proxy.gateway.key, call).status_code for call in second_wave) == (200,) * len(
+            second_wave
+        )
+        deliveries: Final = _deliveries(owned.wire)
+        everything: Final = calls + second_wave
+        assert tuple(_seen(deliveries, call.marker) for call in everything) == (1,) * len(everything)
+        assert tuple(_delivered_tool_names(deliveries, call.marker) for call in everything) == (
+            ("get_weather",),
+        ) * len(everything)
+        assert owned.proxy.process.poll() is None
diff --git a/tests/integration/providers/test_malformed_tools_wire.py b/tests/integration/providers/test_malformed_tools_wire.py
new file mode 100644
index 00000000000..25a86f7fc7c
--- /dev/null
+++ b/tests/integration/providers/test_malformed_tools_wire.py
@@ -0,0 +1,2731 @@
+from __future__ import annotations
+
+import asyncio
+import http.client
+import json
+import os
+import re
+import uuid
+from collections.abc import Callable, Iterator, Mapping
+from contextlib import contextmanager
+from dataclasses import dataclass, replace
+from itertools import chain, product
+from pathlib import Path
+from types import MappingProxyType
+from typing import Final
+
+import anthropic
+import httpx
+import openai
+import pytest
+from google import genai
+from google.genai import types
+from integration._support.anthropic_sse import error_body, message_json, message_stream
+from integration._support.client import (
+    Gateway,
+    Scenario,
+    eventually,
+    gateway_from_environment,
+    held,
+    object_value,
+    string_value,
+)
+from integration._support.database import read_rows
+from integration._support.openai_wire import chat_reply, openai_error, responses_reply
+from integration._support.process import graceful_stop_seconds, owned_proxy_process
+from integration._support.responses_vendor import same_response
+from integration._support.wire import Reply, Request, Wire, wire_server
+from integration._support.worker_readiness import wait_for_worker_readiness
+from integration.authorization._guardrail_opt_out import upstream_observations
+from pydantic import JsonValue, TypeAdapter
+
+from tests.integration.caching.response_cache_case import await_entry, redis_store
+
+_OPENAI_BACKEND: Final = "gpt-4o-mini"
+_CLAUDE_BACKEND: Final = "claude-haiku-4-5"
+_GEMINI_BACKEND: Final = "gemini-2.5-flash"
+_PROVIDER_KEY: Final = "scripted-malformed-tools-key"
+_COUNT: Final = 37
+_CONFIG_STORE: Final = "vs_integration_config_store"
+_OTHER_STORE: Final = "vs_malformed_tools_other_store"
+_CLAUDE_CODE_AGENT: Final = "claude-cli/2.1.0 (external, cli)"
+_CODEX_AGENT: Final = "codex_cli_rs/0.50.0 (Linux 6.8; x86_64) xterm-256color"
+_REJECT_MARK: Final = "upstream-401"
+_DOWN: Final = "/down/"
+_REFUSALS: Final = MappingProxyType(
+    {
+        "context_window_fallbacks": (
+            "/context-full/",
+            {
+                "message": "This model's maximum context length is 8192 tokens.",
+                "type": "invalid_request_error",
+                "param": "messages",
+                "code": "context_length_exceeded",
+            },
+        ),
+        "content_policy_fallbacks": (
+            "/content-policy/",
+            {
+                "message": "Your request was rejected as a result of our safety system.",
+                "type": "invalid_request_error",
+                "param": None,
+                "code": "content_policy_violation",
+            },
+        ),
+    }
+)
+_MARKER: Final = re.compile(r"marker-([0-9a-f]{32})")
+_PROXY_WORKERS: Final = max(1, int(os.environ.get("INTEGRATION_PROXY_WORKERS", "1")))
+_JSON_OBJECT: Final = TypeAdapter(dict[str, JsonValue])
+_SPEND_ROWS: Final = (
+    'SELECT call_type, status, cache_hit FROM "LiteLLM_SpendLogs" WHERE request_id = %s OR litellm_call_id = %s'
+)
+_NOT_A_LIST: Final = "tools: Input should be a valid list"
+_NOT_AN_OBJECT: Final = "tools.0: Input should be a valid dictionary"
+_SECOND_NOT_AN_OBJECT: Final = "tools.1: Input should be a valid dictionary"
+_OWNED_PROXY_CELL_SECONDS: Final = 2 * graceful_stop_seconds() + 120
+_TOOL_FIELDS: Final = ("tools", "tool_choice", "parallel_tool_calls", "toolConfig", "tool_config")
+_WEATHER_SCHEMA: Final[dict[str, JsonValue]] = {
+    "type": "object",
+    "properties": {"city": {"type": "string"}},
+    "required": ["city"],
+}
+
+
+def _marker() -> str:
+    return f"marker-{uuid.uuid4().hex}"
+
+
+def _tag(text: str) -> str:
+    found: Final = _MARKER.search(text)
+    return found.group(1) if found else "none"
+
+
+def _answer(tag: str) -> str:
+    return f"answer {tag}"
+
+
+def _gemini_body(tag: str) -> dict[str, JsonValue]:
+    return {
+        "responseId": f"gemini-{tag}-{uuid.uuid4().hex}",
+        "candidates": [
+            {"content": {"role": "model", "parts": [{"text": _answer(tag)}]}, "index": 0, "finishReason": "STOP"}
+        ],
+        "usageMetadata": {"promptTokenCount": 9, "candidatesTokenCount": 2, "totalTokenCount": 11},
+        "modelVersion": _GEMINI_BACKEND,
+    }
+
+
+def _interaction_body(tag: str) -> dict[str, JsonValue]:
+    return {
+        "id": f"interaction-{tag}",
+        "object": "interaction",
+        "model": _GEMINI_BACKEND,
+        "status": "completed",
+        "created": "2026-10-15T00:00:00Z",
+        "steps": [{"type": "content", "content": {"type": "text", "text": _answer(tag)}}],
+        "usage": {"total_tokens": 11},
+    }
+
+
+def _rejected_by_provider(path: str) -> Reply:
+    if path.startswith("/v1/messages"):
+        return Reply(status=401, body=error_body(401, "scripted 401"))
+    if path == "/v1beta/interactions":
+        return Reply(
+            status=401,
+            body=json.dumps({"error": {"code": 401, "message": "scripted 401", "status": "UNAUTHENTICATED"}}).encode(),
+        )
+    return openai_error(401)
+
+
+def _unavailable(path: str) -> Reply:
+    if "/v1/messages" in path:
+        return Reply(status=503, body=error_body(503, "scripted outage"))
+    return openai_error(503)
+
+
+def _respond(request: Request) -> Reply:
+    text: Final = request.body.decode()
+    tag: Final = _tag(text)
+    path: Final = request.target.split("?")[0]
+    if path.startswith(_DOWN):
+        return _unavailable(path)
+    refusal: Final = next((error for prefix, error in _REFUSALS.values() if path.startswith(prefix)), None)
+    if refusal is not None:
+        return Reply(status=400, body=json.dumps({"error": refusal}).encode())
+    if _REJECT_MARK in text:
+        return _rejected_by_provider(path)
+    stream: Final = bool(text) and _JSON_OBJECT.validate_json(request.body).get("stream") is True
+    if path == "/v1/chat/completions":
+        return chat_reply(f"chatcmpl-{tag}", _OPENAI_BACKEND, _answer(tag), stream=stream)
+    if path == "/v1/responses":
+        return responses_reply(f"resp_{tag}", _OPENAI_BACKEND, _answer(tag), stream=stream)
+    if path == "/v1/messages/count_tokens":
+        return Reply(body=json.dumps({"input_tokens": _COUNT}).encode())
+    if path == "/v1/messages" and stream:
+        return Reply(
+            content_type="text/event-stream", chunks=message_stream(f"msg_{tag}", _CLAUDE_BACKEND, _answer(tag))
+        )
+    if path == "/v1/messages":
+        return Reply(body=message_json(f"msg_{tag}", _CLAUDE_BACKEND, _answer(tag)))
+    if path.endswith(":streamGenerateContent"):
+        return Reply(
+            content_type="text/event-stream", chunks=(f"data: {json.dumps(_gemini_body(tag))}\r\n\r\n".encode(),)
+        )
+    if path.endswith(":generateContent"):
+        return Reply(body=json.dumps(_gemini_body(tag)).encode())
+    if path == "/v1beta/interactions":
+        return Reply(body=json.dumps(_interaction_body(tag)).encode())
+    return Reply(status=404, body=json.dumps({"error": f"unscripted {request.target}"}).encode())
+
+
+@dataclass(frozen=True, slots=True)
+class _Rig:
+    gateway: Gateway
+    wire: Wire
+    openai: str
+    anthropic: str
+    gemini: str
+    drop_group: str
+    gemini_drop_group: str
+    mixed_group: str
+    field_group: str
+    tools_drop_group: str
+
+
+def _deployment_ids(scenario: Scenario, name: str, deployments: tuple[dict[str, JsonValue], ...]) -> tuple[str, ...]:
+    created: Final = tuple(
+        scenario.gateway.post("/model/new", {"model_name": name, "litellm_params": params, "model_info": {}})
+        for params in deployments
+    )
+    identities: Final = tuple(string_value(object_value(deployment["model_info"])["id"]) for deployment in created)
+    for identity in identities:
+        scenario.cleanups.callback(scenario.delete_model, identity)
+    return identities
+
+
+def _same_name_deployments(scenario: Scenario, api_base: str, variants: tuple[Mapping[str, JsonValue], ...]) -> str:
+    name: Final = f"integration-mixed-{uuid.uuid4().hex}"
+    _deployment_ids(
+        scenario,
+        name,
+        tuple(
+            {"model": f"openai/{_OPENAI_BACKEND}", "api_key": _PROVIDER_KEY, "api_base": api_base, **variant}
+            for variant in variants
+        ),
+    )
+    return name
+
+
+@pytest.fixture(scope="module")
+def rig() -> Iterator[_Rig]:
+    with gateway_from_environment() as gateway, wire_server(_respond) as wire, gateway.scenario() as scenario:
+        openai_base: Final = f"{wire.url}/v1"
+        built: Final = _Rig(
+            gateway=gateway,
+            wire=wire,
+            openai=scenario.model(api_base=openai_base, api_key=_PROVIDER_KEY),
+            anthropic=scenario.model(model=f"anthropic/{_CLAUDE_BACKEND}", api_base=wire.url, api_key=_PROVIDER_KEY),
+            gemini=scenario.model(model=f"gemini/{_GEMINI_BACKEND}", api_base=wire.url, api_key=_PROVIDER_KEY),
+            drop_group=scenario.model(api_base=openai_base, api_key=_PROVIDER_KEY, drop_params=True),
+            gemini_drop_group=scenario.model(
+                model=f"gemini/{_GEMINI_BACKEND}", api_base=wire.url, api_key=_PROVIDER_KEY, drop_params=True
+            ),
+            mixed_group=_same_name_deployments(scenario, openai_base, ({"drop_params": True}, {})),
+            field_group=scenario.model(api_base=openai_base, api_key=_PROVIDER_KEY, additional_drop_params=["tools"]),
+            tools_drop_group=scenario.model(
+                api_base=openai_base, api_key=_PROVIDER_KEY, drop_params=True, tools=[CHAT.tool]
+            ),
+        )
+        for group, deployments in (
+            (built.openai, 1),
+            (built.anthropic, 1),
+            (built.gemini, 1),
+            (built.drop_group, 1),
+            (built.gemini_drop_group, 1),
+            (built.mixed_group, 2),
+            (built.field_group, 1),
+            (built.tools_drop_group, 1),
+        ):
+            wait_for_worker_readiness(gateway, group, deployments, _PROXY_WORKERS)
+        yield built
+
+
+@pytest.fixture(autouse=True)
+def _drained(rig: _Rig) -> None:
+    rig.wire.drain()
+
+
+@dataclass(frozen=True, slots=True)
+class _FieldGroups:
+    anthropic: str
+    gemini: str
+
+
+@pytest.fixture(scope="module")
+def field_groups(rig: _Rig) -> Iterator[_FieldGroups]:
+    with rig.gateway.scenario() as scenario:
+        built: Final = _FieldGroups(
+            anthropic=scenario.model(
+                model=f"anthropic/{_CLAUDE_BACKEND}",
+                api_base=rig.wire.url,
+                api_key=_PROVIDER_KEY,
+                additional_drop_params=["tools"],
+            ),
+            gemini=scenario.model(
+                model=f"gemini/{_GEMINI_BACKEND}",
+                api_base=rig.wire.url,
+                api_key=_PROVIDER_KEY,
+                additional_drop_params=["tools"],
+            ),
+        )
+        for group in (built.anthropic, built.gemini):
+            wait_for_worker_readiness(rig.gateway, group, 1, _PROXY_WORKERS)
+        yield built
+
+
+@pytest.fixture(scope="module")
+def limited_key(rig: _Rig) -> Iterator[str]:
+    with rig.gateway.scenario() as scenario:
+        yield scenario.key(rpm_limit=0)
+
+
+@dataclass(frozen=True, slots=True)
+class _Family:
+    name: str
+    tool: dict[str, JsonValue]
+    model: Callable[[_Rig], str]
+    path: Callable[[str, bool], str]
+    body: Callable[[str, str, bool], dict[str, JsonValue]]
+    target: Callable[[bool], str]
+    call_type: Callable[[bool], str]
+    upstream_id: Callable[[str], str | None]
+    tool_choice: tuple[str, JsonValue]
+    exact_tools: bool
+
+
+def _chat_body(model: str, marker: str, stream: bool) -> dict[str, JsonValue]:
+    return {"model": model, "messages": [{"role": "user", "content": marker}], "stream": stream}
+
+
+def _messages_body(model: str, marker: str, stream: bool) -> dict[str, JsonValue]:
+    return {"model": model, "max_tokens": 16, "messages": [{"role": "user", "content": marker}], "stream": stream}
+
+
+def _responses_body(model: str, marker: str, stream: bool) -> dict[str, JsonValue]:
+    return {"model": model, "input": marker, "stream": stream}
+
+
+def _generate_body(model: str, marker: str, stream: bool) -> dict[str, JsonValue]:
+    return {"contents": [{"role": "user", "parts": [{"text": marker}]}]}
+
+
+def _generate_path(model: str, stream: bool) -> str:
+    return (
+        f"/v1beta/models/{model}:streamGenerateContent?alt=sse" if stream else f"/v1beta/models/{model}:generateContent"
+    )
+
+
+CHAT: Final = _Family(
+    name="chat",
+    tool={
+        "type": "function",
+        "function": {"name": "get_weather", "description": "Look up the weather", "parameters": _WEATHER_SCHEMA},
+    },
+    model=lambda rig: rig.openai,
+    path=lambda model, stream: "/v1/chat/completions",
+    body=_chat_body,
+    target=lambda stream: "/v1/chat/completions",
+    call_type=lambda stream: "acompletion",
+    upstream_id=lambda tag: f"chatcmpl-{tag}",
+    tool_choice=("tool_choice", {"type": "function", "function": {"name": "get_weather"}}),
+    exact_tools=True,
+)
+MESSAGES: Final = _Family(
+    name="messages",
+    tool={"name": "get_weather", "description": "Look up the weather", "input_schema": _WEATHER_SCHEMA},
+    model=lambda rig: rig.anthropic,
+    path=lambda model, stream: "/v1/messages",
+    body=_messages_body,
+    target=lambda stream: "/v1/messages",
+    call_type=lambda stream: "anthropic_messages",
+    upstream_id=lambda tag: f"msg_{tag}",
+    tool_choice=("tool_choice", {"type": "tool", "name": "get_weather"}),
+    exact_tools=True,
+)
+RESPONSES: Final = _Family(
+    name="responses",
+    tool={
+        "type": "function",
+        "name": "get_weather",
+        "description": "Look up the weather",
+        "parameters": _WEATHER_SCHEMA,
+    },
+    model=lambda rig: rig.openai,
+    path=lambda model, stream: "/v1/responses",
+    body=_responses_body,
+    target=lambda stream: "/v1/responses",
+    call_type=lambda stream: "aresponses",
+    upstream_id=lambda tag: None,
+    tool_choice=("tool_choice", {"type": "function", "name": "get_weather"}),
+    exact_tools=True,
+)
+GENERATE: Final = _Family(
+    name="generate_content",
+    tool={
+        "functionDeclarations": [
+            {"name": "get_weather", "description": "Look up the weather", "parameters": _WEATHER_SCHEMA}
+        ]
+    },
+    model=lambda rig: rig.gemini,
+    path=_generate_path,
+    body=_generate_body,
+    target=lambda stream: ":streamGenerateContent" if stream else ":generateContent",
+    call_type=lambda stream: "agenerate_content_stream" if stream else "agenerate_content",
+    upstream_id=lambda tag: None,
+    tool_choice=("toolConfig", {"functionCallingConfig": {"mode": "ANY", "allowedFunctionNames": ["get_weather"]}}),
+    exact_tools=False,
+)
+_FAMILIES: Final = (CHAT, MESSAGES, RESPONSES, GENERATE)
+_FAMILY_IDS: Final = tuple(family.name for family in _FAMILIES)
+_STREAMS: Final = pytest.mark.parametrize("stream", [False, True], ids=["non_stream", "stream"])
+_EACH_FAMILY: Final = pytest.mark.parametrize("family", _FAMILIES, ids=_FAMILY_IDS)
+
+
+@dataclass(frozen=True, slots=True)
+class _Route:
+    path: Callable[[str], str]
+    body: Callable[[str, str], dict[str, JsonValue]]
+    model: Callable[[_Rig], str]
+
+
+_ROUTES: Final[Mapping[str, _Route]] = MappingProxyType(
+    {
+        "chat": _Route(lambda model: "/v1/chat/completions", lambda m, k: _chat_body(m, k, False), CHAT.model),
+        "chat_unversioned": _Route(lambda model: "/chat/completions", lambda m, k: _chat_body(m, k, False), CHAT.model),
+        "chat_azure_alias": _Route(
+            lambda model: f"/openai/deployments/{model}/chat/completions",
+            lambda m, k: _chat_body(m, k, False),
+            CHAT.model,
+        ),
+        "chat_stream": _Route(lambda model: "/v1/chat/completions", lambda m, k: _chat_body(m, k, True), CHAT.model),
+        "messages": _Route(lambda model: "/v1/messages", lambda m, k: _messages_body(m, k, False), MESSAGES.model),
+        "messages_stream": _Route(
+            lambda model: "/v1/messages", lambda m, k: _messages_body(m, k, True), MESSAGES.model
+        ),
+        "responses": _Route(lambda model: "/v1/responses", lambda m, k: _responses_body(m, k, False), RESPONSES.model),
+        "responses_stream": _Route(
+            lambda model: "/v1/responses", lambda m, k: _responses_body(m, k, True), RESPONSES.model
+        ),
+        "responses_compact": _Route(
+            lambda model: "/v1/responses/compact", lambda m, k: {"model": m, "input": k}, RESPONSES.model
+        ),
+        "generate_content": _Route(
+            lambda model: _generate_path(model, False), lambda m, k: _generate_body(m, k, False), GENERATE.model
+        ),
+        "stream_generate_content": _Route(
+            lambda model: _generate_path(model, True), lambda m, k: _generate_body(m, k, True), GENERATE.model
+        ),
+        "interactions": _Route(
+            lambda model: "/v1beta/interactions", lambda m, k: {"model": m, "input": k}, lambda rig: rig.gemini
+        ),
+    }
+)
+_MALFORMED_TOOLS: Final[Mapping[str, tuple[JsonValue, str]]] = MappingProxyType(
+    {
+        "int": (5, _NOT_A_LIST),
+        "empty_string": ("", _NOT_A_LIST),
+        "five_kb_string": ("x" * 5120, _NOT_A_LIST),
+        "list_of_names": (["get_weather"], _NOT_AN_OBJECT),
+        "empty_object": ({}, _NOT_A_LIST),
+        "false": (False, _NOT_A_LIST),
+        "zero": (0, _NOT_A_LIST),
+    }
+)
+_MALFORMED_ENTRIES: Final[Mapping[str, tuple[JsonValue, str]]] = MappingProxyType(
+    {
+        "int_entry": (5, _NOT_AN_OBJECT),
+        "string_function": (
+            {"type": "function", "function": "get_weather"},
+            "tools.0.function: Input should be a valid dictionary",
+        ),
+        "string_function_parameters": (
+            {"type": "function", "function": {"name": "get_weather", "parameters": "bad"}},
+            "tools.0.function.parameters: Input should be a valid dictionary",
+        ),
+        "list_input_schema": (
+            {"name": "get_weather", "input_schema": [1]},
+            "tools.0.input_schema: Input should be a valid dictionary",
+        ),
+        "int_parameters": (
+            {"type": "function", "name": "get_weather", "parameters": 5},
+            "tools.0.parameters: Input should be a valid dictionary",
+        ),
+        "string_vector_store_ids": (
+            {"type": "file_search", "vector_store_ids": _OTHER_STORE},
+            "tools.0.vector_store_ids: Input should be a valid list",
+        ),
+    }
+)
+
+
+def _send(
+    rig: _Rig,
+    family: _Family,
+    marker: str,
+    stream: bool,
+    *,
+    model: str | None = None,
+    key: str | None = None,
+    call_id: str | None = None,
+    user_agent: str | None = None,
+    **fields: JsonValue,
+) -> httpx.Response:
+    chosen: Final = model or family.model(rig)
+    headers: Final = {
+        **({"x-litellm-call-id": call_id} if call_id else {}),
+        **({"user-agent": user_agent} if user_agent else {}),
+    }
+    return rig.gateway.request(
+        "POST", family.path(chosen, stream), {**family.body(chosen, marker, stream), **fields}, key=key, headers=headers
+    )
+
+
+def _delivered(rig: _Rig, marker: str) -> tuple[Request, ...]:
+    return tuple(request for request in rig.wire.drain() if marker in request.body.decode())
+
+
+def _one_delivery(rig: _Rig, marker: str, target: str) -> dict[str, JsonValue]:
+    (sent,) = _delivered(rig, marker)
+    assert sent.method == "POST" and target in sent.target, sent.target
+    return _JSON_OBJECT.validate_json(sent.body)
+
+
+def _tool_names(family: _Family, body: Mapping[str, JsonValue]) -> tuple[str, ...]:
+    tools: Final = body.get("tools")
+    if not isinstance(tools, list):
+        return ()
+    if family is GENERATE:
+        declarations: Final = chain.from_iterable(_declarations(object_value(tool)) for tool in tools)
+        return tuple(string_value(object_value(declaration)["name"]) for declaration in declarations)
+    if family is CHAT:
+        return tuple(string_value(object_value(object_value(tool)["function"])["name"]) for tool in tools)
+    return tuple(string_value(object_value(tool)["name"]) for tool in tools)
+
+
+def _declarations(tool: Mapping[str, JsonValue]) -> list[JsonValue]:
+    declarations: Final = tool.get("functionDeclarations", tool.get("function_declarations"))
+    assert isinstance(declarations, list), tool
+    return declarations
+
+
+def _assert_answered(family: _Family, response: httpx.Response, marker: str) -> None:
+    assert response.status_code == 200, response.text
+    tag: Final = _tag(marker)
+    assert _answer(tag) in response.text, response.text
+    upstream_id: Final = family.upstream_id(tag)
+    if upstream_id is not None:
+        assert upstream_id in response.text, response.text
+    if family is RESPONSES and not response.headers.get("content-type", "").startswith("text/event-stream"):
+        assert same_response(string_value(_JSON_OBJECT.validate_json(response.content)["id"]), f"resp_{tag}")
+
+
+def _rejection(response: httpx.Response) -> tuple[str, str, JsonValue]:
+    body: Final = _JSON_OBJECT.validate_json(response.content)
+    error: Final = object_value(body["error"])
+    if body.get("type") == "error":
+        return string_value(error["type"]), string_value(error["message"]), None
+    return string_value(error["type"]), string_value(error["message"]), error.get("param")
+
+
+def _assert_rejected(response: httpx.Response, message: str, param: str = "tools") -> None:
+    assert response.status_code == 400, response.text
+    kind, said, named = _rejection(response)
+    assert kind == "invalid_request_error", response.text
+    assert message in said, response.text
+    assert named in (param, None), response.text
+
+
+def _spend_rows(call_id: str) -> list[dict[str, JsonValue]]:
+    return read_rows(_SPEND_ROWS, (call_id, call_id))
+
+
+def _logged_once(call_id: str) -> dict[str, JsonValue]:
+    (row,) = held(lambda: _spend_rows(call_id), lambda rows: len(rows) == 1, holding=3, seconds=70)
+    return row
+
+
+def _tool_values(sent: Mapping[str, JsonValue]) -> frozenset[str]:
+    return frozenset(name for name in _TOOL_FIELDS if sent.get(name) is not None)
+
+
+def _call_id() -> str:
+    return f"malformed-tools-{uuid.uuid4().hex}"
+
+
+@_STREAMS
+@_EACH_FAMILY
+def test_well_formed_tools_reach_the_provider_and_log_one_success_row(rig: _Rig, family: _Family, stream: bool) -> None:
+    marker: Final = _marker()
+    call_id: Final = _call_id()
+    response: Final = _send(rig, family, marker, stream, call_id=call_id, tools=[family.tool])
+    _assert_answered(family, response, marker)
+    sent: Final = _one_delivery(rig, marker, family.target(stream))
+    assert _tool_names(family, sent) == ("get_weather",), sent
+    if family.exact_tools:
+        assert sent["tools"] == [family.tool], sent
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == (family.call_type(stream), "success"), row
+
+
+def test_openai_sdk_chat_with_tools_answers_with_the_provider_reply(rig: _Rig) -> None:
+    marker: Final = _marker()
+    client: Final = openai.OpenAI(
+        base_url=f"{rig.gateway.client.base_url}/v1",
+        api_key=rig.gateway.key,
+        max_retries=0,
+        http_client=httpx.Client(trust_env=False),
+    )
+    completion: Final = client.chat.completions.create(
+        model=rig.openai,
+        messages=[{"role": "user", "content": marker}],
+        tools=[
+            {
+                "type": "function",
+                "function": {
+                    "name": "get_weather",
+                    "description": "Look up the weather",
+                    "parameters": _WEATHER_SCHEMA,
+                },
+            }
+        ],
+    )
+    assert completion.id == f"chatcmpl-{_tag(marker)}", completion
+    assert completion.choices[0].message.content == _answer(_tag(marker)), completion
+    assert _one_delivery(rig, marker, "/v1/chat/completions")["tools"] == [CHAT.tool]
+
+
+def test_openai_sdk_rejects_malformed_tools_with_a_400(rig: _Rig) -> None:
+    marker: Final = _marker()
+    client: Final = openai.OpenAI(
+        base_url=f"{rig.gateway.client.base_url}/v1",
+        api_key=rig.gateway.key,
+        max_retries=0,
+        http_client=httpx.Client(trust_env=False),
+    )
+    with pytest.raises(openai.BadRequestError) as raised:
+        client.chat.completions.create(
+            model=rig.openai, messages=[{"role": "user", "content": marker}], extra_body={"tools": 5}
+        )
+    assert raised.value.status_code == 400, raised.value
+    assert object_value(raised.value.body)["param"] == "tools", raised.value.body
+    assert _delivered(rig, marker) == ()
+
+
+def test_async_openai_sdk_streams_responses_with_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+
+    async def stream_text() -> str:
+        client: Final = openai.AsyncOpenAI(
+            base_url=f"{rig.gateway.client.base_url}/v1",
+            api_key=rig.gateway.key,
+            max_retries=0,
+            http_client=httpx.AsyncClient(trust_env=False),
+        )
+        events: Final = await client.responses.create(
+            model=rig.openai,
+            input=marker,
+            stream=True,
+            tools=[
+                {
+                    "type": "function",
+                    "name": "get_weather",
+                    "description": "Look up the weather",
+                    "parameters": _WEATHER_SCHEMA,
+                    "strict": False,
+                }
+            ],
+        )
+        completed: Final = [event async for event in events if event.type == "response.completed"]
+        assert len(completed) == 1, completed
+        return completed[0].response.output_text
+
+    assert asyncio.run(stream_text()) == _answer(_tag(marker))
+    assert _tool_names(RESPONSES, _one_delivery(rig, marker, "/v1/responses")) == ("get_weather",)
+
+
+def test_anthropic_sdk_streams_messages_with_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+    client: Final = anthropic.Anthropic(
+        base_url=str(rig.gateway.client.base_url),
+        api_key=rig.gateway.key,
+        max_retries=0,
+        http_client=httpx.Client(trust_env=False),
+    )
+    with client.messages.stream(
+        model=rig.anthropic,
+        max_tokens=16,
+        messages=[{"role": "user", "content": marker}],
+        tools=[{"name": "get_weather", "description": "Look up the weather", "input_schema": _WEATHER_SCHEMA}],
+    ) as stream:
+        final: Final = stream.get_final_message()
+    assert final.id == f"msg_{_tag(marker)}", final
+    assert _one_delivery(rig, marker, "/v1/messages")["tools"] == [MESSAGES.tool]
+
+
+def test_google_genai_sdk_generates_with_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+    client: Final = genai.Client(api_key=rig.gateway.key, http_options={"base_url": str(rig.gateway.client.base_url)})
+    response: Final = client.models.generate_content(
+        model=rig.gemini,
+        contents=marker,
+        config=types.GenerateContentConfig(
+            tools=[
+                types.Tool(
+                    function_declarations=[
+                        types.FunctionDeclaration(
+                            name="get_weather",
+                            description="Look up the weather",
+                            parameters_json_schema=_WEATHER_SCHEMA,
+                        )
+                    ]
+                )
+            ],
+            automatic_function_calling=types.AutomaticFunctionCallingConfig(disable=True),
+        ),
+    )
+    assert response.text == _answer(_tag(marker)), response
+    assert _tool_names(GENERATE, _one_delivery(rig, marker, ":generateContent")) == ("get_weather",)
+
+
+@pytest.mark.parametrize("value", _MALFORMED_TOOLS.values(), ids=_MALFORMED_TOOLS.keys())
+@pytest.mark.parametrize("route", _ROUTES.values(), ids=_ROUTES.keys())
+def test_malformed_tools_answer_400_and_never_reach_the_provider(
+    rig: _Rig, route: _Route, value: tuple[JsonValue, str]
+) -> None:
+    marker: Final = _marker()
+    model: Final = route.model(rig)
+    tools, message = value
+    response: Final = rig.gateway.request("POST", route.path(model), {**route.body(model, marker), "tools": tools})
+    _assert_rejected(response, message)
+    assert _delivered(rig, marker) == ()
+
+
+@pytest.mark.parametrize("entry", _MALFORMED_ENTRIES.values(), ids=_MALFORMED_ENTRIES.keys())
+@pytest.mark.parametrize("family", (CHAT, MESSAGES), ids=("chat", "messages"))
+def test_a_malformed_tool_entry_answers_400_naming_its_index(
+    rig: _Rig, family: _Family, entry: tuple[JsonValue, str]
+) -> None:
+    marker: Final = _marker()
+    tool, message = entry
+    _assert_rejected(_send(rig, family, marker, False, tools=[tool]), message)
+    assert _delivered(rig, marker) == ()
+
+
+@pytest.mark.parametrize("value", [5, "x", []], ids=["int", "string", "list"])
+def test_malformed_web_search_options_answer_400(rig: _Rig, value: JsonValue) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, web_search_options=value)
+    expected: Final = "web_search_options: Input should be a valid dictionary"
+    _assert_rejected(response, expected, param="web_search_options")
+    assert _delivered(rig, marker) == ()
+
+
+@pytest.mark.parametrize("value", [5, "x", []], ids=["int", "string", "list"])
+def test_malformed_web_search_options_drop_under_drop_params(rig: _Rig, value: JsonValue) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, web_search_options=value, drop_params=True)
+    _assert_answered(CHAT, response, marker)
+    assert "web_search_options" not in _one_delivery(rig, marker, "/v1/chat/completions")
+
+
+@_EACH_FAMILY
+def test_wrong_key_with_malformed_tools_answers_401(rig: _Rig, family: _Family) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, family, marker, False, key=f"sk-wrong-{uuid.uuid4().hex}", tools=5)
+    assert response.status_code == 401, response.text
+    assert _delivered(rig, marker) == ()
+
+
+def _count_body(rig: _Rig, marker: str, **fields: JsonValue) -> dict[str, JsonValue]:
+    return {"model": rig.anthropic, "messages": [{"role": "user", "content": marker}], **fields}
+
+
+@pytest.mark.parametrize(
+    "fields",
+    [
+        {"tools": 5},
+        {"tools": ""},
+        {"tools": "x" * 5120},
+        {"tools": ["get_weather"]},
+        {"messages": "x"},
+    ],
+    ids=["int_tools", "empty_string_tools", "five_kb_tools", "list_of_names", "string_messages"],
+)
+def test_count_tokens_answers_an_anthropic_400_and_keeps_the_connection(
+    rig: _Rig, fields: dict[str, JsonValue]
+) -> None:
+    marker: Final = _marker()
+    port: Final = rig.gateway.client.base_url.port
+    assert port is not None
+    connection: Final = http.client.HTTPConnection(rig.gateway.client.base_url.host, port, timeout=30)
+    headers: Final = {"Authorization": f"Bearer {rig.gateway.key}", "Content-Type": "application/json"}
+    try:
+        connection.request(
+            "POST", "/v1/messages/count_tokens", body=json.dumps(_count_body(rig, marker, **fields)), headers=headers
+        )
+        counted: Final = connection.getresponse()
+        counted_body: Final = _JSON_OBJECT.validate_json(counted.read())
+        socket_after_count: Final = connection.sock
+        connection.request(
+            "POST", "/v1/messages", body=json.dumps(_messages_body(rig.anthropic, marker, False)), headers=headers
+        )
+        followed: Final = connection.getresponse()
+        followed_body: Final = followed.read().decode()
+        socket_after_follow_up: Final = connection.sock
+    finally:
+        connection.close()
+    assert counted.status == 400, counted_body
+    assert counted_body["type"] == "error", counted_body
+    error: Final = object_value(counted_body["error"])
+    assert error["type"] == "invalid_request_error", counted_body
+    assert string_value(error["message"]).startswith(next(iter(fields))), counted_body
+    assert followed.status == 200, followed_body
+    assert f"msg_{_tag(marker)}" in followed_body, followed_body
+    assert socket_after_count is not None and socket_after_follow_up is socket_after_count
+    (sent,) = _delivered(rig, marker)
+    assert sent.target == "/v1/messages", sent.target
+
+
+def test_anthropic_sdk_count_tokens_rejects_malformed_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+    client: Final = anthropic.Anthropic(
+        base_url=str(rig.gateway.client.base_url),
+        api_key=rig.gateway.key,
+        max_retries=0,
+        http_client=httpx.Client(trust_env=False),
+    )
+    with pytest.raises(anthropic.BadRequestError) as raised:
+        client.messages.count_tokens(
+            model=rig.anthropic, messages=[{"role": "user", "content": marker}], extra_body={"tools": 5}
+        )
+    assert raised.value.status_code == 400, raised.value
+    assert object_value(object_value(raised.value.body)["error"])["message"] == _NOT_A_LIST, raised.value.body
+    assert _delivered(rig, marker) == ()
+
+
+def test_count_tokens_forwards_well_formed_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST", "/v1/messages/count_tokens", _count_body(rig, marker, tools=[MESSAGES.tool])
+    )
+    assert response.status_code == 200, response.text
+    assert _JSON_OBJECT.validate_json(response.content) == {"input_tokens": _COUNT}, response.text
+    assert _one_delivery(rig, marker, "/v1/messages/count_tokens")["tools"] == [MESSAGES.tool]
+
+
+@pytest.mark.parametrize(
+    ("headers", "fields"),
+    [({}, {"drop_params": True}), ({"user-agent": _CLAUDE_CODE_AGENT}, {})],
+    ids=["drop_params", "claude_code_agent"],
+)
+def test_count_tokens_drops_only_the_bad_entry(
+    rig: _Rig, headers: dict[str, str], fields: dict[str, JsonValue]
+) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST",
+        "/v1/messages/count_tokens",
+        _count_body(rig, marker, tools=[MESSAGES.tool, 5], **fields),
+        headers=headers,
+    )
+    assert response.status_code == 200, response.text
+    assert _one_delivery(rig, marker, "/v1/messages/count_tokens")["tools"] == [MESSAGES.tool]
+
+
+def test_responses_input_tokens_counts_well_formed_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST", "/v1/responses/input_tokens", {"model": rig.anthropic, "input": marker, "tools": [RESPONSES.tool]}
+    )
+    assert response.status_code == 200, response.text
+    assert _JSON_OBJECT.validate_json(response.content) == {
+        "object": "response.input_tokens",
+        "input_tokens": _COUNT,
+    }, response.text
+    sent: Final = _one_delivery(rig, marker, "/v1/messages/count_tokens")
+    assert "get_weather" in json.dumps(sent["tools"]), sent
+
+
+def test_responses_input_tokens_rejects_malformed_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST", "/v1/responses/input_tokens", {"model": rig.anthropic, "input": marker, "tools": 5}
+    )
+    _assert_rejected(response, _NOT_A_LIST)
+    assert _delivered(rig, marker) == ()
+
+
+def test_responses_input_tokens_drops_only_the_bad_entry(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST",
+        "/v1/responses/input_tokens",
+        {"model": rig.anthropic, "input": marker, "tools": [RESPONSES.tool, 5], "drop_params": True},
+    )
+    assert response.status_code == 200, response.text
+    sent: Final = _one_delivery(rig, marker, "/v1/messages/count_tokens")
+    tools: Final = sent["tools"]
+    assert isinstance(tools, list) and len(tools) == 1 and "get_weather" in json.dumps(tools), sent
+
+
+def _allowlisted_key(scenario: Scenario) -> str:
+    return scenario.key(metadata={"allowed_tools": ["get_weather"]})
+
+
+@_EACH_FAMILY
+def test_allowlisted_key_keeps_its_allowlist_with_malformed_tools(rig: _Rig, family: _Family) -> None:
+    with rig.gateway.scenario() as scenario:
+        key: Final = _allowlisted_key(scenario)
+        allowed: Final = _marker()
+        _assert_answered(family, _send(rig, family, allowed, False, key=key, tools=[family.tool]), allowed)
+        assert len(_delivered(rig, allowed)) == 1
+        malformed: Final = _marker()
+        _assert_rejected(_send(rig, family, malformed, False, key=key, tools=5), _NOT_A_LIST)
+        denied_tool: Final = json.loads(json.dumps(family.tool).replace("get_weather", "delete_files"))
+        denied: Final = _marker()
+        refused: Final = _send(rig, family, denied, False, key=key, tools=[denied_tool])
+        assert refused.status_code == 403, refused.text
+        assert "delete_files" in refused.text, refused.text
+        assert _delivered(rig, malformed) + _delivered(rig, denied) == ()
+
+
+def _file_search(store_ids: JsonValue) -> dict[str, JsonValue]:
+    return {"type": "file_search", "vector_store_ids": store_ids}
+
+
+def test_store_limited_key_searches_its_store_from_a_file_search_tool(rig: _Rig) -> None:
+    marker: Final = _marker()
+    with rig.gateway.scenario() as scenario:
+        key: Final = scenario.key(object_permission={"vector_stores": [_CONFIG_STORE]})
+        response: Final = _send(rig, CHAT, marker, False, key=key, tools=[_file_search([_CONFIG_STORE])])
+    _assert_answered(CHAT, response, marker)
+    sent: Final = _one_delivery(rig, marker, "/v1/chat/completions")
+    assert "file_search" not in json.dumps(sent), sent
+    searches: Final = eventually(
+        lambda: tuple(
+            observation
+            for observation in upstream_observations(rig.gateway)
+            if observation["path"] == f"/vector_stores/{_CONFIG_STORE}/search" and marker in json.dumps(observation)
+        ),
+        lambda found: len(found) == 1,
+    )
+    assert len(searches) == 1, searches
+
+
+@pytest.mark.parametrize(
+    ("store_ids", "status", "named"),
+    [
+        ([_OTHER_STORE], 401, _OTHER_STORE),
+        (_CONFIG_STORE, 400, "tools.0.vector_store_ids: Input should be a valid list"),
+        (_OTHER_STORE, 401, _OTHER_STORE),
+        ([5, _OTHER_STORE], 401, _OTHER_STORE),
+        ([5, _CONFIG_STORE], 400, "tools.0.vector_store_ids.0: Input should be a valid string"),
+    ],
+    ids=["other_store", "allowed_store_as_string", "other_store_as_string", "int_beside_other", "int_beside_allowed"],
+)
+def test_store_limited_key_reads_every_string_store_id(
+    rig: _Rig, store_ids: JsonValue, status: int, named: str
+) -> None:
+    marker: Final = _marker()
+    with rig.gateway.scenario() as scenario:
+        key: Final = scenario.key(object_permission={"vector_stores": [_CONFIG_STORE]})
+        response: Final = _send(rig, CHAT, marker, False, key=key, tools=[_file_search(store_ids)])
+    assert response.status_code == status, response.text
+    assert named in response.text, response.text
+    assert _delivered(rig, marker) == ()
+
+
+def test_store_limited_key_treats_null_store_ids_as_none(rig: _Rig) -> None:
+    marker: Final = _marker()
+    with rig.gateway.scenario() as scenario:
+        key: Final = scenario.key(object_permission={"vector_stores": [_CONFIG_STORE]})
+        response: Final = _send(rig, CHAT, marker, False, key=key, tools=[_file_search(None)])
+    _assert_answered(CHAT, response, marker)
+    assert _one_delivery(rig, marker, "/v1/chat/completions")["tools"] == [_file_search(None)]
+
+
+@pytest.mark.parametrize(
+    ("first", "last", "status"),
+    [("5", "WELL_FORMED", 200), ("WELL_FORMED", "5", 400)],
+    ids=["well_formed_last", "malformed_last"],
+)
+def test_duplicate_tools_keys_use_the_last_one(rig: _Rig, first: str, last: str, status: int) -> None:
+    marker: Final = _marker()
+    well_formed: Final = json.dumps([CHAT.tool])
+    prefix: Final = json.dumps({"model": rig.openai, "messages": [{"role": "user", "content": marker}]})[:-1]
+    raw: Final = (
+        f'{prefix}, "tools": {first.replace("WELL_FORMED", well_formed)}, '
+        f'"tools": {last.replace("WELL_FORMED", well_formed)}}}'
+    )
+    response: Final = rig.gateway.client.post(
+        "/v1/chat/completions",
+        content=raw.encode(),
+        headers={"Authorization": f"Bearer {rig.gateway.key}", "Content-Type": "application/json"},
+    )
+    assert response.status_code == status, response.text
+    delivered: Final = _delivered(rig, marker)
+    if status == 400:
+        _assert_rejected(response, _NOT_A_LIST)
+        assert delivered == ()
+        return
+    (sent,) = delivered
+    assert _JSON_OBJECT.validate_json(sent.body)["tools"] == [CHAT.tool]
+
+
+@pytest.mark.parametrize(
+    ("family", "route", "expected"),
+    [
+        (CHAT, None, "acompletion"),
+        (MESSAGES, None, "anthropic_messages"),
+        (RESPONSES, None, "aresponses"),
+        (GENERATE, None, "agenerate_content"),
+        (None, "interactions", "acreate_interaction"),
+    ],
+    ids=["chat", "messages", "responses", "generate_content", "interactions"],
+)
+def test_a_malformed_tools_rejection_logs_one_failure_row_with_its_call_type(
+    rig: _Rig, family: _Family | None, route: str | None, expected: str
+) -> None:
+    marker: Final = _marker()
+    call_id: Final = _call_id()
+    response: Final = (
+        _send(rig, family, marker, False, call_id=call_id, tools=5)
+        if family is not None
+        else rig.gateway.request(
+            "POST",
+            "/v1beta/interactions",
+            {"model": rig.gemini, "input": [{"type": "text", "text": marker}], "tools": 5},
+            headers={"x-litellm-call-id": call_id},
+        )
+    )
+    _assert_rejected(response, _NOT_A_LIST)
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == (expected, "failure"), row
+
+
+@pytest.mark.parametrize(
+    ("path", "body", "expected"),
+    [
+        ("/v1/chat/completions", "chat", "acompletion"),
+        ("/v1/messages", "messages", "anthropic_messages"),
+        ("/v1beta/interactions", "interactions", "acreate_interaction"),
+    ],
+    ids=["chat", "messages", "interactions_list_input"],
+)
+def test_a_provider_401_with_well_formed_tools_logs_its_endpoint_call_type(
+    rig: _Rig, path: str, body: str, expected: str
+) -> None:
+    marker: Final = f"{_marker()} {_REJECT_MARK}"
+    call_id: Final = _call_id()
+    payloads: Final[Mapping[str, dict[str, JsonValue]]] = {
+        "chat": {**_chat_body(rig.openai, marker, False), "tools": [CHAT.tool]},
+        "messages": {**_messages_body(rig.anthropic, marker, False), "tools": [MESSAGES.tool]},
+        "interactions": {
+            "model": rig.gemini,
+            "input": [{"type": "text", "text": marker}],
+            "tools": [{"type": "function", "name": "get_weather", "parameters": _WEATHER_SCHEMA}],
+        },
+    }
+    response: Final = rig.gateway.request("POST", path, payloads[body], headers={"x-litellm-call-id": call_id})
+    assert response.status_code == 401, response.text
+    assert len(_delivered(rig, marker)) == 1
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == (expected, "failure"), row
+
+
+@pytest.mark.parametrize("drop", [True, "true"], ids=["bool", "string"])
+@_EACH_FAMILY
+def test_request_drop_params_drops_malformed_tools_and_their_companions(
+    rig: _Rig, family: _Family, drop: JsonValue
+) -> None:
+    marker: Final = _marker()
+    companion, value = family.tool_choice
+    response: Final = _send(rig, family, marker, False, tools=5, drop_params=drop, **{companion: value})
+    _assert_answered(family, response, marker)
+    sent: Final = _one_delivery(rig, marker, family.target(False))
+    assert _tool_values(sent) == frozenset(), sent
+
+
+@_EACH_FAMILY
+def test_drop_params_keeps_the_good_entries_and_the_tool_choice(rig: _Rig, family: _Family) -> None:
+    marker: Final = _marker()
+    companion, value = family.tool_choice
+    response: Final = _send(rig, family, marker, False, tools=[family.tool, 5], drop_params=True, **{companion: value})
+    _assert_answered(family, response, marker)
+    sent: Final = _one_delivery(rig, marker, family.target(False))
+    assert _tool_names(family, sent) == ("get_weather",), sent
+    if family.exact_tools:
+        assert sent["tools"] == [family.tool], sent
+    assert companion in sent, sent
+
+
+def test_additional_drop_params_naming_tools_drops_them(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, tools=5, additional_drop_params=["tools"])
+    _assert_answered(CHAT, response, marker)
+    assert "tools" not in _one_delivery(rig, marker, "/v1/chat/completions")
+
+
+def test_additional_drop_params_naming_another_field_still_rejects_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, tools=5, additional_drop_params=["web_search_options"])
+    _assert_rejected(response, _NOT_A_LIST)
+    assert _delivered(rig, marker) == ()
+
+
+@pytest.mark.parametrize("family", (CHAT, GENERATE), ids=("chat", "generate_content"))
+def test_a_drop_params_deployment_group_drops_malformed_tools(rig: _Rig, family: _Family) -> None:
+    marker: Final = _marker()
+    model: Final = rig.drop_group if family is CHAT else rig.gemini_drop_group
+    response: Final = _send(rig, family, marker, False, model=model, tools=5)
+    _assert_answered(family, response, marker)
+    assert _tool_values(_one_delivery(rig, marker, family.target(False))) == frozenset()
+
+
+def test_a_drop_params_deployment_keeps_its_own_tools_when_it_drops_malformed_request_tools(rig: _Rig) -> None:
+    marker: Final = _marker()
+    companion, value = CHAT.tool_choice
+    response: Final = _send(
+        rig, CHAT, marker, False, model=rig.tools_drop_group, tools=5, parallel_tool_calls=False, **{companion: value}
+    )
+    _assert_answered(CHAT, response, marker)
+    sent: Final = _one_delivery(rig, marker, "/v1/chat/completions")
+    assert _tool_names(CHAT, sent) == _tool_names(CHAT, {"tools": [CHAT.tool]}), sent
+    assert _tool_values(sent) == frozenset({"tools"}), sent
+
+
+@pytest.mark.parametrize("drop", [False, None], ids=["false", "null"])
+def test_an_explicit_request_drop_params_overrides_the_deployment_group(rig: _Rig, drop: JsonValue) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, model=rig.drop_group, tools=5, drop_params=drop)
+    _assert_rejected(response, _NOT_A_LIST)
+    assert _delivered(rig, marker) == ()
+
+
+def test_a_mixed_group_answers_malformed_tools_by_the_drop_params_of_the_deployment_it_picks(rig: _Rig) -> None:
+    markers: Final = tuple(_marker() for _ in range(20))
+    statuses: Final = tuple(
+        _send(rig, CHAT, marker, False, model=rig.mixed_group, tools=5).status_code for marker in markers
+    )
+    sent: Final = tuple(request.body.decode() for request in rig.wire.drain())
+    deliveries: Final = tuple(
+        tuple(_JSON_OBJECT.validate_json(body) for body in sent if marker in body) for marker in markers
+    )
+    assert sorted(set(statuses)) == [200, 400], statuses
+    assert all((status, len(bodies)) in ((200, 1), (400, 0)) for status, bodies in zip(statuses, deliveries)), (
+        statuses,
+        deliveries,
+    )
+    assert all(all("tools" not in body for body in bodies) for bodies in deliveries), deliveries
+
+
+def test_a_deployment_dropping_tools_drops_every_tool(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, model=rig.field_group, tools=[CHAT.tool, 5])
+    _assert_answered(CHAT, response, marker)
+    assert "tools" not in _one_delivery(rig, marker, "/v1/chat/completions")
+
+
+def test_a_request_additional_drop_params_list_keeps_tools_a_deployment_list_drops(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig,
+        CHAT,
+        marker,
+        False,
+        model=rig.field_group,
+        tools=[CHAT.tool],
+        additional_drop_params=["web_search_options"],
+    )
+    _assert_answered(CHAT, response, marker)
+    assert _tool_names(CHAT, _one_delivery(rig, marker, "/v1/chat/completions")) == ("get_weather",)
+
+
+def test_a_request_additional_drop_params_list_replaces_the_deployment_list(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig,
+        CHAT,
+        marker,
+        False,
+        model=rig.field_group,
+        tools=[CHAT.tool, 5],
+        additional_drop_params=["web_search_options"],
+    )
+    _assert_rejected(response, _SECOND_NOT_AN_OBJECT)
+    assert _delivered(rig, marker) == ()
+
+
+@pytest.mark.parametrize(
+    ("family", "agent"),
+    [(MESSAGES, _CLAUDE_CODE_AGENT), (RESPONSES, _CODEX_AGENT), (CHAT, _CLAUDE_CODE_AGENT)],
+    ids=["claude_code_messages", "codex_responses", "claude_code_chat"],
+)
+def test_an_agentic_cli_drops_only_the_bad_entry(rig: _Rig, family: _Family, agent: str) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, family, marker, False, user_agent=agent, tools=[family.tool, 5])
+    _assert_answered(family, response, marker)
+    assert _one_delivery(rig, marker, family.target(False))["tools"] == [family.tool]
+
+
+def test_an_agentic_cli_with_explicit_drop_params_false_rejects(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig, MESSAGES, marker, False, user_agent=_CLAUDE_CODE_AGENT, tools=[MESSAGES.tool, 5], drop_params=False
+    )
+    _assert_rejected(response, _SECOND_NOT_AN_OBJECT)
+    assert _delivered(rig, marker) == ()
+
+
+@pytest.mark.parametrize(
+    "fields", [{"tools": None}, {"tools": []}, {}], ids=["null_tools", "empty_list_tools", "missing_tools"]
+)
+def test_empty_null_and_missing_tools_still_answer(rig: _Rig, fields: dict[str, JsonValue]) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, **fields)
+    _assert_answered(CHAT, response, marker)
+    assert not _one_delivery(rig, marker, "/v1/chat/completions").get("tools")
+
+
+def test_null_web_search_options_answers_and_logs_success(rig: _Rig) -> None:
+    marker: Final = _marker()
+    call_id: Final = _call_id()
+    response: Final = _send(rig, CHAT, marker, False, call_id=call_id, web_search_options=None)
+    _assert_answered(CHAT, response, marker)
+    assert _one_delivery(rig, marker, "/v1/chat/completions").get("web_search_options") is None
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == ("acompletion", "success"), row
+
+
+@_EACH_FAMILY
+def test_request_drop_params_with_well_formed_tools_logs_one_success_row(rig: _Rig, family: _Family) -> None:
+    marker: Final = _marker()
+    call_id: Final = _call_id()
+    response: Final = _send(rig, family, marker, False, call_id=call_id, tools=[family.tool], drop_params=True)
+    _assert_answered(family, response, marker)
+    assert _tool_names(family, _one_delivery(rig, marker, family.target(False))) == ("get_weather",)
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == (family.call_type(False), "success"), row
+
+
+def test_repeated_identical_dropped_requests_each_log_once(rig: _Rig) -> None:
+    marker: Final = _marker()
+    call_ids: Final = tuple(_call_id() for _ in range(3))
+    for call_id in call_ids:
+        response = _send(rig, GENERATE, marker, False, call_id=call_id, tools=[GENERATE.tool, 5], drop_params=True)
+        _assert_answered(GENERATE, response, marker)
+    delivered: Final = _delivered(rig, marker)
+    assert (
+        tuple(_tool_names(GENERATE, _JSON_OBJECT.validate_json(sent.body)) for sent in delivered)
+        == (("get_weather",),) * 3
+    )
+    rows: Final = tuple(_logged_once(call_id) for call_id in call_ids)
+    assert tuple((row["call_type"], row["status"]) for row in rows) == (("agenerate_content", "success"),) * 3
+
+
+@pytest.mark.parametrize("family", (CHAT, MESSAGES, RESPONSES), ids=("chat", "messages", "responses"))
+def test_a_cache_hit_twin_answers_from_the_cache_and_logs_once_each(rig: _Rig, family: _Family) -> None:
+    marker: Final = _marker()
+    first_id: Final = _call_id()
+    second_id: Final = _call_id()
+    first: Final = _send(rig, family, marker, False, call_id=first_id, tools=[family.tool])
+    _assert_answered(family, first, marker)
+    await_entry(redis_store(), _answer(_tag(marker)))
+    second: Final = _send(rig, family, marker, False, call_id=second_id, tools=[family.tool])
+    _assert_answered(family, second, marker)
+    assert len(_delivered(rig, marker)) == 1
+    first_row: Final = _logged_once(first_id)
+    second_row: Final = _logged_once(second_id)
+    assert (first_row["call_type"], second_row["call_type"]) == (family.call_type(False),) * 2, (first_row, second_row)
+    assert second_row["cache_hit"] == "True", second_row
+
+
+def test_a_dropped_request_shares_the_cache_entry_of_its_clean_twin(rig: _Rig) -> None:
+    marker: Final = _marker()
+    dropped: Final = _send(rig, CHAT, marker, False, tools=[CHAT.tool, 5], drop_params=True)
+    _assert_answered(CHAT, dropped, marker)
+    await_entry(redis_store(), _answer(_tag(marker)))
+    clean: Final = _send(rig, CHAT, marker, False, tools=[CHAT.tool], drop_params=True)
+    _assert_answered(CHAT, clean, marker)
+    (sent,) = _delivered(rig, marker)
+    assert _JSON_OBJECT.validate_json(sent.body)["tools"] == [CHAT.tool]
+
+
+def _field_group(rig: _Rig, groups: _FieldGroups, family: _Family) -> str:
+    return {MESSAGES.name: groups.anthropic, GENERATE.name: groups.gemini}.get(family.name, rig.field_group)
+
+
+_FIELD_GROUP_FAMILIES: Final = pytest.mark.parametrize(
+    "family", (MESSAGES, RESPONSES, GENERATE), ids=("messages", "responses", "generate_content")
+)
+
+
+@_FIELD_GROUP_FAMILIES
+def test_each_family_rejects_malformed_tools_when_a_request_list_replaces_the_deployment_list(
+    rig: _Rig, field_groups: _FieldGroups, family: _Family
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig,
+        family,
+        marker,
+        False,
+        model=_field_group(rig, field_groups, family),
+        tools=[family.tool, 5],
+        additional_drop_params=["web_search_options"],
+    )
+    _assert_rejected(response, _SECOND_NOT_AN_OBJECT)
+    assert _delivered(rig, marker) == ()
+
+
+@pytest.mark.parametrize(
+    ("family", "forwarded"),
+    [(MESSAGES, ()), (RESPONSES, ()), (GENERATE, ("get_weather",))],
+    ids=("messages", "responses", "generate_content"),
+)
+def test_each_family_answers_malformed_tools_a_deployment_list_drops(
+    rig: _Rig, field_groups: _FieldGroups, family: _Family, forwarded: tuple[str, ...]
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig, family, marker, False, model=_field_group(rig, field_groups, family), tools=[family.tool, 5]
+    )
+    _assert_answered(family, response, marker)
+    assert _tool_names(family, _one_delivery(rig, marker, family.target(False))) == forwarded
+
+
+@_FIELD_GROUP_FAMILIES
+def test_each_family_forwards_well_formed_tools_a_request_list_keeps(
+    rig: _Rig, field_groups: _FieldGroups, family: _Family
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig,
+        family,
+        marker,
+        False,
+        model=_field_group(rig, field_groups, family),
+        tools=[family.tool],
+        additional_drop_params=["web_search_options"],
+    )
+    _assert_answered(family, response, marker)
+    assert _tool_names(family, _one_delivery(rig, marker, family.target(False))) == ("get_weather",)
+
+
+_NOT_A_NAME_LIST: Final[Mapping[str, JsonValue]] = MappingProxyType(
+    {
+        "empty_list": [],
+        "null": None,
+        "string": "tools",
+        "empty_string": "",
+        "five_kb_string": "x" * 5120,
+        "int": 5,
+    }
+)
+
+
+@pytest.mark.parametrize("value", _NOT_A_NAME_LIST.values(), ids=_NOT_A_NAME_LIST.keys())
+def test_a_request_additional_drop_params_that_is_no_list_of_names_still_replaces_the_deployment_list(
+    rig: _Rig, value: JsonValue
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig, CHAT, marker, False, model=rig.field_group, tools=[CHAT.tool, 5], additional_drop_params=value
+    )
+    _assert_rejected(response, _SECOND_NOT_AN_OBJECT)
+    assert _delivered(rig, marker) == ()
+
+
+@pytest.mark.parametrize(
+    "value",
+    [[], None, "tools", "", "x" * 5120],
+    ids=["empty_list", "null", "string", "empty_string", "five_kb_string"],
+)
+def test_a_request_additional_drop_params_replacing_the_deployment_list_keeps_well_formed_tools(
+    rig: _Rig, value: JsonValue
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig, CHAT, marker, False, model=rig.field_group, tools=[CHAT.tool], additional_drop_params=value
+    )
+    _assert_answered(CHAT, response, marker)
+    assert _one_delivery(rig, marker, "/v1/chat/completions")["tools"] == [CHAT.tool]
+
+
+@pytest.mark.parametrize(
+    ("first", "last", "status"),
+    [('["tools"]', '["web_search_options"]', 400), ('["web_search_options"]', '["tools"]', 200)],
+    ids=["other_field_last", "tools_last"],
+)
+def test_duplicate_additional_drop_params_keys_use_the_last_one(rig: _Rig, first: str, last: str, status: int) -> None:
+    marker: Final = _marker()
+    prefix: Final = json.dumps(
+        {"model": rig.openai, "messages": [{"role": "user", "content": marker}], "tools": [CHAT.tool, 5]}
+    )[:-1]
+    response: Final = rig.gateway.client.post(
+        "/v1/chat/completions",
+        content=f'{prefix}, "additional_drop_params": {first}, "additional_drop_params": {last}}}'.encode(),
+        headers={"Authorization": f"Bearer {rig.gateway.key}", "Content-Type": "application/json"},
+    )
+    assert response.status_code == status, response.text
+    if status == 400:
+        _assert_rejected(response, _SECOND_NOT_AN_OBJECT)
+        assert _delivered(rig, marker) == ()
+        return
+    _assert_answered(CHAT, response, marker)
+    assert "tools" not in _one_delivery(rig, marker, "/v1/chat/completions")
+
+
+def test_count_tokens_drops_the_bad_entry_a_deployment_list_names(rig: _Rig, field_groups: _FieldGroups) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST",
+        "/v1/messages/count_tokens",
+        {**_count_body(rig, marker, tools=[MESSAGES.tool, 5]), "model": field_groups.anthropic},
+    )
+    assert response.status_code == 200, response.text
+    assert _JSON_OBJECT.validate_json(response.content) == {"input_tokens": _COUNT}, response.text
+    assert _one_delivery(rig, marker, "/v1/messages/count_tokens")["tools"] == [MESSAGES.tool]
+
+
+def test_count_tokens_rejects_malformed_tools_when_a_request_list_replaces_the_deployment_list(
+    rig: _Rig, field_groups: _FieldGroups
+) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST",
+        "/v1/messages/count_tokens",
+        {
+            **_count_body(rig, marker, tools=[MESSAGES.tool, 5], additional_drop_params=["web_search_options"]),
+            "model": field_groups.anthropic,
+        },
+    )
+    _assert_rejected(response, _SECOND_NOT_AN_OBJECT)
+    assert _delivered(rig, marker) == ()
+
+
+def test_responses_input_tokens_drops_the_bad_entry_a_deployment_list_names(
+    rig: _Rig, field_groups: _FieldGroups
+) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST",
+        "/v1/responses/input_tokens",
+        {"model": field_groups.anthropic, "input": marker, "tools": [RESPONSES.tool, 5]},
+    )
+    assert response.status_code == 200, response.text
+    tools: Final = _one_delivery(rig, marker, "/v1/messages/count_tokens")["tools"]
+    assert isinstance(tools, list) and len(tools) == 1 and "get_weather" in json.dumps(tools), tools
+
+
+def test_responses_input_tokens_rejects_malformed_tools_when_a_request_list_replaces_the_deployment_list(
+    rig: _Rig, field_groups: _FieldGroups
+) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST",
+        "/v1/responses/input_tokens",
+        {
+            "model": field_groups.anthropic,
+            "input": marker,
+            "tools": [RESPONSES.tool, 5],
+            "additional_drop_params": ["web_search_options"],
+        },
+    )
+    _assert_rejected(response, _SECOND_NOT_AN_OBJECT)
+    assert _delivered(rig, marker) == ()
+
+
+def _text_items(marker: str) -> list[JsonValue]:
+    return [{"role": "user", "content": marker}]
+
+
+@pytest.mark.parametrize("compact_input", [_text_items, lambda marker: marker], ids=["list_input", "string_input"])
+def test_a_compact_rejection_logs_one_failure_row_as_compact(
+    rig: _Rig, compact_input: Callable[[str], JsonValue]
+) -> None:
+    marker: Final = _marker()
+    call_id: Final = _call_id()
+    response: Final = rig.gateway.request(
+        "POST",
+        "/v1/responses/compact",
+        {"model": rig.openai, "input": compact_input(marker), "tools": 5},
+        headers={"x-litellm-call-id": call_id},
+    )
+    _assert_rejected(response, _NOT_A_LIST)
+    assert _delivered(rig, marker) == ()
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == ("acompact_responses", "failure"), row
+
+
+@dataclass(frozen=True, slots=True)
+class _Limited:
+    path: Callable[[_Rig], str]
+    body: Callable[[_Rig, str], dict[str, JsonValue]]
+    call_type: str
+
+
+_LIMITED: Final[Mapping[str, _Limited]] = MappingProxyType(
+    {
+        "chat": _Limited(
+            lambda rig: "/v1/chat/completions", lambda rig, k: _chat_body(rig.openai, k, False), "acompletion"
+        ),
+        "messages": _Limited(
+            lambda rig: "/v1/messages", lambda rig, k: _messages_body(rig.anthropic, k, False), "anthropic_messages"
+        ),
+        "responses_list_input": _Limited(
+            lambda rig: "/v1/responses", lambda rig, k: {"model": rig.openai, "input": _text_items(k)}, "aresponses"
+        ),
+        "compact_list_input": _Limited(
+            lambda rig: "/v1/responses/compact",
+            lambda rig, k: {"model": rig.openai, "input": _text_items(k)},
+            "acompact_responses",
+        ),
+        "generate_content": _Limited(
+            lambda rig: _generate_path(rig.gemini, False),
+            lambda rig, k: _generate_body(rig.gemini, k, False),
+            "agenerate_content",
+        ),
+        "interactions_list_input": _Limited(
+            lambda rig: "/v1beta/interactions",
+            lambda rig, k: {"model": rig.gemini, "input": [{"type": "text", "text": k}]},
+            "acreate_interaction",
+        ),
+        "video_generation": _Limited(
+            lambda rig: "/v1/videos", lambda rig, k: {"model": rig.openai, "prompt": k}, "avideo_generation"
+        ),
+    }
+)
+
+
+@pytest.mark.parametrize("limited", _LIMITED.values(), ids=_LIMITED.keys())
+def test_a_rate_limited_request_logs_one_failure_row_with_its_endpoint_call_type(
+    rig: _Rig, limited_key: str, limited: _Limited
+) -> None:
+    marker: Final = _marker()
+    call_id: Final = _call_id()
+    response: Final = rig.gateway.request(
+        "POST",
+        limited.path(rig),
+        limited.body(rig, marker),
+        key=limited_key,
+        headers={"x-litellm-call-id": call_id},
+    )
+    assert response.status_code == 429, response.text
+    assert _delivered(rig, marker) == ()
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == (limited.call_type, "failure"), row
+
+
+@pytest.mark.parametrize("family", (CHAT, MESSAGES), ids=("chat", "messages"))
+def test_a_rate_limited_twin_of_a_cached_request_logs_its_endpoint_call_type(
+    rig: _Rig, limited_key: str, family: _Family
+) -> None:
+    marker: Final = _marker()
+    _assert_answered(family, _send(rig, family, marker, False, tools=[family.tool]), marker)
+    await_entry(redis_store(), _answer(_tag(marker)))
+    call_id: Final = _call_id()
+    response: Final = _send(rig, family, marker, False, key=limited_key, call_id=call_id, tools=[family.tool])
+    assert response.status_code == 429, response.text
+    assert len(_delivered(rig, marker)) == 1
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == (family.call_type(False), "failure"), row
+
+
+def test_a_rate_limited_image_edit_logs_one_failure_row_as_an_image_edit(rig: _Rig, limited_key: str) -> None:
+    marker: Final = _marker()
+    call_id: Final = _call_id()
+    response: Final = rig.gateway.client.post(
+        "/v1/images/edits",
+        data={"model": rig.openai, "prompt": marker},
+        files={"image": ("edit.png", b"\x89PNG\r\n\x1a\n", "image/png")},
+        headers={"Authorization": f"Bearer {limited_key}", "x-litellm-call-id": call_id},
+    )
+    assert response.status_code == 429, response.text
+    assert _delivered(rig, marker) == ()
+    row: Final = _logged_once(call_id)
+    assert (row["call_type"], row["status"]) == ("aimage_edit", "failure"), row
+
+
+_Sender = Callable[[_Rig, str, str, Mapping[str, JsonValue]], httpx.Response]
+
+
+@dataclass(frozen=True, slots=True)
+class _Checked:
+    provider: str
+    tool: dict[str, JsonValue]
+    named_as: _Family
+    send: _Sender
+    target: str
+    answered: Callable[[httpx.Response, str], None]
+    kept_by_a_tools_list: tuple[str, ...]
+    bad_entry: dict[str, JsonValue]
+
+
+def _family_sender(family: _Family) -> _Sender:
+    return lambda rig, model, marker, fields: _send(rig, family, marker, False, model=model, **fields)
+
+
+def _family_answered(family: _Family) -> Callable[[httpx.Response, str], None]:
+    return lambda response, marker: _assert_answered(family, response, marker)
+
+
+def _count_tokens(rig: _Rig, model: str, marker: str, fields: Mapping[str, JsonValue]) -> httpx.Response:
+    return rig.gateway.request(
+        "POST",
+        "/v1/messages/count_tokens",
+        {"model": model, "messages": [{"role": "user", "content": marker}], **fields},
+    )
+
+
+def _input_tokens(rig: _Rig, model: str, marker: str, fields: Mapping[str, JsonValue]) -> httpx.Response:
+    return rig.gateway.request("POST", "/v1/responses/input_tokens", {"model": model, "input": marker, **fields})
+
+
+def _counted(expected: Mapping[str, JsonValue]) -> Callable[[httpx.Response, str], None]:
+    def check(response: httpx.Response, marker: str) -> None:
+        assert response.status_code == 200, response.text
+        assert _JSON_OBJECT.validate_json(response.content) == expected, (marker, response.text)
+
+    return check
+
+
+_CHAT_BAD_ENTRY: Final[dict[str, JsonValue]] = {
+    "type": "function",
+    "function": {"name": "get_weather", "parameters": "bad"},
+}
+_MESSAGES_BAD_ENTRY: Final[dict[str, JsonValue]] = {"name": "get_weather", "input_schema": [1]}
+_RESPONSES_BAD_ENTRY: Final[dict[str, JsonValue]] = {"type": "function", "name": "get_weather", "parameters": 5}
+_CHECKED: Final[Mapping[str, _Checked]] = MappingProxyType(
+    {
+        "chat": _Checked(
+            provider="openai",
+            tool=CHAT.tool,
+            named_as=CHAT,
+            send=_family_sender(CHAT),
+            target="/v1/chat/completions",
+            answered=_family_answered(CHAT),
+            kept_by_a_tools_list=(),
+            bad_entry=_CHAT_BAD_ENTRY,
+        ),
+        "messages": _Checked(
+            provider="anthropic",
+            tool=MESSAGES.tool,
+            named_as=MESSAGES,
+            send=_family_sender(MESSAGES),
+            target="/v1/messages",
+            answered=_family_answered(MESSAGES),
+            kept_by_a_tools_list=(),
+            bad_entry=_MESSAGES_BAD_ENTRY,
+        ),
+        "responses": _Checked(
+            provider="openai",
+            tool=RESPONSES.tool,
+            named_as=RESPONSES,
+            send=_family_sender(RESPONSES),
+            target="/v1/responses",
+            answered=_family_answered(RESPONSES),
+            kept_by_a_tools_list=(),
+            bad_entry=_RESPONSES_BAD_ENTRY,
+        ),
+        "generate_content": _Checked(
+            provider="gemini",
+            tool=GENERATE.tool,
+            named_as=GENERATE,
+            send=_family_sender(GENERATE),
+            target=":generateContent",
+            answered=_family_answered(GENERATE),
+            kept_by_a_tools_list=("get_weather",),
+            bad_entry={"parameters": 5},
+        ),
+        "count_tokens": _Checked(
+            provider="anthropic",
+            tool=MESSAGES.tool,
+            named_as=MESSAGES,
+            send=_count_tokens,
+            target="/v1/messages/count_tokens",
+            answered=_counted({"input_tokens": _COUNT}),
+            kept_by_a_tools_list=("get_weather",),
+            bad_entry=_MESSAGES_BAD_ENTRY,
+        ),
+        "input_tokens": _Checked(
+            provider="anthropic",
+            tool=RESPONSES.tool,
+            named_as=MESSAGES,
+            send=_input_tokens,
+            target="/v1/messages/count_tokens",
+            answered=_counted({"object": "response.input_tokens", "input_tokens": _COUNT}),
+            kept_by_a_tools_list=("get_weather",),
+            bad_entry=_RESPONSES_BAD_ENTRY,
+        ),
+    }
+)
+_EACH_CHECKED: Final = pytest.mark.parametrize("checked", _CHECKED.values(), ids=_CHECKED.keys())
+_CHAT_AND_COUNT: Final = pytest.mark.parametrize(
+    "checked", (_CHECKED["chat"], _CHECKED["count_tokens"]), ids=("chat", "count_tokens")
+)
+_ENTRY_SHAPES: Final = pytest.mark.parametrize(
+    "bad_entry",
+    [lambda checked: 5, lambda checked: checked.bad_entry],
+    ids=["int_entry", "dict_entry"],
+)
+_BadEntry = Callable[[_Checked], JsonValue]
+
+
+def _assert_forwarded(
+    rig: _Rig, checked: _Checked, response: httpx.Response, marker: str, names: tuple[str, ...]
+) -> None:
+    checked.answered(response, marker)
+    assert _tool_names(checked.named_as, _one_delivery(rig, marker, checked.target)) == names
+
+
+def _assert_held_back(rig: _Rig, response: httpx.Response, marker: str) -> None:
+    _assert_rejected(response, _SECOND_NOT_AN_OBJECT)
+    assert _delivered(rig, marker) == ()
+
+
+_PROVIDERS: Final[Mapping[str, Callable[[str], dict[str, JsonValue]]]] = MappingProxyType(
+    {
+        "openai": lambda wire: {
+            "model": f"openai/{_OPENAI_BACKEND}",
+            "api_base": f"{wire}/v1",
+            "api_key": _PROVIDER_KEY,
+        },
+        "anthropic": lambda wire: {"model": f"anthropic/{_CLAUDE_BACKEND}", "api_base": wire, "api_key": _PROVIDER_KEY},
+        "gemini": lambda wire: {"model": f"gemini/{_GEMINI_BACKEND}", "api_base": wire, "api_key": _PROVIDER_KEY},
+    }
+)
+_DROP_VARIANTS: Final[Mapping[str, dict[str, JsonValue]]] = MappingProxyType(
+    {
+        "plain": {},
+        "lists_web_search": {"additional_drop_params": ["web_search_options"]},
+        "lists_tools": {"additional_drop_params": ["tools"]},
+        "keeps": {"drop_params": False},
+    }
+)
+
+
+@dataclass(frozen=True, slots=True)
+class _Owned:
+    rig: _Rig
+    suffix: str
+
+
+def _owned_name(suffix: str, variant: str, provider: str) -> str:
+    return f"malformed-tools-{variant}-{provider}-{suffix}"
+
+
+def _owned_id(suffix: str, variant: str, provider: str) -> str:
+    return f"{_owned_name(suffix, variant, provider)}-id"
+
+
+@dataclass(frozen=True, slots=True)
+class _OwnedSetup:
+    router_settings: Callable[[str], dict[str, JsonValue]]
+    general: Mapping[str, JsonValue] = MappingProxyType({})
+    extra_models: Callable[[str, str], tuple[dict[str, JsonValue], ...]] = lambda wire, suffix: ()
+
+
+def _router_defaults(defaults: dict[str, JsonValue]) -> _OwnedSetup:
+    return _OwnedSetup(router_settings=lambda suffix: {"default_litellm_params": defaults})
+
+
+def _owned_config(path: Path, wire: str, suffix: str, setup: _OwnedSetup) -> Path:
+    path.write_text(
+        json.dumps(
+            {
+                "model_list": [
+                    *(
+                        {
+                            "model_name": _owned_name(suffix, variant, provider),
+                            "litellm_params": {**deployment(wire), **extra},
+                            "model_info": {"id": _owned_id(suffix, variant, provider)},
+                        }
+                        for (variant, extra), (provider, deployment) in product(
+                            _DROP_VARIANTS.items(), _PROVIDERS.items()
+                        )
+                    ),
+                    *setup.extra_models(wire, suffix),
+                ],
+                "general_settings": {
+                    "master_key": "os.environ/LITELLM_MASTER_KEY",
+                    "database_url": "os.environ/DATABASE_URL",
+                    **setup.general,
+                },
+                "router_settings": setup.router_settings(suffix),
+            }
+        )
+    )
+    return path
+
+
+@contextmanager
+def _owned_proxy(rig: _Rig, directory: Path, setup: _OwnedSetup) -> Iterator[_Owned]:
+    suffix: Final = uuid.uuid4().hex[:12]
+    config: Final = _owned_config(directory / "owned.yaml", rig.wire.url, suffix, setup)
+    with owned_proxy_process(rig.gateway, directory, {}, config=config, workers=2) as proxy:
+        yield _Owned(replace(rig, gateway=proxy.gateway), suffix)
+
+
+@pytest.fixture(scope="module")
+def tools_default(rig: _Rig, tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Owned]:
+    directory: Final = tmp_path_factory.mktemp("malformed-tools-tools-default")
+    with _owned_proxy(rig, directory, _router_defaults({"additional_drop_params": ["tools"]})) as owned:
+        yield owned
+
+
+@pytest.fixture(scope="module")
+def drop_default(rig: _Rig, tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Owned]:
+    directory: Final = tmp_path_factory.mktemp("malformed-tools-drop-default")
+    with _owned_proxy(rig, directory, _router_defaults({"drop_params": True, "additional_drop_params": None})) as owned:
+        yield owned
+
+
+@pytest.fixture(scope="module")
+def client_side(rig: _Rig, tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Owned]:
+    directory: Final = tmp_path_factory.mktemp("malformed-tools-client-side")
+    setup: Final = replace(
+        _router_defaults({"additional_drop_params": "tools"}),
+        general=MappingProxyType({"allow_client_side_credentials": True}),
+    )
+    with _owned_proxy(rig, directory, setup) as owned:
+        yield owned
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_ENTRY_SHAPES
+@_EACH_CHECKED
+def test_a_router_default_list_naming_tools_answers_malformed_tools(
+    tools_default: _Owned, checked: _Checked, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(tools_default.suffix, "plain", checked.provider)
+    response: Final = checked.send(tools_default.rig, model, marker, {"tools": [checked.tool, bad_entry(checked)]})
+    _assert_forwarded(tools_default.rig, checked, response, marker, checked.kept_by_a_tools_list)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_EACH_CHECKED
+def test_a_request_list_replaces_a_router_default_list(tools_default: _Owned, checked: _Checked) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(tools_default.suffix, "plain", checked.provider)
+    response: Final = checked.send(
+        tools_default.rig,
+        model,
+        marker,
+        {"tools": [checked.tool, 5], "additional_drop_params": ["web_search_options"]},
+    )
+    _assert_held_back(tools_default.rig, response, marker)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_ENTRY_SHAPES
+@_EACH_CHECKED
+def test_a_router_default_list_replaces_a_deployment_list(
+    tools_default: _Owned, checked: _Checked, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(tools_default.suffix, "lists_web_search", checked.provider)
+    response: Final = checked.send(tools_default.rig, model, marker, {"tools": [checked.tool, bad_entry(checked)]})
+    _assert_forwarded(tools_default.rig, checked, response, marker, checked.kept_by_a_tools_list)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_ENTRY_SHAPES
+def test_a_router_default_list_replaces_the_list_of_a_deployment_named_by_id(
+    tools_default: _Owned, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    checked: Final = _CHECKED["chat"]
+    model: Final = _owned_id(tools_default.suffix, "lists_web_search", checked.provider)
+    response: Final = checked.send(tools_default.rig, model, marker, {"tools": [checked.tool, bad_entry(checked)]})
+    _assert_forwarded(tools_default.rig, checked, response, marker, ())
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@pytest.mark.parametrize("value", [None, [], 5], ids=["null", "empty_list", "int"])
+def test_a_request_list_naming_nothing_replaces_a_router_default_list(tools_default: _Owned, value: JsonValue) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(tools_default.suffix, "plain", "openai")
+    response: Final = _send(
+        tools_default.rig, CHAT, marker, False, model=model, tools=[CHAT.tool, 5], additional_drop_params=value
+    )
+    _assert_held_back(tools_default.rig, response, marker)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_a_router_default_list_naming_tools_drops_well_formed_tools(tools_default: _Owned) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(tools_default.suffix, "plain", "openai")
+    response: Final = _send(tools_default.rig, CHAT, marker, False, model=model, tools=[CHAT.tool])
+    _assert_forwarded(tools_default.rig, _CHECKED["chat"], response, marker, ())
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_ENTRY_SHAPES
+@_EACH_CHECKED
+def test_a_router_default_drop_params_keeps_the_good_entries(
+    drop_default: _Owned, checked: _Checked, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(drop_default.suffix, "plain", checked.provider)
+    response: Final = checked.send(drop_default.rig, model, marker, {"tools": [checked.tool, bad_entry(checked)]})
+    _assert_forwarded(drop_default.rig, checked, response, marker, ("get_weather",))
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@pytest.mark.parametrize("drop", [False, None], ids=["false", "null"])
+def test_a_request_drop_params_replaces_a_router_default_drop_params(drop_default: _Owned, drop: JsonValue) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(drop_default.suffix, "plain", "openai")
+    response: Final = _send(drop_default.rig, CHAT, marker, False, model=model, tools=[CHAT.tool, 5], drop_params=drop)
+    _assert_held_back(drop_default.rig, response, marker)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_ENTRY_SHAPES
+@_CHAT_AND_COUNT
+def test_a_router_default_drop_params_replaces_a_deployment_drop_params(
+    drop_default: _Owned, checked: _Checked, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(drop_default.suffix, "keeps", checked.provider)
+    response: Final = checked.send(drop_default.rig, model, marker, {"tools": [checked.tool, bad_entry(checked)]})
+    _assert_forwarded(drop_default.rig, checked, response, marker, ("get_weather",))
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_ENTRY_SHAPES
+@_CHAT_AND_COUNT
+def test_a_null_router_default_list_leaves_the_deployment_list_in_force(
+    drop_default: _Owned, checked: _Checked, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(drop_default.suffix, "lists_tools", checked.provider)
+    response: Final = checked.send(
+        drop_default.rig, model, marker, {"tools": [checked.tool, bad_entry(checked)], "drop_params": False}
+    )
+    _assert_forwarded(drop_default.rig, checked, response, marker, checked.kept_by_a_tools_list)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_a_router_default_list_that_is_a_string_still_rejects_a_bad_tool_entry(client_side: _Owned) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(client_side.suffix, "plain", "openai")
+    response: Final = _send(client_side.rig, CHAT, marker, False, model=model, tools=[CHAT.tool, 5])
+    _assert_held_back(client_side.rig, response, marker)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_a_router_default_list_that_is_a_string_keeps_well_formed_tools(client_side: _Owned) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(client_side.suffix, "plain", "openai")
+    response: Final = _send(client_side.rig, CHAT, marker, False, model=model, tools=[CHAT.tool])
+    _assert_answered(CHAT, response, marker)
+    assert _one_delivery(client_side.rig, marker, "/v1/chat/completions")["tools"] == [CHAT.tool]
+
+
+_USER_CONFIG_DROPS: Final[Mapping[str, tuple[dict[str, JsonValue], dict[str, JsonValue], tuple[str, ...]]]] = (
+    MappingProxyType(
+        {
+            "deployment_list": ({"additional_drop_params": ["tools"]}, {}, ()),
+            "router_default_list": ({}, {"additional_drop_params": ["tools"]}, ()),
+            "router_default_drop_params": ({}, {"drop_params": True}, ("get_weather",)),
+        }
+    )
+)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@pytest.mark.parametrize(("deployment", "defaults", "kept"), _USER_CONFIG_DROPS.values(), ids=_USER_CONFIG_DROPS.keys())
+def test_a_user_config_router_decides_which_malformed_tools_drop(
+    client_side: _Owned,
+    deployment: dict[str, JsonValue],
+    defaults: dict[str, JsonValue],
+    kept: tuple[str, ...],
+) -> None:
+    marker: Final = _marker()
+    checked: Final = _CHECKED["chat"]
+    name: Final = f"malformed-tools-user-config-{uuid.uuid4().hex}"
+    user_config: Final[dict[str, JsonValue]] = {
+        "model_list": [
+            {"model_name": name, "litellm_params": {**_PROVIDERS["openai"](client_side.rig.wire.url), **deployment}}
+        ],
+        "default_litellm_params": defaults,
+    }
+    response: Final = checked.send(
+        client_side.rig, name, marker, {"tools": [checked.tool, checked.bad_entry], "user_config": user_config}
+    )
+    _assert_forwarded(client_side.rig, checked, response, marker, kept)
+
+
+@dataclass(frozen=True, slots=True)
+class _ById:
+    lists_tools: Mapping[str, str]
+    drops: str
+    mixed_drops: str
+    mixed_keeps: str
+    shadowed: str
+
+
+@pytest.fixture(scope="module")
+def by_id(rig: _Rig) -> Iterator[_ById]:
+    openai_deployment: Final = _PROVIDERS["openai"](rig.wire.url)
+    lists_tools: Final[dict[str, JsonValue]] = {"additional_drop_params": ["tools"]}
+    names: Final = MappingProxyType({provider: f"integration-by-id-{uuid.uuid4().hex}" for provider in _PROVIDERS})
+    drops_name: Final = f"integration-by-id-drops-{uuid.uuid4().hex}"
+    mixed: Final = f"integration-by-id-mixed-{uuid.uuid4().hex}"
+    shadow_name: Final = f"integration-by-id-shadow-{uuid.uuid4().hex}"
+    with rig.gateway.scenario() as scenario:
+        listed: Final = MappingProxyType(
+            {
+                provider: _deployment_ids(scenario, names[provider], ({**deployment(rig.wire.url), **lists_tools},))[0]
+                for provider, deployment in _PROVIDERS.items()
+            }
+        )
+        (drops,) = _deployment_ids(scenario, drops_name, ({**openai_deployment, "drop_params": True},))
+        mixed_drops, mixed_keeps = _deployment_ids(
+            scenario, mixed, ({**openai_deployment, **lists_tools}, openai_deployment)
+        )
+        (shadowed,) = _deployment_ids(scenario, shadow_name, ({**openai_deployment, **lists_tools},))
+        _deployment_ids(scenario, shadowed, (openai_deployment,))
+        for group, deployments in (
+            *((name, 1) for name in names.values()),
+            (drops_name, 1),
+            (mixed, 2),
+            (shadow_name, 1),
+            (shadowed, 1),
+        ):
+            wait_for_worker_readiness(rig.gateway, group, deployments, _PROXY_WORKERS)
+        yield _ById(listed, drops, mixed_drops, mixed_keeps, shadowed)
+
+
+@_ENTRY_SHAPES
+@_EACH_CHECKED
+def test_a_deployment_id_answers_malformed_tools_its_deployment_list_drops(
+    rig: _Rig, by_id: _ById, checked: _Checked, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    response: Final = checked.send(
+        rig, by_id.lists_tools[checked.provider], marker, {"tools": [checked.tool, bad_entry(checked)]}
+    )
+    _assert_forwarded(rig, checked, response, marker, checked.kept_by_a_tools_list)
+
+
+@_EACH_CHECKED
+def test_a_request_list_replaces_the_list_of_a_deployment_named_by_id(
+    rig: _Rig, by_id: _ById, checked: _Checked
+) -> None:
+    marker: Final = _marker()
+    response: Final = checked.send(
+        rig,
+        by_id.lists_tools[checked.provider],
+        marker,
+        {"tools": [checked.tool, 5], "additional_drop_params": ["web_search_options"]},
+    )
+    _assert_held_back(rig, response, marker)
+
+
+@_ENTRY_SHAPES
+def test_the_id_of_the_dropping_deployment_in_a_mixed_group_drops_malformed_tools(
+    rig: _Rig, by_id: _ById, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    checked: Final = _CHECKED["chat"]
+    response: Final = checked.send(rig, by_id.mixed_drops, marker, {"tools": [checked.tool, bad_entry(checked)]})
+    _assert_forwarded(rig, checked, response, marker, ())
+
+
+def test_the_keeping_id_of_a_mixed_group_rejects_malformed_tools(rig: _Rig, by_id: _ById) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, model=by_id.mixed_keeps, tools=[CHAT.tool, 5])
+    _assert_held_back(rig, response, marker)
+
+
+@_ENTRY_SHAPES
+def test_the_id_of_a_drop_params_deployment_keeps_the_good_entries(
+    rig: _Rig, by_id: _ById, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    checked: Final = _CHECKED["chat"]
+    response: Final = checked.send(rig, by_id.drops, marker, {"tools": [checked.tool, bad_entry(checked)]})
+    _assert_forwarded(rig, checked, response, marker, ("get_weather",))
+
+
+def test_a_model_name_wins_over_an_equal_deployment_id(rig: _Rig, by_id: _ById) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, model=by_id.shadowed, tools=[CHAT.tool, 5])
+    _assert_held_back(rig, response, marker)
+
+
+def test_a_deployment_id_with_a_tools_list_drops_well_formed_tools(rig: _Rig, by_id: _ById) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, CHAT, marker, False, model=by_id.lists_tools["openai"], tools=[CHAT.tool])
+    _assert_forwarded(rig, _CHECKED["chat"], response, marker, ())
+
+
+def _failed_over(request: Request) -> bool:
+    return request.target.startswith((_DOWN, *(prefix for prefix, _ in _REFUSALS.values())))
+
+
+def _assert_failed_over(
+    rig: _Rig, checked: _Checked, response: httpx.Response, marker: str, names: tuple[str, ...]
+) -> None:
+    checked.answered(response, marker)
+    delivered: Final = _delivered(rig, marker)
+    (served,) = tuple(request for request in delivered if not _failed_over(request))
+    assert checked.target in served.target, served.target
+    assert _tool_names(checked.named_as, _JSON_OBJECT.validate_json(served.body)) == names
+
+
+_FALLBACK_CHECKED: Final = pytest.mark.parametrize(
+    "checked",
+    tuple(_CHECKED[name] for name in ("chat", "messages", "responses")),
+    ids=("chat", "messages", "responses"),
+)
+_TOKEN_COUNTS: Final = pytest.mark.parametrize(
+    "checked", (_CHECKED["count_tokens"], _CHECKED["input_tokens"]), ids=("count_tokens", "input_tokens")
+)
+
+
+@dataclass(frozen=True, slots=True)
+class _Reroute:
+    down: Mapping[str, str]
+    lists_tools: Mapping[str, str]
+    refusing: Mapping[str, str]
+    fallback_keys: Mapping[str, str]
+    team_key: str
+    team_models: Mapping[str, str]
+
+
+@pytest.fixture(scope="module")
+def reroute(rig: _Rig, field_groups: _FieldGroups) -> Iterator[_Reroute]:
+    lists_tools: Final = MappingProxyType({"openai": rig.field_group, "anthropic": field_groups.anthropic})
+    with rig.gateway.scenario() as scenario:
+        down: Final = MappingProxyType(
+            {provider: scenario.model(**_PROVIDERS[provider](f"{rig.wire.url}/down")) for provider in lists_tools}
+        )
+        refusing: Final = MappingProxyType(
+            {
+                chain: scenario.model(**_PROVIDERS["openai"](f"{rig.wire.url}{prefix.rstrip('/')}"))
+                for chain, (prefix, _) in _REFUSALS.items()
+            }
+        )
+        router_settings: Final[dict[str, JsonValue]] = {"fallbacks": [{down["openai"]: [rig.field_group]}]}
+        public_team: Final = scenario.team()
+        team_models: Final = MappingProxyType(
+            {
+                provider: scenario.model(
+                    **_PROVIDERS[provider](rig.wire.url),
+                    additional_drop_params=["tools"],
+                    model_info={"team_id": public_team},
+                )
+                for provider in lists_tools
+            }
+        )
+        built: Final = _Reroute(
+            down=down,
+            lists_tools=lists_tools,
+            refusing=refusing,
+            fallback_keys=MappingProxyType(
+                {
+                    "key": scenario.key(router_settings=router_settings),
+                    "team": scenario.key(team_id=scenario.team(router_settings=router_settings)),
+                }
+            ),
+            team_key=scenario.key(team_id=public_team),
+            team_models=team_models,
+        )
+        for group in (*down.values(), *refusing.values(), *team_models.values()):
+            wait_for_worker_readiness(rig.gateway, group, 1, _PROXY_WORKERS)
+        yield built
+
+
+@_FALLBACK_CHECKED
+def test_a_request_fallback_to_a_group_listing_tools_answers_a_bad_tool_entry(
+    rig: _Rig, reroute: _Reroute, checked: _Checked
+) -> None:
+    marker: Final = _marker()
+    response: Final = checked.send(
+        rig,
+        reroute.down[checked.provider],
+        marker,
+        {"tools": [checked.tool, checked.bad_entry], "fallbacks": [reroute.lists_tools[checked.provider]]},
+    )
+    _assert_failed_over(rig, checked, response, marker, ())
+
+
+def test_a_generic_request_fallback_to_a_group_listing_tools_answers_a_bad_tool_entry(
+    rig: _Rig, reroute: _Reroute
+) -> None:
+    marker: Final = _marker()
+    checked: Final = _CHECKED["chat"]
+    response: Final = checked.send(
+        rig,
+        reroute.down["openai"],
+        marker,
+        {"tools": [checked.tool, checked.bad_entry], "fallbacks": [{"*": [rig.field_group]}]},
+    )
+    _assert_failed_over(rig, checked, response, marker, ())
+
+
+@pytest.mark.parametrize(
+    "fallbacks",
+    [[], None, lambda rig: [{rig.drop_group: [rig.field_group]}]],
+    ids=["empty_list", "null", "chain_of_another_group"],
+)
+def test_a_request_fallback_that_cannot_apply_still_rejects_a_bad_tool_entry(
+    rig: _Rig, fallbacks: JsonValue | Callable[[_Rig], JsonValue]
+) -> None:
+    marker: Final = _marker()
+    chains: Final = fallbacks(rig) if callable(fallbacks) else fallbacks
+    response: Final = _send(rig, CHAT, marker, False, tools=[CHAT.tool, 5], fallbacks=chains)
+    _assert_held_back(rig, response, marker)
+
+
+@pytest.mark.parametrize("owner", ["key", "team"])
+def test_router_settings_fallbacks_of_a_key_or_team_answer_a_bad_tool_entry(
+    rig: _Rig, reroute: _Reroute, owner: str
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig,
+        CHAT,
+        marker,
+        False,
+        model=reroute.down["openai"],
+        key=reroute.fallback_keys[owner],
+        tools=[CHAT.tool, _CHAT_BAD_ENTRY],
+    )
+    _assert_failed_over(rig, _CHECKED["chat"], response, marker, ())
+
+
+@pytest.mark.parametrize("chain", tuple(_REFUSALS))
+def test_an_error_specific_fallback_never_sees_a_bad_tool_entry_the_first_deployment_rejects(
+    rig: _Rig, reroute: _Reroute, chain: str
+) -> None:
+    marker: Final = _marker()
+    refusing: Final = reroute.refusing[chain]
+    response: Final = _send(
+        rig,
+        CHAT,
+        marker,
+        False,
+        model=refusing,
+        tools=[CHAT.tool, 5],
+        **{chain: [{refusing: [rig.field_group]}]},
+    )
+    _assert_held_back(rig, response, marker)
+
+
+def test_a_comma_batch_lets_each_group_decide_on_a_bad_tool_entry(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig, CHAT, marker, False, model=f"{rig.field_group},{rig.openai}", tools=[CHAT.tool, _CHAT_BAD_ENTRY]
+    )
+    assert response.status_code == 200, response.text
+    assert _answer(_tag(marker)) in response.text, response.text
+    delivered: Final = sorted(
+        (_JSON_OBJECT.validate_json(request.body).get("tools") for request in _delivered(rig, marker)), key=bool
+    )
+    assert delivered == [None]
+
+
+def test_a_team_public_model_name_answers_a_bad_tool_entry_its_deployment_list_drops(
+    rig: _Rig, reroute: _Reroute
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig,
+        CHAT,
+        marker,
+        False,
+        model=reroute.team_models["openai"],
+        key=reroute.team_key,
+        tools=[CHAT.tool, _CHAT_BAD_ENTRY],
+    )
+    _assert_forwarded(rig, _CHECKED["chat"], response, marker, ())
+
+
+def test_count_tokens_by_a_team_public_model_name_rejects_a_bad_tool_entry(rig: _Rig, reroute: _Reroute) -> None:
+    marker: Final = _marker()
+    response: Final = rig.gateway.request(
+        "POST",
+        "/v1/messages/count_tokens",
+        {
+            "model": reroute.team_models["anthropic"],
+            "messages": [{"role": "user", "content": marker}],
+            "tools": [MESSAGES.tool, 5],
+        },
+        key=reroute.team_key,
+    )
+    _assert_held_back(rig, response, marker)
+
+
+def test_a_request_list_naming_web_search_options_on_a_fallback_chain_still_rejects_a_bad_tool_entry(
+    rig: _Rig,
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig,
+        CHAT,
+        marker,
+        False,
+        tools=[CHAT.tool, 5],
+        web_search_options=5,
+        additional_drop_params=["web_search_options"],
+        fallbacks=[{rig.openai: [rig.field_group]}],
+    )
+    _assert_held_back(rig, response, marker)
+
+
+def test_request_drop_params_on_a_fallback_chain_keeps_the_good_entries(rig: _Rig) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rig,
+        CHAT,
+        marker,
+        False,
+        tools=[CHAT.tool, _CHAT_BAD_ENTRY],
+        drop_params=True,
+        fallbacks=[{rig.openai: [rig.field_group]}],
+    )
+    _assert_forwarded(rig, _CHECKED["chat"], response, marker, ("get_weather",))
+
+
+@_ENTRY_SHAPES
+def test_a_request_list_with_a_non_string_entry_drops_tools_it_names_on_messages(
+    rig: _Rig, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    checked: Final = _CHECKED["messages"]
+    response: Final = checked.send(
+        rig,
+        rig.anthropic,
+        marker,
+        {"tools": [checked.tool, bad_entry(checked)], "additional_drop_params": ["tools", 5]},
+    )
+    _assert_forwarded(rig, checked, response, marker, ())
+
+
+@_ENTRY_SHAPES
+def test_a_deployment_list_with_a_non_string_entry_drops_tools_it_names_on_messages(
+    rig: _Rig, bad_entry: _BadEntry
+) -> None:
+    marker: Final = _marker()
+    checked: Final = _CHECKED["messages"]
+    with rig.gateway.scenario() as scenario:
+        group: Final = scenario.model(**_PROVIDERS["anthropic"](rig.wire.url), additional_drop_params=["tools", 5])
+        wait_for_worker_readiness(rig.gateway, group, 1, _PROXY_WORKERS)
+        response: Final = checked.send(rig, group, marker, {"tools": [checked.tool, bad_entry(checked)]})
+    _assert_forwarded(rig, checked, response, marker, ())
+
+
+@_TOKEN_COUNTS
+def test_token_counting_with_a_request_list_with_a_non_string_entry_drops_the_bad_entry(
+    rig: _Rig, checked: _Checked
+) -> None:
+    marker: Final = _marker()
+    response: Final = checked.send(
+        rig, rig.anthropic, marker, {"tools": [checked.tool, 5], "additional_drop_params": ["tools", 5]}
+    )
+    _assert_forwarded(rig, checked, response, marker, ("get_weather",))
+
+
+def _alias(suffix: str, variant: str) -> str:
+    return f"malformed-tools-alias-{variant}-{suffix}"
+
+
+def _routing_group(suffix: str, provider: str) -> str:
+    return f"malformed-tools-routed-{provider}-{suffix}"
+
+
+def _wildcard(suffix: str) -> str:
+    return f"malformed-tools-wild-{suffix}"
+
+
+def _direct(suffix: str) -> str:
+    return f"malformed-tools-direct-{suffix}"
+
+
+def _down_models(wire: str, suffix: str) -> tuple[dict[str, JsonValue], ...]:
+    return tuple(
+        {"model_name": _owned_name(suffix, "down", provider), "litellm_params": _PROVIDERS[provider](f"{wire}/down")}
+        for provider in ("openai", "anthropic")
+    )
+
+
+def _rerouting_models(wire: str, suffix: str) -> tuple[dict[str, JsonValue], ...]:
+    lists_tools: Final = _owned_name(suffix, "lists_tools", "openai")
+    return (
+        *_down_models(wire, suffix),
+        {
+            "model_name": _owned_name(suffix, "auto", "openai"),
+            "litellm_params": {
+                "model": "auto_router/complexity_router",
+                "complexity_router_default_model": lists_tools,
+                "complexity_router_config": {
+                    "tiers": dict.fromkeys(("SIMPLE", "MEDIUM", "COMPLEX", "REASONING"), lists_tools)
+                },
+            },
+        },
+        {
+            "model_name": _owned_name(suffix, "direct", "openai"),
+            "litellm_params": {
+                **_PROVIDERS["openai"](wire),
+                "model": f"openai/{_direct(suffix)}",
+                "additional_drop_params": ["tools"],
+            },
+        },
+        {
+            "model_name": f"{_wildcard(suffix)}/*",
+            "litellm_params": {**_PROVIDERS["openai"](wire), "model": "openai/*", "additional_drop_params": ["tools"]},
+        },
+    )
+
+
+def _rerouting_settings(suffix: str) -> dict[str, JsonValue]:
+    return {
+        "fallbacks": [
+            {_owned_name(suffix, "down", provider): [_owned_name(suffix, "lists_tools", provider)]}
+            for provider in ("openai", "anthropic")
+        ],
+        "model_group_alias": {
+            _alias(suffix, variant): _owned_name(suffix, variant, "openai") for variant in ("lists_tools", "plain")
+        },
+        "routing_groups": [
+            {
+                "group_name": _routing_group(suffix, provider),
+                "models": [_owned_name(suffix, "lists_tools", provider)],
+                "routing_strategy": "simple-shuffle",
+            }
+            for provider in ("openai", "anthropic")
+        ],
+        "num_retries": 0,
+        "disable_cooldowns": True,
+    }
+
+
+@pytest.fixture(scope="module")
+def rerouting(rig: _Rig, tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Owned]:
+    directory: Final = tmp_path_factory.mktemp("malformed-tools-rerouting")
+    setup: Final = _OwnedSetup(router_settings=_rerouting_settings, extra_models=_rerouting_models)
+    with _owned_proxy(rig, directory, setup) as owned:
+        yield owned
+
+
+@pytest.fixture(scope="module")
+def default_fallbacks(rig: _Rig, tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Owned]:
+    directory: Final = tmp_path_factory.mktemp("malformed-tools-default-fallbacks")
+    setup: Final = _OwnedSetup(
+        router_settings=lambda suffix: {
+            "default_fallbacks": [_owned_name(suffix, "lists_tools", "openai")],
+            "num_retries": 0,
+            "disable_cooldowns": True,
+        },
+        extra_models=_down_models,
+    )
+    with _owned_proxy(rig, directory, setup) as owned:
+        yield owned
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@pytest.mark.parametrize("checked", (_CHECKED["chat"], _CHECKED["messages"]), ids=("chat", "messages"))
+def test_a_router_fallback_to_a_group_listing_tools_answers_a_bad_tool_entry(
+    rerouting: _Owned, checked: _Checked
+) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(rerouting.suffix, "down", checked.provider)
+    response: Final = checked.send(rerouting.rig, model, marker, {"tools": [checked.tool, checked.bad_entry]})
+    _assert_failed_over(rerouting.rig, checked, response, marker, ())
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@pytest.mark.parametrize(
+    ("variant", "fields"),
+    [("plain", {}), ("down", {"fallbacks": []})],
+    ids=["group_outside_the_chain", "chain_cleared_by_the_request"],
+)
+def test_a_router_fallback_that_cannot_apply_still_rejects_a_bad_tool_entry(
+    rerouting: _Owned, variant: str, fields: dict[str, JsonValue]
+) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(rerouting.suffix, variant, "openai")
+    response: Final = _send(rerouting.rig, CHAT, marker, False, model=model, tools=[CHAT.tool, 5], **fields)
+    _assert_held_back(rerouting.rig, response, marker)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_TOKEN_COUNTS
+def test_token_counting_on_a_group_with_a_router_fallback_rejects_a_bad_tool_entry(
+    rerouting: _Owned, checked: _Checked
+) -> None:
+    marker: Final = _marker()
+    model: Final = _owned_name(rerouting.suffix, "down", "anthropic")
+    response: Final = checked.send(rerouting.rig, model, marker, {"tools": [checked.tool, 5]})
+    _assert_held_back(rerouting.rig, response, marker)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_an_alias_of_a_group_listing_tools_answers_a_bad_tool_entry(rerouting: _Owned) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rerouting.rig,
+        CHAT,
+        marker,
+        False,
+        model=_alias(rerouting.suffix, "lists_tools"),
+        tools=[CHAT.tool, _CHAT_BAD_ENTRY],
+    )
+    _assert_forwarded(rerouting.rig, _CHECKED["chat"], response, marker, ())
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_an_alias_of_a_plain_group_rejects_a_bad_tool_entry(rerouting: _Owned) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rerouting.rig, CHAT, marker, False, model=_alias(rerouting.suffix, "plain"), tools=[CHAT.tool, 5]
+    )
+    _assert_held_back(rerouting.rig, response, marker)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_a_routing_group_over_a_group_listing_tools_answers_a_bad_tool_entry(rerouting: _Owned) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rerouting.rig,
+        CHAT,
+        marker,
+        False,
+        model=_routing_group(rerouting.suffix, "openai"),
+        tools=[CHAT.tool, _CHAT_BAD_ENTRY],
+    )
+    _assert_forwarded(rerouting.rig, _CHECKED["chat"], response, marker, ())
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_count_tokens_by_a_routing_group_rejects_a_bad_tool_entry(rerouting: _Owned) -> None:
+    marker: Final = _marker()
+    response: Final = _count_tokens(
+        rerouting.rig, _routing_group(rerouting.suffix, "anthropic"), marker, {"tools": [MESSAGES.tool, 5]}
+    )
+    _assert_held_back(rerouting.rig, response, marker)
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@pytest.mark.parametrize(
+    ("model", "fields"),
+    [
+        (lambda suffix: _owned_name(suffix, "auto", "openai"), {}),
+        (lambda suffix: f"{_wildcard(suffix)}/{_OPENAI_BACKEND}", {}),
+        (lambda suffix: f"openai/{_direct(suffix)}", {}),
+        (lambda suffix: f"openai/{_direct(suffix)}", {"specific_deployment": True}),
+    ],
+    ids=["auto_router", "wildcard_route", "model_string", "specific_deployment"],
+)
+def test_a_model_the_router_resolves_later_answers_a_bad_tool_entry_its_deployment_list_drops(
+    rerouting: _Owned, model: Callable[[str], str], fields: dict[str, JsonValue]
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        rerouting.rig,
+        CHAT,
+        marker,
+        False,
+        model=model(rerouting.suffix),
+        tools=[CHAT.tool, _CHAT_BAD_ENTRY],
+        **fields,
+    )
+    _assert_forwarded(rerouting.rig, _CHECKED["chat"], response, marker, ())
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_default_fallbacks_to_a_group_listing_tools_answer_a_bad_tool_entry(default_fallbacks: _Owned) -> None:
+    marker: Final = _marker()
+    response: Final = _send(
+        default_fallbacks.rig,
+        CHAT,
+        marker,
+        False,
+        model=_owned_name(default_fallbacks.suffix, "down", "openai"),
+        tools=[CHAT.tool, _CHAT_BAD_ENTRY],
+    )
+    _assert_failed_over(default_fallbacks.rig, _CHECKED["chat"], response, marker, ())
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+def test_a_user_config_model_named_like_a_proxy_group_drops_tools_its_own_list_names(client_side: _Owned) -> None:
+    marker: Final = _marker()
+    name: Final = _owned_name(client_side.suffix, "plain", "openai")
+    user_config: Final[dict[str, JsonValue]] = {
+        "model_list": [
+            {
+                "model_name": name,
+                "litellm_params": {
+                    **_PROVIDERS["openai"](client_side.rig.wire.url),
+                    "additional_drop_params": ["tools"],
+                },
+            }
+        ],
+    }
+    response: Final = _send(
+        client_side.rig,
+        CHAT,
+        marker,
+        False,
+        model=name,
+        tools=[CHAT.tool, _CHAT_BAD_ENTRY],
+        user_config=user_config,
+    )
+    _assert_forwarded(client_side.rig, _CHECKED["chat"], response, marker, ())
+
+
+_GUARDED_NAMES: Final = ("chat", "messages", "responses", "generate_content")
+_EACH_GUARDED: Final = pytest.mark.parametrize(
+    "checked", tuple(_CHECKED[name] for name in _GUARDED_NAMES), ids=_GUARDED_NAMES
+)
+_GUARDRAIL_VENDOR_PATH: Final = "/beta/litellm_basic_guardrail_api"
+
+
+@dataclass(frozen=True, slots=True)
+class _Guarded:
+    rig: _Rig
+    vendor: Wire
+    models: Mapping[str, str]
+
+
+def _guarded_config(path: Path, wire: str, vendor: str, models: Mapping[str, str]) -> Path:
+    path.write_text(
+        json.dumps(
+            {
+                "model_list": [
+                    {"model_name": name, "litellm_params": _PROVIDERS[provider](wire)}
+                    for provider, name in models.items()
+                ],
+                "general_settings": {
+                    "master_key": "os.environ/LITELLM_MASTER_KEY",
+                    "database_url": "os.environ/DATABASE_URL",
+                },
+                "guardrails": [
+                    {
+                        "guardrail_name": "malformed-tools-vendor",
+                        "litellm_params": {
+                            "guardrail": "generic_guardrail_api",
+                            "mode": "pre_call",
+                            "default_on": True,
+                            "api_base": vendor,
+                            "api_key": "synthetic-guardrail-key",
+                        },
+                    }
+                ],
+            }
+        )
+    )
+    return path
+
+
+def _guardrail_verdict(request: Request) -> Reply:
+    assert request.target == _GUARDRAIL_VENDOR_PATH, request.target
+    return Reply(body=json.dumps({"action": "NONE"}).encode())
+
+
+@pytest.fixture(scope="module")
+def guarded(rig: _Rig, tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Guarded]:
+    directory: Final = tmp_path_factory.mktemp("malformed-tools-guarded")
+    suffix: Final = uuid.uuid4().hex[:12]
+    models: Final = MappingProxyType(
+        {provider: f"malformed-tools-guarded-{provider}-{suffix}" for provider in _PROVIDERS}
+    )
+    with wire_server(_guardrail_verdict) as vendor:
+        config: Final = _guarded_config(directory / "guarded.yaml", rig.wire.url, vendor.url, models)
+        with owned_proxy_process(rig.gateway, directory, {}, config=config, workers=2) as proxy:
+            yield _Guarded(replace(rig, gateway=proxy.gateway), vendor, models)
+
+
+def _vendor_payloads(guarded: _Guarded, marker: str) -> tuple[dict[str, JsonValue], ...]:
+    return tuple(
+        _JSON_OBJECT.validate_json(request.body)
+        for request in guarded.vendor.drain()
+        if marker in request.body.decode()
+    )
+
+
+@pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
+@_EACH_GUARDED
+def test_a_pre_call_guardrail_passes_well_formed_tools_through_to_the_provider(
+    guarded: _Guarded, checked: _Checked
+) -> None:
+    marker: Final = _marker()
+    response: Final = checked.send(guarded.rig, guarded.models[checked.provider], marker, {"tools": [checked.tool]})
+    _assert_forwarded(guarded.rig, checked, response, marker, ("get_weather",))
+    payloads: Final = _vendor_payloads(guarded, marker)
+    assert len(payloads) == 1, payloads
+    assert all(payload.get("tools") is None or isinstance(payload["tools"], list) for payload in payloads), payloads
+
+
+_PROVIDER_WIRES: Final[Mapping[str, tuple[_Family, Callable[[bool], str]]]] = MappingProxyType(
+    {
+        "openai": (CHAT, lambda stream: "/v1/chat/completions"),
+        "openai_responses": (RESPONSES, lambda stream: "/v1/responses"),
+        "anthropic": (MESSAGES, lambda stream: "/v1/messages"),
+        "gemini": (GENERATE, lambda stream: ":streamGenerateContent" if stream else ":generateContent"),
+    }
+)
+_NATIVE_PROVIDERS: Final[Mapping[str, tuple[str, ...]]] = MappingProxyType(
+    {
+        "chat": ("openai",),
+        "messages": ("anthropic",),
+        "responses": ("openai", "openai_responses"),
+        "generate_content": ("gemini",),
+    }
+)
+_ROUTED_ELSEWHERE: Final[Mapping[tuple[str, str], str]] = MappingProxyType({("messages", "openai"): "openai_responses"})
+_BRIDGES: Final = tuple(
+    (family, provider)
+    for family, provider in product(_FAMILIES, _PROVIDER_WIRES)
+    if provider not in _NATIVE_PROVIDERS[family.name]
+)
+
+
+@pytest.fixture(scope="module")
+def bridge_groups(rig: _Rig) -> Iterator[Mapping[str, str]]:
+    with rig.gateway.scenario() as scenario:
+        responses_group: Final = scenario.model(
+            model=f"openai/responses/{_OPENAI_BACKEND}", api_base=f"{rig.wire.url}/v1", api_key=_PROVIDER_KEY
+        )
+        wait_for_worker_readiness(rig.gateway, responses_group, 1, _PROXY_WORKERS)
+        yield MappingProxyType(
+            {
+                "openai": rig.openai,
+                "openai_responses": responses_group,
+                "anthropic": rig.anthropic,
+                "gemini": rig.gemini,
+            }
+        )
+
+
+@_STREAMS
+@pytest.mark.parametrize(
+    ("family", "provider"), _BRIDGES, ids=tuple(f"{family.name}_to_{provider}" for family, provider in _BRIDGES)
+)
+def test_well_formed_tools_cross_the_bridge_to_another_provider(
+    rig: _Rig, bridge_groups: Mapping[str, str], family: _Family, provider: str, stream: bool
+) -> None:
+    marker: Final = _marker()
+    response: Final = _send(rig, family, marker, stream, model=bridge_groups[provider], tools=[family.tool])
+    assert response.status_code == 200, response.text
+    assert _answer(_tag(marker)) in response.text, response.text
+    named_as, target = _PROVIDER_WIRES[_ROUTED_ELSEWHERE.get((family.name, provider), provider)]
+    assert _tool_names(named_as, _one_delivery(rig, marker, target(stream))) == ("get_weather",)
diff --git a/tests/integration/providers/test_openai_dialect_prompt_cache_breakpoint_owned_proxy.py b/tests/integration/providers/test_openai_dialect_prompt_cache_breakpoint_owned_proxy.py
index 920002316bc..00f2c430ea5 100644
--- a/tests/integration/providers/test_openai_dialect_prompt_cache_breakpoint_owned_proxy.py
+++ b/tests/integration/providers/test_openai_dialect_prompt_cache_breakpoint_owned_proxy.py
@@ -2,8 +2,8 @@ import asyncio
 import re
 import threading
 from collections.abc import Callable, Iterator
-from concurrent.futures import ThreadPoolExecutor
-from dataclasses import dataclass
+from concurrent.futures import Future, ThreadPoolExecutor
+from dataclasses import dataclass, replace
 from pathlib import Path
 from queue import SimpleQueue
 from types import MappingProxyType
@@ -15,7 +15,7 @@ import psutil
 import pytest
 from integration._support.client import Gateway, Scenario, eventually, gateway_from_environment
 from integration._support.database import read_rows
-from integration._support.process import OwnedProxy, graceful_stop_seconds, owned_proxy_process
+from integration._support.process import OwnedProxy, WorkerHealthcheck, graceful_stop_seconds, owned_proxy_process
 from integration._support.responses_vendor import newest_marker
 from integration._support.wire import Reply, Request, Wire, wire_server
 from integration.providers._cache_control_marks_support import owned_config
@@ -27,6 +27,7 @@ from integration.providers._mantle_gpt_prompt_cache_support import (
     SYSTEM_POINT,
     TOKEN,
     Outcome,
+    Step,
     assert_answered,
     assert_burst_landed,
     assert_wire,
@@ -60,7 +61,6 @@ _CELL_TIMEOUT: Final = int(2 * graceful_stop_seconds() + 120)
 _RESTART_TIMEOUT: Final = int(4 * graceful_stop_seconds() + 240)
 _HELD_BURST: Final = 20
 _SPREAD_BURST: Final = 12
-_SPREAD_ATTEMPTS: Final = 20
 _MANTLE_NAME: Final = "mantle-gpt-cache-owned"
 
 
@@ -122,7 +122,9 @@ def rig(tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Rig]:
     release.set()
     held: Final[SimpleQueue[str]] = SimpleQueue()
     with gateway_from_environment() as environment, wire_server(_peer(release, held)) as wire:
-        with owned_proxy_process(environment, directory, _overrides(wire), workers=2) as owned:
+        with owned_proxy_process(
+            environment, directory, _overrides(wire), workers=2, healthcheck=WorkerHealthcheck.LENIENT
+        ) as owned:
             eventually(lambda: len(_started_workers(owned.log)), lambda count: count == 2, seconds=60)
             wire.drain()
             yield _Rig(owned.gateway, wire, owned, release, held)
@@ -204,38 +206,48 @@ def test_b11_foundry_gpt6_chat_stays_on_the_plain_chat_wire(rig: _Rig) -> None:
         success_row(name, marker)
 
 
-def _spread_burst(rig: _Rig, name: str, workers: tuple[int, ...]) -> dict[int, int]:
-    plan: Final = plan_burst(_SPREAD_BURST)
-    _drain(rig.held)
-    rig.wire.drain()
-    rig.release.clear()
-    with ThreadPoolExecutor(max_workers=_SPREAD_BURST) as pool:
-        futures: Final = tuple(
-            pool.submit(send, rig.gateway, endpoint, request_body(endpoint, name, prompt_text(marker), stream=stream))
-            for endpoint, stream, marker in plan
-        )
-        eventually(rig.held.qsize, lambda size: size == _SPREAD_BURST, seconds=60)
-        held_by: Final = {pid: _open_peer_connections(pid, rig.wire.url) for pid in workers}
-        rig.release.set()
-        outcomes: Final = tuple(future.result() for future in futures)
-    assert sum(held_by.values()) == _SPREAD_BURST, held_by
-    assert_burst_landed(
-        rig.wire, name, tuple((marker, outcome) for (_, _, marker), outcome in zip(plan, outcomes)), marked=True
-    )
-    return held_by
-
-
 @pytest.mark.timeout(_CELL_TIMEOUT)
 def test_e6_every_worker_of_a_two_worker_proxy_marks_the_mantle_request(rig: _Rig) -> None:
-    with rig.gateway.scenario() as scenario:
+    plan: Final = plan_burst(_SPREAD_BURST)
+    half: Final = len(plan) // 2
+    with (
+        rig.gateway.scenario() as scenario,
+        httpx.Client(
+            base_url=str(rig.gateway.client.base_url),
+            timeout=60,
+            trust_env=False,
+            limits=httpx.Limits(max_keepalive_connections=0),
+        ) as unpooled,
+        ThreadPoolExecutor(max_workers=len(plan)) as pool,
+    ):
         name: Final = mantle_deployment(rig.gateway, scenario, rig.wire)
-        workers: Final = _live_workers(rig.owned.log)
-        assert len(workers) == 2, workers
-        for _ in range(_SPREAD_ATTEMPTS):
-            if all(count > 0 for count in _spread_burst(rig, name, workers).values()):
-                break
-        else:
-            raise AssertionError("One worker never took a marked request")
+        first, second = sorted(_live_workers(rig.owned.log))
+        gateway: Final = replace(rig.gateway, client=unpooled)
+        _drain(rig.held)
+        rig.wire.drain()
+        rig.release.clear()
+
+        def submit(part: tuple[Step, ...]) -> tuple[Future[Outcome], ...]:
+            return tuple(
+                pool.submit(send, gateway, endpoint, request_body(endpoint, name, prompt_text(marker), stream=stream))
+                for endpoint, stream, marker in part
+            )
+
+        try:
+            with rig.owned.suspended(second):
+                on_first: Final = submit(plan[:half])
+                eventually(rig.held.qsize, lambda size: size == half, seconds=60)
+            with rig.owned.suspended(first):
+                on_second: Final = submit(plan[half:])
+                eventually(rig.held.qsize, lambda size: size == len(plan), seconds=60)
+            held_by: Final = {pid: _open_peer_connections(pid, rig.wire.url) for pid in (first, second)}
+        finally:
+            rig.release.set()
+        outcomes: Final = tuple(future.result() for future in (*on_first, *on_second))
+        assert held_by == {first: half, second: len(plan) - half}, held_by
+        assert_burst_landed(
+            rig.wire, name, tuple((marker, outcome) for (_, _, marker), outcome in zip(plan, outcomes)), marked=True
+        )
 
 
 def _mantle_config(wire: Wire, directory: Path, **litellm_params: JsonValue) -> Path:
diff --git a/tests/integration/providers/test_responses_bridge_tool_search_chaos.py b/tests/integration/providers/test_responses_bridge_tool_search_chaos.py
index 0101824054a..6beccefe58f 100644
--- a/tests/integration/providers/test_responses_bridge_tool_search_chaos.py
+++ b/tests/integration/providers/test_responses_bridge_tool_search_chaos.py
@@ -529,7 +529,7 @@ def _marked_posts(received: tuple[Request, ...], marker: str) -> tuple[Request,
 
 
 @pytest.mark.timeout(_OWNED_PROXY_CELL_SECONDS)
-def test_a_previous_response_id_turn_replays_the_function_call_without_the_search_call(owned_rig: _OwnedRig) -> None:
+def test_a_previous_response_id_turn_replays_the_search_call_beside_the_function_call(owned_rig: _OwnedRig) -> None:
     marker: Final = uuid.uuid4().hex
     owned_rig.wire.drain()
     proxy: Final = owned_rig.proxy.gateway
@@ -566,11 +566,8 @@ def test_a_previous_response_id_turn_replays_the_function_call_without_the_searc
         _assert_forwarded_with_tool_search(opening)
         _assert_forwarded_with_tool_search(replay)
         messages: Final = rv.ITEMS.validate_python(rv.JSON_OBJECT.validate_json(replay.body)["messages"])
-        assert "srvtoolu_" not in json.dumps(messages) and "tool_search" not in json.dumps(messages), messages
         (assistant,) = [turn for turn in messages if turn["role"] == "assistant"]
-        blocks: Final = rv.ITEMS.validate_python(assistant["content"])
-        tool_uses: Final = [(block["type"], block.get("id")) for block in blocks if block["type"] == "tool_use"]
-        assert tool_uses == [("tool_use", f"toolu_{marker}")], blocks
+        assert assistant["content"] == _message(marker)["content"], assistant
         assert [block["tool_use_id"] for block in _tool_results(messages)] == [f"toolu_{marker}"], messages
 
 
diff --git a/tests/integration/routing/test_messages_stream_retry_budget_sources_owned_proxy.py b/tests/integration/routing/test_messages_stream_retry_budget_sources_owned_proxy.py
index 93e4f97ae1e..0257b8372b0 100644
--- a/tests/integration/routing/test_messages_stream_retry_budget_sources_owned_proxy.py
+++ b/tests/integration/routing/test_messages_stream_retry_budget_sources_owned_proxy.py
@@ -1,7 +1,9 @@
 import json
+import threading
 import uuid
 from collections.abc import Callable, Iterator
 from dataclasses import dataclass
+from itertools import groupby, islice
 from pathlib import Path
 from typing import Final, Literal
 
@@ -12,6 +14,7 @@ from integration._support.anthropic_sse import (
     LIFECYCLE,
     PING,
     Attempts,
+    SseEvent,
     delta_text,
     dropping_reply,
     error_body,
@@ -55,7 +58,9 @@ def _served_id(backend: str, marker: str, attempt: int) -> str:
     return f"msg_{backend}_{marker}_a{attempt}"
 
 
-def _primary_reply(behavior: str, attempt: int, full: tuple[bytes, bytes, bytes, bytes]) -> Reply:
+def _primary_reply(
+    behavior: str, attempt: int, full: tuple[bytes, bytes, bytes, bytes], content_gate: threading.Event
+) -> Reply:
     dropped: Final = dropping_reply(full, abort_after=1)
     match behavior:
         case "drop-once":
@@ -63,7 +68,13 @@ def _primary_reply(behavior: str, attempt: int, full: tuple[bytes, bytes, bytes,
         case "drop-always":
             return dropped
         case "hold-ping":
-            return stream_reply((full[0], PING, full[1] + full[2] + full[3]), pause=0.25)
+            return Reply(
+                content_type="text/event-stream",
+                chunks=(full[0], full[1] + full[2] + full[3]),
+                gate_after_first=content_gate,
+                heartbeat=PING,
+                pause_between_chunks=0.25,
+            )
         case "drop-then-too-long":
             if attempt == 1:
                 return dropped
@@ -81,7 +92,7 @@ def _fallback_reply(behavior: str, full: tuple[bytes, bytes, bytes, bytes]) -> R
     return stream_reply(full)
 
 
-def _respond(attempts: Attempts) -> Callable[[Request], Reply]:
+def _respond(attempts: Attempts, content_gate: threading.Event) -> Callable[[Request], Reply]:
     def respond(request: Request) -> Reply:
         assert (request.method, request.target) == ("POST", "/v1/messages"), request
         assert request.headers["x-api-key"] == _API_KEY, request.headers
@@ -93,11 +104,21 @@ def _respond(attempts: Attempts) -> Callable[[Request], Reply]:
         full: Final = message_stream(_served_id(backend, marker, attempt), backend, _TEXT)
         if backend != _PRIMARY:
             return _fallback_reply(behavior, full)
-        return _primary_reply(behavior, attempt, full)
+        return _primary_reply(behavior, attempt, full, content_gate)
 
     return respond
 
 
+def _stream_body(model: str, behavior: Behavior, marker: str, **extra: JsonValue) -> dict[str, JsonValue]:
+    return {
+        "model": model,
+        "max_tokens": 16,
+        "stream": True,
+        "messages": [{"role": "user", "content": f"{behavior}:{marker}"}],
+        **extra,
+    }
+
+
 def _deployment(name: str, backend: str, **extra: JsonValue) -> dict[str, JsonValue]:
     return {
         "model_name": name,
@@ -137,19 +158,10 @@ def _config(wire: Wire, directory: Path) -> Path:
 class _Rig:
     proxy: Gateway
     attempts: Attempts
+    content_gate: threading.Event
 
     def stream(self, model: str, behavior: Behavior, marker: str, **extra: JsonValue) -> httpx.Response:
-        return self.proxy.request(
-            "POST",
-            "/v1/messages",
-            {
-                "model": model,
-                "max_tokens": 16,
-                "stream": True,
-                "messages": [{"role": "user", "content": f"{behavior}:{marker}"}],
-                **extra,
-            },
-        )
+        return self.proxy.request("POST", "/v1/messages", _stream_body(model, behavior, marker, **extra))
 
     def attempts_on(self, backend: str, marker: str) -> int:
         return self.attempts.count(f"{backend}:{marker}")
@@ -158,10 +170,14 @@ class _Rig:
 @pytest.fixture(scope="module")
 def rig(tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Rig]:
     attempts: Final = Attempts()
+    content_gate: Final = threading.Event()
     directory: Final = tmp_path_factory.mktemp("messages-retry-budget-sources")
-    with gateway_from_environment() as gateway, wire_server(_respond(attempts)) as wire:
+    with gateway_from_environment() as gateway, wire_server(_respond(attempts, content_gate)) as wire:
         with owned_proxy(gateway, directory, {}, config=_config(wire, directory), workers=2) as proxy:
-            yield _Rig(proxy, attempts)
+            try:
+                yield _Rig(proxy, attempts, content_gate)
+            finally:
+                content_gate.set()
 
 
 def _assert_completed(response: httpx.Response, served_id: str) -> None:
@@ -202,12 +218,32 @@ def test_request_num_retries_zero_turns_the_router_budget_off(rig: _Rig) -> None
     assert rig.attempts_on(_PRIMARY, marker) == 1
 
 
+def _live_events(lines: Iterator[str]) -> Iterator[SseEvent]:
+    for has_text, block in groupby(lines, key=bool):
+        if has_text:
+            yield from parse_sse("\n".join(block))
+
+
 def test_lifecycle_frames_are_held_until_content_while_pings_go_out_live(rig: _Rig) -> None:
     marker: Final = uuid.uuid4().hex
-    response: Final = rig.stream(_ROUTER_BUDGET, "hold-ping", marker)
-    assert response.status_code == 200, response.text
-    events: Final = parse_sse(response.text)
-    assert event_types(events) == ("ping", *LIFECYCLE), events
+    rig.content_gate.clear()
+    try:
+        with rig.proxy.client.stream(
+            "POST",
+            "/v1/messages",
+            json=_stream_body(_ROUTER_BUDGET, "hold-ping", marker),
+            headers={"Authorization": f"Bearer {rig.proxy.key}"},
+        ) as response:
+            assert response.status_code == 200, response.read()
+            arriving: Final = _live_events(response.iter_lines())
+            before_content: Final = tuple(islice(arriving, 2))
+            rig.content_gate.set()
+            after_content: Final = tuple(arriving)
+    finally:
+        rig.content_gate.set()
+    assert event_types(before_content) == ("ping", "ping"), before_content
+    events: Final = before_content + after_content
+    assert tuple(kind for kind in event_types(events) if kind != "ping") == LIFECYCLE, events
     assert message_id(events) == _served_id(_PRIMARY, marker, 1), events
     assert delta_text(events) == _TEXT, events
     assert rig.attempts_on(_PRIMARY, marker) == 1
diff --git a/tests/integration/routing/test_user_config_routing.py b/tests/integration/routing/test_user_config_routing.py
index 1c50a78201b..af3df8a38ff 100644
--- a/tests/integration/routing/test_user_config_routing.py
+++ b/tests/integration/routing/test_user_config_routing.py
@@ -3,8 +3,10 @@ import uuid
 from pathlib import Path
 from typing import Final
 
+import pytest
+
 from integration._support.client import Gateway
-from integration._support.process import owned_proxy
+from integration._support.process import graceful_stop_seconds, owned_proxy
 from integration._support.wire import Reply, Request, wire_server
 
 USER_KEY: Final = "sk-user-supplied-" + uuid.uuid4().hex
@@ -30,18 +32,13 @@ def _completion(request: Request) -> Reply:
     )
 
 
+def _deployment_params(upstream_url: str) -> dict[str, object]:
+    return {"model": "openai/gpt-4.1-mini", "api_base": upstream_url + "/v1", "api_key": USER_KEY}
+
+
 def _user_config(upstream_url: str) -> dict[str, object]:
     return {
-        "model_list": [
-            {
-                "model_name": "user-config-deployment",
-                "litellm_params": {
-                    "model": "openai/gpt-4.1-mini",
-                    "api_base": upstream_url + "/v1",
-                    "api_key": USER_KEY,
-                },
-            }
-        ],
+        "model_list": [{"model_name": "user-config-deployment", "litellm_params": _deployment_params(upstream_url)}],
         "num_retries": 0,
     }
 
@@ -95,6 +92,54 @@ def test_user_config_routes_to_the_user_supplied_deployment_when_opted_in(gatewa
         assert json.loads(completions[0].body)["model"] == "gpt-4.1-mini"
 
 
+def _identity_in_deployment(upstream_url: str, identity_param: str) -> dict[str, object]:
+    return {
+        "model_list": [
+            {
+                "model_name": "user-config-deployment",
+                "litellm_params": {**_deployment_params(upstream_url), identity_param: "caller-chosen"},
+            }
+        ],
+        "num_retries": 0,
+    }
+
+
+def _identity_in_defaults(upstream_url: str, identity_param: str) -> dict[str, object]:
+    return {**_user_config(upstream_url), "default_litellm_params": {identity_param: "caller-chosen"}}
+
+
+@pytest.mark.timeout(2 * graceful_stop_seconds() + 120)
+def test_user_config_cannot_carry_a_server_owned_identity_param_even_when_opted_in(
+    gateway: Gateway, tmp_path: Path
+) -> None:
+    cases: Final = (
+        (_identity_in_deployment, "openai_identity_provider_id"),
+        (_identity_in_defaults, "openai_service_account_id"),
+    )
+    with wire_server(_completion) as upstream:
+        config: Final = _opt_in_config(tmp_path, upstream.url)
+        with owned_proxy(gateway, tmp_path, {}, config=config) as candidate:
+            responses: Final = tuple(
+                (
+                    identity_param,
+                    candidate.request(
+                        "POST",
+                        "/v1/chat/completions",
+                        {
+                            "model": "user-config-deployment",
+                            "messages": [{"role": "user", "content": "user config identity"}],
+                            "user_config": placement(upstream.url, identity_param),
+                        },
+                    ),
+                )
+                for placement, identity_param in cases
+            )
+        for identity_param, response in responses:
+            assert response.status_code == 401, response.text
+            assert identity_param in response.text, response.text
+        assert tuple(request for request in upstream.drain() if request.target == "/v1/chat/completions") == ()
+
+
 def test_user_config_is_rejected_without_the_opt_in(gateway: Gateway) -> None:
     with wire_server(_completion) as upstream:
         response: Final = gateway.request("POST", "/v1/chat/completions", _request_body(upstream.url))
diff --git a/tests/integration/routing/test_wildcard_model_listing.py b/tests/integration/routing/test_wildcard_model_listing.py
new file mode 100644
index 00000000000..967a515ec08
--- /dev/null
+++ b/tests/integration/routing/test_wildcard_model_listing.py
@@ -0,0 +1,71 @@
+import uuid
+from collections import Counter
+from collections.abc import Iterator
+from pathlib import Path
+from typing import Final
+
+import pytest
+import yaml
+from integration._support.client import Gateway, gateway_from_environment
+from integration._support.process import owned_proxy
+from pydantic import JsonValue
+
+pytestmark: Final = pytest.mark.timeout(180)
+
+_PRICED_DEPLOYMENT_ID: Final = f"priced-deployment-{uuid.uuid4().hex}"
+_REGISTERED_AI21_CHAT_MODEL: Final = f"jamba-house-{uuid.uuid4().hex}"
+
+
+@pytest.fixture(scope="module")
+def candidate(tmp_path_factory: pytest.TempPathFactory) -> Iterator[Gateway]:
+    directory: Final = tmp_path_factory.mktemp("wildcard-listing")
+    with gateway_from_environment() as base:
+        credentials: Final = {"api_base": f"{base.upstream_url}/v1", "api_key": "synthetic-listing-key"}
+        config: Final = {
+            **yaml.safe_load(Path("tests/integration/proxy_config.yaml").read_text()),
+            "model_list": [
+                {"model_name": "openai/*", "litellm_params": {"model": "openai/*", **credentials}},
+                {
+                    "model_name": "priced-chat",
+                    "litellm_params": {
+                        "model": "openai/gpt-4o-mini",
+                        "input_cost_per_token": 0.000001,
+                        "output_cost_per_token": 0.000002,
+                        **credentials,
+                    },
+                    "model_info": {"id": _PRICED_DEPLOYMENT_ID},
+                },
+                {"model_name": "ai21/*", "litellm_params": {"model": "ai21/*", **credentials}},
+                {
+                    "model_name": "house-jamba",
+                    "litellm_params": {"model": f"ai21/{_REGISTERED_AI21_CHAT_MODEL}", **credentials},
+                    "model_info": {"litellm_provider": "ai21", "mode": "chat"},
+                },
+            ],
+        }
+        path: Final = directory / "wildcard-listing.yaml"
+        path.write_text(yaml.safe_dump(config))
+        with owned_proxy(base, directory, {}, config=path) as proxy:
+            yield proxy
+
+
+def _listed_ids(gateway: Gateway) -> list[JsonValue]:
+    data: Final = gateway.get("/v1/models")["data"]
+    assert isinstance(data, list), data
+    return [entry["id"] for entry in data if isinstance(entry, dict)]
+
+
+def test_wildcard_listing_after_a_priced_call_names_each_model_once_and_no_deployment_id(candidate: Gateway) -> None:
+    candidate.chat("priced-chat")
+
+    listed: Final = _listed_ids(candidate)
+
+    assert "openai/gpt-4o-mini" in listed and "priced-chat" in listed, listed
+    assert {model: count for model, count in Counter(listed).items() if count > 1} == {}, listed
+    assert [model for model in listed if _PRICED_DEPLOYMENT_ID in str(model)] == [], listed
+
+
+def test_ai21_wildcard_listing_names_a_chat_model_registered_from_the_config(candidate: Gateway) -> None:
+    listed: Final = _listed_ids(candidate)
+
+    assert f"ai21/{_REGISTERED_AI21_CHAT_MODEL}" in listed, listed
diff --git a/tests/integration/sdk/conftest.py b/tests/integration/sdk/conftest.py
index 066cca6250a..05f4f3d7d3a 100644
--- a/tests/integration/sdk/conftest.py
+++ b/tests/integration/sdk/conftest.py
@@ -1,7 +1,11 @@
+from collections.abc import AsyncIterator
 from typing import Final
 
-import litellm
 import pytest
+import pytest_asyncio
+
+import litellm
+from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER
 
 CALLBACK_LISTS: Final = (
     "callbacks",
@@ -14,7 +18,12 @@ CALLBACK_LISTS: Final = (
 )
 
 
-@pytest.fixture(autouse=True)
-def isolate_litellm_callback_lists(monkeypatch: pytest.MonkeyPatch) -> None:
+@pytest_asyncio.fixture(autouse=True, loop_scope="function")
+async def isolate_litellm_callback_lists(monkeypatch: pytest.MonkeyPatch) -> AsyncIterator[None]:
     for name in CALLBACK_LISTS:
         monkeypatch.setattr(litellm, name, list(getattr(litellm, name)))
+    try:
+        yield
+    finally:
+        await GLOBAL_LOGGING_WORKER.flush()
+        await GLOBAL_LOGGING_WORKER.stop()
diff --git a/tests/integration/spend/test_disable_end_user_cost_tracking.py b/tests/integration/spend/test_disable_end_user_cost_tracking.py
index f3ec572b69a..d0233378d1e 100644
--- a/tests/integration/spend/test_disable_end_user_cost_tracking.py
+++ b/tests/integration/spend/test_disable_end_user_cost_tracking.py
@@ -695,6 +695,7 @@ def test_flag_on_burst_lands_each_row_once_through_sink_outage_and_worker_kill(r
         before_kill: Final = _burst(rig, models, key, calls[: len(_SURFACES) * 2])
         _assert_burst_landed_once(rig, models, before_kill)
         assert not rig.lens.outages.acquire(blocking=False), "the Lens sink outage was never hit"
+        _team_requests_flushed(team, len(before_kill))
         victim: Final = min(rig.proxy.worker_pids())
         replacement: Final = rig.proxy.kill_worker(victim)
         assert replacement != victim, (victim, replacement)
diff --git a/tests/integration/streaming/test_faked_responses_stream_chaos.py b/tests/integration/streaming/test_faked_responses_stream_chaos.py
index 28efe912157..fca99c9d525 100644
--- a/tests/integration/streaming/test_faked_responses_stream_chaos.py
+++ b/tests/integration/streaming/test_faked_responses_stream_chaos.py
@@ -24,7 +24,7 @@ from integration._support.client import (
     string_value,
 )
 from integration._support.database import read_rows
-from integration._support.process import OwnedProxy, graceful_stop_seconds, owned_proxy_process
+from integration._support.process import OwnedProxy, WorkerHealthcheck, graceful_stop_seconds, owned_proxy_process
 from integration._support.wire import Reply, Request, wire_server
 from integration._support.ports import allocate_port
 from integration.streaming.faked_responses_case import (
@@ -111,7 +111,14 @@ def rig(tmp_path_factory: pytest.TempPathFactory) -> Iterator[_Rig]:
     port: Final = allocate_port()
     with (
         gateway_from_environment() as shared,
-        owned_proxy_process(shared, directory, {}, config=_config(port, directory), workers=2) as owned,
+        owned_proxy_process(
+            shared,
+            directory,
+            {},
+            config=_config(port, directory),
+            workers=2,
+            healthcheck=WorkerHealthcheck.LENIENT,
+        ) as owned,
     ):
         yield _Rig(port, owned)
 
@@ -306,9 +313,11 @@ class _Held:
         return _respond(request)
 
 
-async def _held_burst(gateway: Gateway, calls: tuple[_Call, ...], held: _Held) -> asyncio.Task[tuple[_Served, ...]]:
+async def _held_burst(
+    gateway: Gateway, calls: tuple[_Call, ...], held: _Held, *, already_held: int = 0
+) -> asyncio.Task[tuple[_Served, ...]]:
     burst: Final = asyncio.create_task(_burst(gateway, calls, tolerate_transport_errors=True))
-    await asyncio.to_thread(eventually, held.markers.qsize, lambda size: size == len(calls), 60)
+    await asyncio.to_thread(eventually, held.markers.qsize, lambda size: size == already_held + len(calls), 60)
     return burst
 
 
@@ -319,12 +328,18 @@ def _held_by(rig: _Rig, upstream: str) -> Mapping[int, int]:
 async def test_held_mixed_burst_spreads_over_both_workers_and_each_value_arrives_once(rig: _Rig) -> None:
     calls: Final = _calls(30)
     held: Final = _Held(threading.Event(), SimpleQueue())
+    first, second = sorted(rig.proxy.worker_pids())
     with wire_server(held.respond, port=rig.port) as wire:
-        burst: Final = await _held_burst(rig.gateway, calls, held)
-        held_by: Final = _held_by(rig, wire.url)
-        held.release.set()
-        served: Final = await burst
-        assert len(held_by) == 2 and all(held_by.values()) and sum(held_by.values()) == 30, held_by
+        try:
+            with rig.proxy.suspended(second):
+                on_first: Final = await _held_burst(rig.gateway, calls[:15], held)
+            with rig.proxy.suspended(first):
+                on_second: Final = await _held_burst(rig.gateway, calls[15:], held, already_held=15)
+            held_by: Final = _held_by(rig, wire.url)
+        finally:
+            held.release.set()
+        served: Final = await on_first + await on_second
+        assert held_by == {first: 15, second: 15}, held_by
         assert len(served) == 30
         for item in served:
             _assert_each_value_once(item)
diff --git a/tests/integration/streaming/test_google_genai_stream_usage_settings_wire.py b/tests/integration/streaming/test_google_genai_stream_usage_settings_wire.py
index 85017667c74..796e706c569 100644
--- a/tests/integration/streaming/test_google_genai_stream_usage_settings_wire.py
+++ b/tests/integration/streaming/test_google_genai_stream_usage_settings_wire.py
@@ -1,21 +1,19 @@
 import json
-import re
 import threading
 import uuid
 from collections.abc import Callable, Mapping, Sequence
-from concurrent.futures import ThreadPoolExecutor
+from concurrent.futures import Future, ThreadPoolExecutor
 from contextlib import ExitStack
 from hashlib import sha256
 from pathlib import Path
 from typing import Final
 
 import httpx
-import psutil
 import pytest
 import yaml
 from integration._support.client import Gateway, eventually, held, object_value
 from integration._support.database import read_rows
-from integration._support.process import graceful_stop_seconds, owned_proxy_process
+from integration._support.process import WorkerHealthcheck, graceful_stop_seconds, owned_proxy_process
 from integration._support.vertex import service_account_json
 from integration._support.wire import Reply, Request, Wire, wire_server
 from pydantic import JsonValue, TypeAdapter
@@ -38,7 +36,6 @@ _GEMINI_USAGE: Final = {
     "totalTokenCount": _PROMPT_TOKENS + _COMPLETION_TOKENS,
 }
 _ZERO_USAGE: Final = {"promptTokenCount": 0, "candidatesTokenCount": 0, "totalTokenCount": 0}
-_STARTED_WORKER: Final = re.compile(r"Started server process \[(\d+)\]")
 _BURST_SELECT: Final = (
     'SELECT api_key, prompt_tokens, completion_tokens FROM "LiteLLM_SpendLogs"'
     " WHERE api_key = ANY(string_to_array(%s, ','))"
@@ -67,6 +64,7 @@ _UPSTREAM_ASKS_FOR_USAGE: Final = {
     },
 }
 _SETTING_VALUES: Final = {"always_off": False, "always_on": True}
+_STREAMS_PER_WORKER: Final = 6
 
 
 def _openai_frame(chunk: Mapping[str, JsonValue], response_id: str) -> bytes:
@@ -273,20 +271,15 @@ def _stream_or_dropped(client: httpx.Client, key: str) -> httpx.Response | None:
         return None
 
 
-def _local_port(client: httpx.Client) -> int:
-    with client.stream("GET", "/health/liveliness") as response:
-        port: Final = int(response.extensions["network_stream"].get_extra_info("client_addr")[1])
-        response.read()
-    assert response.status_code == 200, response.text
-    return port
-
-
-def _accepted_client_ports(pid: int, proxy_port: int) -> frozenset[int]:
-    return frozenset(
-        connection.raddr.port
-        for connection in psutil.Process(pid).net_connections(kind="tcp")
-        if connection.raddr and connection.laddr.port == proxy_port
+def _held_streams(
+    stack: ExitStack, pool: ThreadPoolExecutor, url: str, keys: Sequence[str], wire: Wire, held: int
+) -> tuple[Future[httpx.Response | None], ...]:
+    clients: Final = tuple(stack.enter_context(httpx.Client(base_url=url, timeout=60, trust_env=False)) for _ in keys)
+    futures: Final = tuple(
+        pool.submit(_stream_or_dropped, client, key) for client, key in zip(clients, keys, strict=True)
     )
+    eventually(wire.received.qsize, lambda size: size >= held, seconds=60)
+    return futures
 
 
 @pytest.mark.timeout(2 * graceful_stop_seconds() + 120)
@@ -296,35 +289,27 @@ def test_worker_killed_mid_stream_leaves_the_sibling_billing_each_stream_once(ga
         wire: Final = stack.enter_context(wire_server(_peer(gate)))
         stack.callback(gate.set)
         config: Final = _owned_config(tmp_path / "worker-kill.yaml", gateway, wire, {})
-        owned: Final = stack.enter_context(owned_proxy_process(gateway, tmp_path, {}, config=config, workers=2))
-        workers: Final = eventually(
-            lambda: tuple(int(pid) for pid in _STARTED_WORKER.findall(owned.log.read_text())),
-            lambda pids: len(pids) == 2,
-            seconds=30,
+        owned: Final = stack.enter_context(
+            owned_proxy_process(gateway, tmp_path, {}, config=config, workers=2, healthcheck=WorkerHealthcheck.LENIENT)
         )
+        victim, survivor = sorted(eventually(owned.worker_pids, lambda pids: len(pids) == 2, seconds=30))
         scenario: Final = stack.enter_context(owned.gateway.scenario())
-        proxy_url: Final = owned.gateway.client.base_url
-        clients: Final = tuple(
-            stack.enter_context(httpx.Client(base_url=str(proxy_url), timeout=60, trust_env=False)) for _ in range(12)
-        )
-        keys: Final = tuple(scenario.key(models=[_ADAPTER_MODEL]) for _ in clients)
-        ports: Final = tuple(_local_port(client) for client in clients)
-        pool: Final = stack.enter_context(ThreadPoolExecutor(max_workers=len(clients)))
-        futures: Final = tuple(
-            pool.submit(_stream_or_dropped, client, key) for client, key in zip(clients, keys, strict=True)
-        )
-        eventually(wire.received.qsize, lambda size: size >= len(clients), seconds=60)
-        shares: Final = {pid: _accepted_client_ports(pid, proxy_url.port or 0) & frozenset(ports) for pid in workers}
-        assert sum(map(len, shares.values())) == len(clients), shares
-        victim: Final = min((pid for pid in workers if shares[pid]), key=lambda pid: len(shares[pid]))
+        victim_keys: Final = tuple(scenario.key(models=[_ADAPTER_MODEL]) for _ in range(_STREAMS_PER_WORKER))
+        survivor_keys: Final = tuple(scenario.key(models=[_ADAPTER_MODEL]) for _ in range(_STREAMS_PER_WORKER))
+        proxy_url: Final = str(owned.gateway.client.base_url)
+        pool: Final = stack.enter_context(ThreadPoolExecutor(max_workers=2 * _STREAMS_PER_WORKER))
+        with owned.suspended(survivor):
+            on_victim: Final = _held_streams(stack, pool, proxy_url, victim_keys, wire, _STREAMS_PER_WORKER)
+        with owned.suspended(victim):
+            on_survivor: Final = _held_streams(stack, pool, proxy_url, survivor_keys, wire, 2 * _STREAMS_PER_WORKER)
         with owned.replacing_worker(victim) as kill:
             kill()
             gate.set()
-            results: Final = tuple(future.result(timeout=60) for future in futures)
-        survivors: Final = tuple(
-            (key, result) for port, key, result in zip(ports, keys, results, strict=True) if port not in shares[victim]
-        )
-        assert survivors, shares
+            dropped: Final = tuple(future.result(timeout=60) for future in on_victim)
+            survivors: Final = tuple(
+                zip(survivor_keys, (future.result(timeout=60) for future in on_survivor), strict=True)
+            )
+        assert dropped == (None,) * _STREAMS_PER_WORKER, dropped
         for _, result in survivors:
             assert result is not None
             _assert_one_stop_with(result, _GEMINI_USAGE)
diff --git a/tests/unit/chat_completions/test_dispatch.py b/tests/test_litellm_rust/chat_completions/test_dispatch.py
similarity index 100%
rename from tests/unit/chat_completions/test_dispatch.py
rename to tests/test_litellm_rust/chat_completions/test_dispatch.py
diff --git a/tests/unit/chat_completions/__init__.py b/tests/test_litellm_rust/embeddings/__init__.py
similarity index 100%
rename from tests/unit/chat_completions/__init__.py
rename to tests/test_litellm_rust/embeddings/__init__.py
diff --git a/tests/unit/embeddings/test_dispatch.py b/tests/test_litellm_rust/embeddings/test_dispatch.py
similarity index 100%
rename from tests/unit/embeddings/test_dispatch.py
rename to tests/test_litellm_rust/embeddings/test_dispatch.py
diff --git a/tests/unit/messages/test_dispatch.py b/tests/test_litellm_rust/messages/test_dispatch.py
similarity index 100%
rename from tests/unit/messages/test_dispatch.py
rename to tests/test_litellm_rust/messages/test_dispatch.py
diff --git a/tests/unit/ocr/test_dispatch.py b/tests/test_litellm_rust/ocr/test_public_dispatch.py
similarity index 100%
rename from tests/unit/ocr/test_dispatch.py
rename to tests/test_litellm_rust/ocr/test_public_dispatch.py
diff --git a/tests/unit/responses/test_dispatch.py b/tests/test_litellm_rust/responses/test_dispatch.py
similarity index 100%
rename from tests/unit/responses/test_dispatch.py
rename to tests/test_litellm_rust/responses/test_dispatch.py
diff --git a/tests/unit/rust_bridge/test_dispatch.py b/tests/test_litellm_rust/test_dispatch.py
similarity index 100%
rename from tests/unit/rust_bridge/test_dispatch.py
rename to tests/test_litellm_rust/test_dispatch.py
diff --git a/tests/unit/batches/test_batch_utils.py b/tests/unit/batches/test_batch_utils.py
index 293c38e9f20..912d4cfe84c 100644
--- a/tests/unit/batches/test_batch_utils.py
+++ b/tests/unit/batches/test_batch_utils.py
@@ -1983,6 +1983,20 @@ def test_total_cost_bills_cached_tokens_per_line_at_the_batch_cached_rate():
     assert result.cost == pytest.approx(long_line + short_line)
 
 
+def test_extract_credentials_keeps_openai_workload_identity_params():
+    params = {
+        "openai_identity_provider_id": "idp_deployment",
+        "openai_service_account_id": "user-deployment",
+        "openai_identity_token_file": "/var/run/secrets/token",
+        "model": "gpt-4o",
+    }
+    assert bu._extract_file_access_credentials(params) == {
+        "openai_identity_provider_id": "idp_deployment",
+        "openai_service_account_id": "user-deployment",
+        "openai_identity_token_file": "/var/run/secrets/token",
+    }
+
+
 # --------------------------------------------------------------------------- #
 # batch_cost_is_final
 # --------------------------------------------------------------------------- #
diff --git a/tests/unit/embeddings/__init__.py b/tests/unit/embeddings/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/unit/integration_support/test_process.py b/tests/unit/integration_support/test_process.py
index 26306a2d39a..2106436edb8 100644
--- a/tests/unit/integration_support/test_process.py
+++ b/tests/unit/integration_support/test_process.py
@@ -379,48 +379,47 @@ def test_a_replacing_block_that_never_kills_its_worker_fails_and_leaves_it_servi
         assert owned.worker_pids() == frozenset((worker,))
 
 
-def _kill_of(owned: OwnedProxy, worker: int) -> WorkerKill:
-    return WorkerKill(psutil.Process(worker), psutil.Process(owned.process.pid), 5, threading.Event())
+@contextmanager
+def _unreaped_child() -> Iterator[psutil.Process]:
+    with subprocess.Popen((sys.executable, "-I", "-c", "import time; time.sleep(60)")) as child:
+        try:
+            yield psutil.Process(child.pid)
+        finally:
+            child.kill()
 
 
-def test_a_worker_kill_returns_once_the_supervisor_reaped_the_victim_and_cannot_fire_twice(tmp_path: Path) -> None:
-    with _supervised(tmp_path, WorkerHealthcheck.STRICT) as (owned, worker):
-        kill: Final = _kill_of(owned, worker)
+def test_a_worker_kill_returns_once_the_victim_is_dead_before_anything_reaps_it_and_cannot_fire_twice() -> None:
+    with _unreaped_child() as victim:
+        kill: Final = WorkerKill(victim, threading.Event())
         kill()
-        assert not psutil.pid_exists(worker)
+        assert victim.status() == psutil.STATUS_ZOMBIE
         assert kill.fired.is_set()
         with pytest.raises(AssertionError, match="already killed"):
             kill()
 
 
-def test_a_frozen_victim_stays_stopped_until_the_kill(tmp_path: Path) -> None:
-    with _supervised(tmp_path, WorkerHealthcheck.STRICT) as (owned, worker):
-        kill: Final = _kill_of(owned, worker)
+def test_a_frozen_victim_stays_stopped_until_the_kill() -> None:
+    with _unreaped_child() as victim:
+        kill: Final = WorkerKill(victim, threading.Event())
         assert kill.freeze().status() == psutil.STATUS_STOPPED
         kill()
-        assert not psutil.pid_exists(worker)
+        assert victim.status() == psutil.STATUS_ZOMBIE
 
 
-def test_a_kill_under_a_suspended_supervisor_returns_with_the_victim_left_unreaped(tmp_path: Path) -> None:
-    with _supervised(tmp_path, WorkerHealthcheck.LENIENT) as (owned, worker):
-        kill: Final = _kill_of(owned, worker)
-        with owned.suspended(owned.process.pid):
-            kill()
-            assert psutil.Process(worker).status() == psutil.STATUS_ZOMBIE
-        eventually(lambda: psutil.pid_exists(worker), lambda exists: not exists, seconds=5)
+def _kill_after_freezing_the_supervisor(owned: OwnedProxy, worker: int, supervisor: psutil.Process) -> None:
+    with owned.replacing_worker(worker) as kill:
+        supervisor.suspend()
+        kill()
 
 
-def test_a_kill_fails_when_the_supervisor_never_reaps_the_victim(tmp_path: Path) -> None:
+def test_a_replacing_block_fails_when_the_supervisor_never_reaps_the_killed_worker(tmp_path: Path) -> None:
     with _supervised(tmp_path, WorkerHealthcheck.STRICT) as (owned, worker):
         unreaping: Final = psutil.Process(owned.process.pid)
-        kill: Final = WorkerKill(psutil.Process(worker), psutil.Process(os.getpid()), 0.5, threading.Event())
-        unreaping.suspend()
         try:
             with pytest.raises(AssertionError, match="did not reap"):
-                kill()
+                _kill_after_freezing_the_supervisor(owned, worker, unreaping)
         finally:
             unreaping.resume()
-        assert not kill.fired.is_set()
 
 
 def test_a_strict_healthcheck_proxy_refuses_suspension_before_stopping_anything(tmp_path: Path) -> None:
diff --git a/tests/unit/integrations/test_prometheus_deployment_state_proxy_rejects.py b/tests/unit/integrations/test_prometheus_deployment_state_proxy_rejects.py
index fedfc2b0848..8eefee1dfcf 100644
--- a/tests/unit/integrations/test_prometheus_deployment_state_proxy_rejects.py
+++ b/tests/unit/integrations/test_prometheus_deployment_state_proxy_rejects.py
@@ -9,12 +9,14 @@ response. A failure raised after the router picked a deployment (a post-call
 guardrail block, a provider error) carries no flag and keeps its deployment labels.
 """
 
+from typing import Final
+
 import pytest
 from fastapi import HTTPException
 from prometheus_client import REGISTRY
 
 from litellm.constants import PROXY_REJECTED_BEFORE_ROUTING_KEY
-from litellm.exceptions import GuardrailRaisedException
+from litellm.exceptions import GuardrailRaisedException, MalformedRequestFieldError
 from litellm.integrations.prometheus import PrometheusLogger
 from litellm.proxy._types import ProxyException
 from litellm.proxy.common_utils.proxy_rate_limit_error import ProxyRateLimitError
@@ -99,3 +101,15 @@ def test_failure_after_routing_still_marks_deployment_partial_outage(failure: Ex
 
     assert _model_id_values(logger.litellm_deployment_state) == {"dep-1"}
     assert _model_id_values(logger.litellm_deployment_failure_responses) == {"dep-1"}
+
+
+def test_malformed_field_rejection_after_routing_leaves_deployment_healthy() -> None:
+    logger: Final = PrometheusLogger()
+    rejection: Final = MalformedRequestFieldError(
+        message="tools: Input should be a valid list", model="internal-model", llm_provider="openai"
+    )
+
+    logger.set_llm_deployment_failure_metrics(_attributed_failure_kwargs(rejection, rejected_before_routing=False))
+
+    assert logger.litellm_deployment_state._metrics == {}
+    assert _model_id_values(logger.litellm_deployment_failure_responses) == {""}
diff --git a/tests/unit/litellm_core_utils/llm_cost_calc/test_tool_call_cost_tracking.py b/tests/unit/litellm_core_utils/llm_cost_calc/test_tool_call_cost_tracking.py
index c8dbbd00d66..7291c4858f6 100644
--- a/tests/unit/litellm_core_utils/llm_cost_calc/test_tool_call_cost_tracking.py
+++ b/tests/unit/litellm_core_utils/llm_cost_calc/test_tool_call_cost_tracking.py
@@ -1,4 +1,6 @@
 
+from typing import Final
+
 import pytest
 
 import litellm
@@ -49,11 +51,12 @@ def test_web_search_cost_high():
     )
 
 
-def test_get_web_search_options_preserves_explicit_none_error():
-    with pytest.raises(TypeError):
-        StandardBuiltInToolCostTracking.get_web_search_options(
-            {"web_search_options": None, "tools": [{"type": "web_search_preview"}]}
-        )
+def test_get_web_search_options_reads_tools_when_options_are_null() -> None:
+    options: Final = StandardBuiltInToolCostTracking.get_web_search_options(
+        {"web_search_options": None, "tools": [{"type": "web_search_preview"}]}
+    )
+
+    assert options == {"type": "web_search_preview"}
 
 
 def test_get_web_search_options_accepts_non_list_tool_iterables():
@@ -1070,3 +1073,13 @@ def test_azure_ai_non_claude_web_search_keeps_generic_fallback() -> None:
     usage = Usage(prompt_tokens=1840, completion_tokens=412, total_tokens=2252)
 
     assert get_cost_for_web_search_request(custom_llm_provider="azure_ai", usage=usage, model_info=model_info) is None
+
+
+@pytest.mark.parametrize(
+    "kwargs",
+    [{"tools": 5}, {"web_search_options": None}, {"web_search_options": 5}],
+    ids=["int_tools", "null_web_search_options", "int_web_search_options"],
+)
+def test_built_in_tool_lookups_ignore_malformed_request_values(kwargs: dict[str, object]) -> None:
+    assert StandardBuiltInToolCostTracking.get_web_search_options(kwargs) is None
+    assert StandardBuiltInToolCostTracking.get_file_search_tool_call(kwargs) is None
diff --git a/tests/unit/litellm_core_utils/test_get_model_cost_map.py b/tests/unit/litellm_core_utils/test_get_model_cost_map.py
index cf713d3684e..0256ecf24ed 100644
--- a/tests/unit/litellm_core_utils/test_get_model_cost_map.py
+++ b/tests/unit/litellm_core_utils/test_get_model_cost_map.py
@@ -10,7 +10,9 @@ import sys
 import threading
 from typing import Final
 
+import boto3
 import pytest
+from typing_extensions import NotRequired, ReadOnly, TypedDict
 
 from litellm.litellm_core_utils.fallback_generalizations import (
     get_fallback_generalization_rules,
@@ -519,6 +521,47 @@ from tests._vcr_conftest_common import install_live_call_probe, record_vcr_outco
 from unittest.mock import MagicMock, patch
 
 
+class _FakeS3Body:
+    def __init__(self, content: bytes) -> None:
+        self.content: Final = content
+
+    def read(self) -> bytes:
+        return self.content
+
+
+class _FakeS3GetObjectResponse(TypedDict):
+    Body: ReadOnly[_FakeS3Body]
+    ETag: NotRequired[ReadOnly[str]]
+
+
+class _FakeS3Client:
+    def __init__(self, content: bytes) -> None:
+        self.content: Final = content
+        self.calls: list[tuple[str, str]] = []
+
+    def get_object(self, *, Bucket: str, Key: str) -> _FakeS3GetObjectResponse:
+        self.calls.append((Bucket, Key))
+        return {"Body": _FakeS3Body(self.content), "ETag": '"fake-etag"'}
+
+
+def test_get_model_cost_map_fetches_s3_catalog(monkeypatch: pytest.MonkeyPatch) -> None:
+    from litellm.litellm_core_utils import get_model_cost_map as module
+
+    source_info = module._cost_map_source_info
+    for name in ("source", "url", "is_env_forced", "fallback_reason", "loaded_at", "source_revision", "etag"):
+        monkeypatch.setattr(source_info, name, getattr(source_info, name))
+
+    s3_content: Final = _make_models(GetModelCostMap.get_backup_model_count())
+    s3_client: Final = _FakeS3Client(json.dumps(s3_content).encode())
+    monkeypatch.setattr(boto3, "client", lambda *args, **kwargs: s3_client)
+
+    cost_map: Final = get_model_cost_map("s3://my-bucket/prices/model_prices.json")
+
+    assert cost_map == s3_content
+    assert s3_client.calls == [("my-bucket", "prices/model_prices.json")]
+    assert get_model_cost_map_source_info()["source"] == "remote"
+
+
 class _SyncSleepRecorder:
     """Injected in place of time.sleep so the boot path's waits are asserted without delay."""
 
@@ -955,6 +998,14 @@ class TestGetModelCostMapFallback:
         assert result.keys() == _backup_keys()
         assert source["source"] == "local"
 
+    def test_should_fallback_when_fetched_json_is_not_object(self, monkeypatch):
+        result, fetches, source = _fetch_with_single_outcome(monkeypatch, httpx.Response(200, content=b"[]"))
+
+        assert fetches == 1
+        assert result.keys() == _backup_keys()
+        assert source["source"] == "local"
+        assert source["fallback_reason"] == f"Remote fetch failed: expected a JSON object from {_URL}, got list"
+
     def test_should_fallback_when_fetched_map_shrinks_dramatically(self, monkeypatch):
         """When upstream returns far fewer models than backup, should fall back."""
         tiny_map = {f"model-{i}": {"litellm_provider": "test"} for i in range(11)}
diff --git a/tests/unit/litellm_core_utils/test_litellm_logging.py b/tests/unit/litellm_core_utils/test_litellm_logging.py
index 7f2653cb481..31eaf12a186 100644
--- a/tests/unit/litellm_core_utils/test_litellm_logging.py
+++ b/tests/unit/litellm_core_utils/test_litellm_logging.py
@@ -6137,6 +6137,42 @@ def test_handle_anthropic_messages_response_logging_degrades_on_unparseable_resp
     assert result.usage.prompt_tokens == 4  # type: ignore[attr-defined]
 
 
+@pytest.mark.parametrize(
+    "output",
+    [[], [{"type": "reasoning", "id": "rs_1", "status": "completed", "summary": []}]],
+    ids=["empty", "reasoning-only"],
+)
+def test_degraded_responses_payload_keeps_the_served_service_tier_price(
+    output: list[dict[str, object]], monkeypatch: pytest.MonkeyPatch
+):
+    from litellm.types.llms.openai import ResponseAPIUsage, ResponsesAPIResponse
+
+    rates: Final = {
+        "input_cost_per_token": 1e-06,
+        "output_cost_per_token": 4e-06,
+        "input_cost_per_token_flex": 5e-07,
+        "output_cost_per_token_flex": 2e-06,
+    }
+    monkeypatch.setitem(
+        litellm.model_cost, "flex-fallback-model", {"litellm_provider": "openai", "mode": "responses", **rates}
+    )
+    degraded: Final = _anthropic_messages_logging_obj()._handle_anthropic_messages_response_logging(
+        result=ResponsesAPIResponse(
+            id="resp-flex",
+            created_at=1700000000,
+            status="completed",
+            output=output,
+            service_tier="flex",
+            usage=ResponseAPIUsage(input_tokens=100, output_tokens=50, total_tokens=150),
+        )
+    )
+
+    assert degraded.choices == [] or degraded.choices[0].message.content in (None, "")  # type: ignore[union-attr]
+    assert litellm.completion_cost(completion_response=degraded, model="flex-fallback-model") == pytest.approx(
+        100 * rates["input_cost_per_token_flex"] + 50 * rates["output_cost_per_token_flex"]
+    )
+
+
 class _SuccessCapturingLogger(CustomLogger):
     """Records the success payload. success_payload is populated only in
     async_log_success_event, so it stays None when the buggy no-op
diff --git a/tests/unit/litellm_core_utils/test_tool_fields.py b/tests/unit/litellm_core_utils/test_tool_fields.py
new file mode 100644
index 00000000000..23d7de98fbc
--- /dev/null
+++ b/tests/unit/litellm_core_utils/test_tool_fields.py
@@ -0,0 +1,187 @@
+import datetime
+from collections.abc import Callable, Mapping
+from typing import Final
+
+import pytest
+
+import litellm
+from litellm import Router
+from litellm.litellm_core_utils.litellm_logging import Logging
+from litellm.utils import async_pre_call_deployment_hook
+
+_GOOD_TOOL: Final = {"type": "function", "function": {"name": "get_weather", "parameters": {"type": "object"}}}
+_MALFORMED_TOOLS: Final = (
+    5,
+    "get_weather",
+    ["get_weather"],
+    {"type": "function"},
+    [{"type": "function", "function": {"name": "get_weather", "parameters": "object"}}],
+)
+
+
+def _deployment(name: str, **params: object) -> Mapping[str, object]:
+    return {
+        "model_name": name,
+        "litellm_params": {"model": "openai/gpt-5.2", "api_key": "sk-test", "mock_response": f"served by {name}", **params},
+    }
+
+
+def _proxy_request(model: str, route: str = "acompletion", **fields: object) -> Mapping[str, object]:
+    return {
+        "model": model,
+        "messages": [{"role": "user", "content": "weather in Paris?"}],
+        "proxy_server_request": {"url": "/v1/chat/completions", "body": {}},
+        "litellm_logging_obj": Logging(
+            model=model,
+            messages=[],
+            stream=False,
+            call_type=route,
+            start_time=datetime.datetime.now(),
+            litellm_call_id="call-1",
+            function_id="fn-1",
+        ),
+        "num_retries": 0,
+        **fields,
+    }
+
+
+@pytest.mark.parametrize("tools", _MALFORMED_TOOLS)
+@pytest.mark.asyncio
+async def test_malformed_tools_fall_back_to_a_deployment_that_drops_them(tools: object) -> None:
+    router: Final = Router(
+        model_list=[_deployment("primary"), _deployment("backup", additional_drop_params=["tools"])],
+        fallbacks=[{"primary": ["backup"]}],
+    )
+
+    response: Final = await router.acompletion(**_proxy_request("primary", tools=tools))
+
+    assert response.choices[0].message.content == "served by backup"
+
+
+@pytest.mark.asyncio
+async def test_fallback_on_unsupported_params_false_keeps_the_400() -> None:
+    router: Final = Router(
+        model_list=[_deployment("primary"), _deployment("backup", additional_drop_params=["tools"])],
+        fallbacks=[{"primary": ["backup"]}],
+        fallback_on_unsupported_params=False,
+    )
+
+    with pytest.raises(litellm.BadRequestError):
+        await router.acompletion(**_proxy_request("primary", tools=5))
+
+
+@pytest.mark.asyncio
+async def test_a_rejected_request_cools_down_no_deployment() -> None:
+    cools_on_any_400: Final = {"allowed_fails_policy": {"BadRequestErrorAllowedFails": 0}, "cooldown_time": 120}
+    router: Final = Router(
+        model_list=[
+            {**_deployment("primary"), "model_info": {"id": "primary", **cools_on_any_400}},
+            {**_deployment("backup"), "model_info": {"id": "backup", **cools_on_any_400}},
+        ],
+        fallbacks=[{"primary": ["backup"]}],
+    )
+
+    with pytest.raises(litellm.BadRequestError):
+        await router.acompletion(**_proxy_request("primary", tools=5))
+
+    primary: Final = await router.acompletion(**_proxy_request("primary"))
+    backup: Final = await router.acompletion(**_proxy_request("backup"))
+    assert (primary.choices[0].message.content, backup.choices[0].message.content) == (
+        "served by primary",
+        "served by backup",
+    )
+
+
+@pytest.mark.parametrize("tools", _MALFORMED_TOOLS)
+@pytest.mark.parametrize(
+    "deployment",
+    [_deployment("keeps"), _deployment("keeps", tools=[_GOOD_TOOL])],
+    ids=["plain", "with_configured_tools"],
+)
+@pytest.mark.asyncio
+async def test_malformed_tools_answer_400_when_the_served_deployment_keeps_tools(
+    tools: object, deployment: Mapping[str, object]
+) -> None:
+    router: Final = Router(model_list=[deployment])
+
+    with pytest.raises(litellm.BadRequestError) as raised:
+        await router.acompletion(**_proxy_request("keeps", tools=tools))
+
+    assert (raised.value.status_code, raised.value.param, raised.value.type) == (
+        400,
+        "tools",
+        "invalid_request_error",
+    )
+
+
+@pytest.mark.asyncio
+async def test_a_request_drop_params_false_overrides_a_deployment_that_drops() -> None:
+    router: Final = Router(model_list=[_deployment("drops", drop_params=True)])
+
+    with pytest.raises(litellm.BadRequestError):
+        await router.acompletion(**_proxy_request("drops", tools=5, drop_params=False))
+
+
+@pytest.mark.parametrize(
+    "route", ["acompletion", "aresponses", "anthropic_messages", "agenerate_content", "acreate_interaction"]
+)
+@pytest.mark.asyncio
+async def test_drop_params_drops_every_malformed_tool_field(route: str) -> None:
+    request: Final = _proxy_request(
+        "drops", route, drop_params=True, tools=5, tool_choice="auto", web_search_options="high"
+    )
+
+    sent: Final = await async_pre_call_deployment_hook(dict(request), route)
+
+    assert {"tools", "tool_choice", "web_search_options"}.isdisjoint(sent)
+    assert sent["messages"] == request["messages"]
+
+
+@pytest.mark.asyncio
+async def test_additional_drop_params_drops_only_the_malformed_tool_entries() -> None:
+    request: Final = _proxy_request("drops", additional_drop_params=["tools"], tools=[_GOOD_TOOL, "get_weather"])
+
+    sent: Final = await async_pre_call_deployment_hook(dict(request), "acompletion")
+
+    assert sent["tools"] == [_GOOD_TOOL]
+
+
+@pytest.mark.asyncio
+async def test_an_sdk_call_keeps_the_tools_it_passed() -> None:
+    tools: Final = (_GOOD_TOOL,)
+    request: Final = {
+        key: value for key, value in _proxy_request("sdk", tools=tools).items() if key != "proxy_server_request"
+    }
+
+    sent: Final = await async_pre_call_deployment_hook(dict(request), "acompletion")
+
+    assert sent["tools"] is tools
+
+
+@pytest.mark.parametrize("schema", ["", [], False, 0, {}, '{"type": "object"}'])
+@pytest.mark.parametrize(
+    "tool",
+    [
+        lambda schema: {"type": "function", "function": {"name": "get_weather", "parameters": schema}},
+        lambda schema: {"type": "function", "name": "get_weather", "parameters": schema},
+        lambda schema: {"name": "get_weather", "input_schema": schema},
+    ],
+    ids=["chat", "responses", "messages"],
+)
+@pytest.mark.asyncio
+async def test_empty_and_json_string_schemas_reach_the_deployment(
+    tool: Callable[[object], Mapping[str, object]], schema: object
+) -> None:
+    tools: Final = [tool(schema)]
+
+    sent: Final = await async_pre_call_deployment_hook(dict(_proxy_request("keeps", tools=tools)), "acompletion")
+
+    assert sent["tools"] is tools
+
+
+@pytest.mark.parametrize("tools", [(_GOOD_TOOL,), [{"type": "web_search", "function": None}]], ids=["tuple", "null"])
+@pytest.mark.asyncio
+async def test_tools_core_accepts_reach_the_deployment(tools: object) -> None:
+    sent: Final = await async_pre_call_deployment_hook(dict(_proxy_request("keeps", tools=tools)), "acompletion")
+
+    assert sent["tools"] is tools
diff --git a/tests/unit/llms/anthropic/pass_through/responses_adapters/test_responses_adapters_handler.py b/tests/unit/llms/anthropic/pass_through/responses_adapters/test_responses_adapters_handler.py
index 61efc65f8c2..453429df084 100644
--- a/tests/unit/llms/anthropic/pass_through/responses_adapters/test_responses_adapters_handler.py
+++ b/tests/unit/llms/anthropic/pass_through/responses_adapters/test_responses_adapters_handler.py
@@ -553,3 +553,83 @@ def test_client_cache_control_changes_nothing_for_a_deployment_that_does_not_rea
     )
 
     assert marked == unmarked
+
+
+REASONING_MODEL: Final = "gpt-bridge-reasoning-cost"
+REASONING_RATES: Final = {
+    "input_cost_per_token": 2e-06,
+    "output_cost_per_token": 1e-05,
+    "output_cost_per_reasoning_token": 3e-05,
+}
+REASONING_RESPONSE: Final = {
+    "id": "resp_bridge_reasoning",
+    "object": "response",
+    "created_at": 1,
+    "status": "completed",
+    "model": REASONING_MODEL,
+    "output": [
+        {"type": "reasoning", "id": "rs_1", "status": "completed", "summary": []},
+        {
+            "type": "message",
+            "id": "msg_1",
+            "status": "completed",
+            "role": "assistant",
+            "content": [{"type": "output_text", "text": "answer", "annotations": []}],
+        },
+    ],
+    "parallel_tool_calls": True,
+    "tool_choice": "auto",
+    "tools": [],
+    "usage": {
+        "input_tokens": 1240,
+        "output_tokens": 4040,
+        "total_tokens": 5280,
+        "input_tokens_details": {"cached_tokens": 0},
+        "output_tokens_details": {"reasoning_tokens": 3480},
+    },
+}
+
+
+@pytest.mark.asyncio
+async def test_recomputed_cost_of_a_served_bridge_response_prices_the_reasoning_tokens(
+    respx_mock: respx.MockRouter, monkeypatch: pytest.MonkeyPatch
+):
+    from litellm.litellm_core_utils.litellm_logging import Logging
+    from litellm.proxy.common_request_processing import ProxyBaseLLMRequestProcessing
+
+    monkeypatch.setenv("OPENAI_API_KEY", "sk-bridge-reasoning-test")
+    monkeypatch.setenv("DISABLE_AIOHTTP_TRANSPORT", "True")
+    monkeypatch.setitem(
+        litellm.model_cost, REASONING_MODEL, {"litellm_provider": "openai", "mode": "responses", **REASONING_RATES}
+    )
+    litellm.in_memory_llm_clients_cache.flush_cache()
+    respx_mock.post("https://api.openai.com/v1/responses").respond(status_code=200, json=REASONING_RESPONSE)
+    logging_obj: Final = Logging(
+        model=REASONING_MODEL,
+        messages=MESSAGES,
+        stream=False,
+        call_type="anthropic_messages",
+        start_time=datetime.datetime.now(datetime.timezone.utc),
+        litellm_call_id="bridge-reasoning-0000-4000-8000-000000000001",
+        function_id="1234",
+    )
+
+    served: Final = await LiteLLMMessagesToResponsesAPIHandler.async_anthropic_messages_handler(
+        max_tokens=412,
+        messages=MESSAGES,
+        model=f"openai/{REASONING_MODEL}",
+        custom_llm_provider="openai",
+        litellm_logging_obj=logging_obj,
+    )
+    assert isinstance(served, dict) and "reasoning" not in json.dumps(served["usage"])
+
+    cost: Final = ProxyBaseLLMRequestProcessing._response_cost_from_logging_obj(
+        response=dict(served), logging_obj=logging_obj
+    )
+
+    expected_reasoning: Final = 3480 * REASONING_RATES["output_cost_per_reasoning_token"]
+    expected_output: Final = expected_reasoning + (4040 - 3480) * REASONING_RATES["output_cost_per_token"]
+    assert cost == pytest.approx(1240 * REASONING_RATES["input_cost_per_token"] + expected_output)
+    assert logging_obj.cost_breakdown is not None
+    assert logging_obj.cost_breakdown["output_cost"] == pytest.approx(expected_output)
+    assert logging_obj.cost_breakdown["reasoning_cost"] == pytest.approx(expected_reasoning)
diff --git a/tests/unit/llms/azure/chat/test_azure_chat_gpt_transformation.py b/tests/unit/llms/azure/chat/test_azure_chat_gpt_transformation.py
index 9875cf439cf..f753fb6b8f9 100644
--- a/tests/unit/llms/azure/chat/test_azure_chat_gpt_transformation.py
+++ b/tests/unit/llms/azure/chat/test_azure_chat_gpt_transformation.py
@@ -753,3 +753,33 @@ def test_azure_deployment_id_selects_chat_completions_endpoint(respx_mock: MockR
     assert route.call_count == 1
     assert route.calls[0].request.url.path == "/openai/deployments/deployment-gpt-4o/chat/completions"
     assert response.choices[0].message.content == "Hello"
+
+
+@pytest.mark.respx(assert_all_called=True)
+def test_responses_api_version_leaves_the_chat_route_and_body_untouched(respx_mock: MockRouter) -> None:
+    url: Final = "https://example-resource.openai.azure.com/openai/deployments/gpt-5.4-nano/chat/completions"
+    payload: Final = {
+        "id": "chatcmpl-dated",
+        "object": "chat.completion",
+        "created": 1700000000,
+        "model": "gpt-5.4-nano",
+        "choices": [{"index": 0, "message": {"role": "assistant", "content": "Hello"}, "finish_reason": "stop"}],
+        "usage": {"prompt_tokens": 5, "completion_tokens": 1, "total_tokens": 6},
+    }
+    route: Final = respx_mock.post(url__startswith=url).mock(return_value=httpx.Response(200, json=payload))
+    messages: Final = [{"role": "user", "content": "Hello"}]
+
+    response: Final = litellm.completion(
+        model="azure/gpt-5.4-nano",
+        messages=messages,
+        api_base="https://example-resource.openai.azure.com",
+        api_key="azure-test-key",
+        api_version="2024-12-01-preview",
+        responses_api_version="preview",
+    )
+    request: Final = route.calls[0].request
+
+    assert route.call_count == 1
+    assert request.url.params["api-version"] == "2024-12-01-preview"
+    assert json.loads(request.content) == {"model": "gpt-5.4-nano", "messages": messages}
+    assert response.choices[0].message.content == "Hello"
diff --git a/tests/unit/llms/azure/response/test_azure_transformation.py b/tests/unit/llms/azure/response/test_azure_transformation.py
index fea5304a689..9b4c618c78b 100644
--- a/tests/unit/llms/azure/response/test_azure_transformation.py
+++ b/tests/unit/llms/azure/response/test_azure_transformation.py
@@ -1,11 +1,15 @@
 import json
+from collections.abc import Callable
 from copy import deepcopy
 from typing import Final
 from unittest.mock import MagicMock, patch
 
+import httpx
 import pytest
+import respx
 
 import litellm
+from litellm.constants import AZURE_DEFAULT_RESPONSES_API_VERSION
 from litellm.litellm_core_utils.get_model_cost_map import get_model_cost_map
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
 from litellm.llms.azure.responses.o_series_transformation import (
@@ -282,16 +286,25 @@ class TestAzureResponsesAPIConfig:
             == "https://litellm8397336933.openai.azure.com/openai/v1/responses?api-version=latest"
         )
 
-        # Test with date-based version - should use openai/responses
-        result_date = self.config.get_complete_url(
+        result_dated_preview = self.config.get_complete_url(
             api_base=base_url,
-            litellm_params={"api_version": "2025-01-01"},
+            litellm_params={"api_version": "2025-04-01-preview"},
         )
         assert (
-            result_date
-            == "https://litellm8397336933.openai.azure.com/openai/responses?api-version=2025-01-01"
+            result_dated_preview
+            == "https://litellm8397336933.openai.azure.com/openai/responses?api-version=2025-04-01-preview"
         )
 
+    @pytest.mark.parametrize("api_version", ["2024-10-21", "2024-06-01", "2025-01-01"])
+    def test_dated_ga_api_version_routes_responses_like_an_unset_one(self, api_version: str):
+        base_url: Final = "https://litellm8397336933.openai.azure.com"
+
+        dated: Final = self.config.get_complete_url(api_base=base_url, litellm_params={"api_version": api_version})
+        unset: Final = self.config.get_complete_url(api_base=base_url, litellm_params={})
+
+        assert dated == unset
+        assert httpx.URL(dated).params["api-version"] == AZURE_DEFAULT_RESPONSES_API_VERSION
+
     def test_azure_get_complete_url_with_default_api_version(self):
         """Test Azure get_complete_url uses default API version when none is provided"""
         from litellm.constants import AZURE_DEFAULT_RESPONSES_API_VERSION
@@ -320,6 +333,64 @@ class TestAzureResponsesAPIConfig:
         )
         assert result_none_version == expected_url
 
+    @pytest.mark.parametrize(
+        ("api_version", "responses_api_version", "expected_path"),
+        [
+            ("2024-10-21", "2025-04-01-preview", "/openai/responses?api-version=2025-04-01-preview"),
+            ("2025-04-01-preview", "v1", "/openai/v1/responses?api-version=v1"),
+            (None, "2025-04-01-preview", "/openai/responses?api-version=2025-04-01-preview"),
+        ],
+    )
+    def test_responses_api_version_wins_over_api_version(
+        self, api_version: str | None, responses_api_version: str, expected_path: str
+    ):
+        base_url: Final = "https://litellm8397336933.openai.azure.com"
+
+        url: Final = self.config.get_complete_url(
+            api_base=base_url,
+            litellm_params={"api_version": api_version, "responses_api_version": responses_api_version},
+        )
+
+        assert url == f"{base_url}{expected_path}"
+
+    @pytest.mark.parametrize("responses_api_version", [None, "v1"])
+    def test_api_version_in_api_base_query_wins_over_a_dated_ga_api_version(self, responses_api_version: str | None):
+        api_base: Final = "https://litellm8397336933.openai.azure.com/openai/responses?api-version=2025-04-01-preview"
+
+        url: Final = self.config.get_complete_url(
+            api_base=api_base,
+            litellm_params={"api_version": "2024-10-21", "responses_api_version": responses_api_version},
+        )
+
+        assert url == api_base
+
+    def test_api_version_in_env_api_base_query_wins_over_a_dated_ga_api_version(self, monkeypatch: pytest.MonkeyPatch):
+        env_api_base: Final = (
+            "https://litellm8397336933.openai.azure.com/openai/responses?api-version=2025-04-01-preview"
+        )
+        monkeypatch.setattr(litellm, "api_base", None)
+        monkeypatch.setenv("AZURE_API_BASE", env_api_base)
+
+        url: Final = self.config.get_complete_url(api_base=None, litellm_params={"api_version": "2024-10-21"})
+
+        assert url == env_api_base
+
+    @pytest.mark.parametrize(
+        ("api_base", "expected_path"),
+        [
+            ("https://apim.example.com/openai-gw/team", "/openai-gw/team/openai/v1/responses"),
+            ("https://apim.example.com/openai/team-a", "/openai/team-a/openai/v1/responses"),
+        ],
+    )
+    @pytest.mark.parametrize("litellm_params", [{"api_version": "2024-10-21"}, {"responses_api_version": "v1"}])
+    def test_v1_route_only_rewrites_the_responses_route_segment_of_a_gateway_api_base(
+        self, api_base: str, expected_path: str, litellm_params: dict[str, str]
+    ):
+        url: Final = httpx.URL(self.config.get_complete_url(api_base=api_base, litellm_params=litellm_params))
+
+        assert url.host == "apim.example.com"
+        assert url.path == expected_path
+
     def test_azure_cancel_response_api_request(self):
         """Test Azure cancel response API request transformation"""
         from litellm.types.router import GenericLiteLLMParams
@@ -684,6 +755,207 @@ def test_azure_responses_gpt6_astra_rejects_temperature_while_reasoning(local_mo
         )
 
 
+_COMPLETED_RESPONSE: Final = {
+    "id": "resp_dated_chat_deployment",
+    "object": "response",
+    "created_at": 1734366691,
+    "status": "completed",
+    "model": "gpt-5.4-nano",
+    "output": [
+        {
+            "type": "message",
+            "id": "msg_1",
+            "status": "completed",
+            "role": "assistant",
+            "content": [{"type": "output_text", "text": "Done.", "annotations": []}],
+        }
+    ],
+    "parallel_tool_calls": True,
+    "usage": {"input_tokens": 10, "output_tokens": 5, "total_tokens": 15},
+    "error": None,
+    "incomplete_details": None,
+    "instructions": None,
+    "metadata": None,
+    "temperature": None,
+    "tool_choice": "auto",
+    "tools": [],
+    "top_p": None,
+    "max_output_tokens": None,
+    "previous_response_id": None,
+    "reasoning": None,
+    "truncation": None,
+    "user": None,
+}
+
+
+_AZURE_RESOURCE: Final = "https://example-resource.openai.azure.com"
+
+
+def _unset_api_version_responses_url() -> httpx.URL:
+    return httpx.URL(AzureOpenAIResponsesAPIConfig().get_complete_url(api_base=_AZURE_RESOURCE, litellm_params={}))
+
+
+def _azure_responses_create(api_version: str) -> str | None:
+    response: Final = litellm.responses(
+        model="azure/gpt-5.4-nano",
+        input="hi",
+        api_base=_AZURE_RESOURCE,
+        api_key="azure-test-key",
+        api_version=api_version,
+    )
+    return response.output[0].content[0].text
+
+
+def _azure_chat_bridged_to_responses(api_version: str) -> str | None:
+    response: Final = litellm.completion(
+        model="azure/responses/gpt-5.4-nano",
+        messages=[{"role": "user", "content": "hi"}],
+        api_base=_AZURE_RESOURCE,
+        api_key="azure-test-key",
+        api_version=api_version,
+    )
+    return response.choices[0].message.content
+
+
+@pytest.mark.parametrize("call_responses", [_azure_responses_create, _azure_chat_bridged_to_responses])
+def test_dated_ga_api_version_sends_responses_to_the_unset_api_version_url(
+    respx_mock: respx.MockRouter, call_responses: Callable[[str], str | None]
+) -> None:
+    route: Final = respx_mock.post(host="example-resource.openai.azure.com").mock(
+        return_value=httpx.Response(200, json=_COMPLETED_RESPONSE)
+    )
+
+    text: Final = call_responses("2024-10-21")
+
+    assert text == "Done."
+    assert route.call_count == 1
+    assert route.calls[0].request.url == _unset_api_version_responses_url()
+
+
+_LIFECYCLE_BODIES: Final = {
+    "get": _COMPLETED_RESPONSE,
+    "delete": {"id": "resp_dated", "object": "response", "deleted": True},
+    "cancel": {**_COMPLETED_RESPONSE, "status": "cancelled"},
+    "input_items": {"object": "list", "data": [], "first_id": None, "last_id": None, "has_more": False},
+}
+
+
+def _call_lifecycle(operation: str) -> object:
+    kwargs: Final = {
+        "response_id": "resp_dated",
+        "custom_llm_provider": "azure",
+        "api_base": _AZURE_RESOURCE,
+        "api_key": "azure-test-key",
+        "api_version": "2024-10-21",
+    }
+    match operation:
+        case "get":
+            return litellm.get_responses(**kwargs)
+        case "delete":
+            return litellm.delete_responses(**kwargs)
+        case "cancel":
+            return litellm.cancel_responses(**kwargs)
+        case _:
+            return litellm.list_input_items(**kwargs)
+
+
+@pytest.mark.parametrize(
+    ("operation", "path_suffix"),
+    [("get", ""), ("delete", ""), ("cancel", "/cancel"), ("input_items", "/input_items")],
+)
+def test_dated_ga_api_version_sends_response_lifecycle_calls_to_the_unset_api_version_route(
+    respx_mock: respx.MockRouter, operation: str, path_suffix: str
+) -> None:
+    route: Final = respx_mock.route(host="example-resource.openai.azure.com").mock(
+        return_value=httpx.Response(200, json=_LIFECYCLE_BODIES[operation])
+    )
+
+    _call_lifecycle(operation)
+
+    unset_url: Final = _unset_api_version_responses_url()
+    sent_url: Final = route.calls[0].request.url
+    assert route.call_count == 1
+    assert sent_url.path == f"{unset_url.path}/resp_dated{path_suffix}"
+    assert sent_url.params["api-version"] == unset_url.params["api-version"]
+
+
+def test_chat_completion_keeps_the_dated_ga_api_version(respx_mock: respx.MockRouter) -> None:
+    route: Final = respx_mock.post(
+        f"{_AZURE_RESOURCE}/openai/deployments/gpt-5.4-nano/chat/completions", params={"api-version": "2024-10-21"}
+    ).mock(
+        return_value=httpx.Response(
+            200,
+            json={
+                "id": "chatcmpl-dated",
+                "object": "chat.completion",
+                "created": 1734366691,
+                "model": "gpt-5.4-nano",
+                "choices": [{"index": 0, "message": {"role": "assistant", "content": "Done."}, "finish_reason": "stop"}],
+                "usage": {"prompt_tokens": 9, "completion_tokens": 1, "total_tokens": 10},
+            },
+        )
+    )
+
+    response: Final = litellm.completion(
+        model="azure/gpt-5.4-nano",
+        messages=[{"role": "user", "content": "hi"}],
+        api_base=_AZURE_RESOURCE,
+        api_key="azure-test-key",
+        api_version="2024-10-21",
+    )
+
+    assert response.choices[0].message.content == "Done."
+    assert route.call_count == 1
+
+
+@pytest.mark.respx(assert_all_called=True)
+def test_responses_api_version_routes_a_dated_chat_deployment_to_its_own_responses_version(
+    respx_mock: respx.MockRouter,
+) -> None:
+    route: Final = respx_mock.post(
+        "https://example-resource.openai.azure.com/openai/responses", params={"api-version": "2025-04-01-preview"}
+    ).mock(return_value=httpx.Response(200, json=_COMPLETED_RESPONSE))
+
+    response: Final = litellm.responses(
+        model="azure/gpt-5.4-nano",
+        input="hi",
+        api_base="https://example-resource.openai.azure.com",
+        api_key="azure-test-key",
+        api_version="2024-10-21",
+        responses_api_version="2025-04-01-preview",
+    )
+    request_body: Final = json.loads(route.calls[0].request.content)
+
+    assert route.call_count == 1
+    assert response.output[0].content[0].text == "Done."
+    assert request_body["model"] == "gpt-5.4-nano"
+    assert "responses_api_version" not in request_body
+    assert "api_version" not in request_body
+
+
+@pytest.mark.respx(assert_all_called=True)
+def test_responses_api_version_reaches_the_url_when_chat_completion_bridges_to_responses(
+    respx_mock: respx.MockRouter,
+) -> None:
+    route: Final = respx_mock.post(
+        "https://example-resource.openai.azure.com/openai/v1/responses", params={"api-version": "v1"}
+    ).mock(return_value=httpx.Response(200, json=_COMPLETED_RESPONSE))
+
+    response: Final = litellm.completion(
+        model="azure/responses/gpt-5.4-nano",
+        messages=[{"role": "user", "content": "hi"}],
+        api_base="https://example-resource.openai.azure.com",
+        api_key="azure-test-key",
+        api_version="2024-10-21",
+        responses_api_version="v1",
+    )
+    request_body: Final = json.loads(route.calls[0].request.content)
+
+    assert route.call_count == 1
+    assert response.choices[0].message.content == "Done."
+    assert "responses_api_version" not in request_body
+
+
 def test_azure_responses_sends_the_deployment_name_when_azure_ai_prefix_survives_provider_remap():
     request = AzureOpenAIResponsesAPIConfig().transform_responses_api_request(
         model="azure_ai/gpt-5.4-nano",
diff --git a/tests/unit/llms/azure_ai/chat/test_azure_ai_transformation.py b/tests/unit/llms/azure_ai/chat/test_azure_ai_transformation.py
index 9514d64615a..a445d951bc2 100644
--- a/tests/unit/llms/azure_ai/chat/test_azure_ai_transformation.py
+++ b/tests/unit/llms/azure_ai/chat/test_azure_ai_transformation.py
@@ -345,6 +345,80 @@ def test_azure_ai_grok_stop_parameter_handling():
     assert "stop" in gpt_params, "GPT models should support stop parameter"
 
 
+@pytest.mark.respx(assert_all_called=True)
+def test_azure_ai_grok_bills_reasoning_tokens_reported_outside_completion_tokens(
+    respx_mock: respx.MockRouter,
+) -> None:
+    api_url: Final = "https://example-resource.services.ai.azure.com/models/chat/completions"
+    route: Final = respx_mock.post(url__startswith=api_url).mock(
+        return_value=Response(
+            200,
+            json={
+                "id": "chatcmpl-grok",
+                "object": "chat.completion",
+                "created": 1700000000,
+                "model": "grok-4.7",
+                "choices": [{"index": 0, "message": {"role": "assistant", "content": "42"}, "finish_reason": "stop"}],
+                "usage": {
+                    "prompt_tokens": 14,
+                    "completion_tokens": 10,
+                    "total_tokens": 336,
+                    "completion_tokens_details": {"reasoning_tokens": 312},
+                },
+            },
+        )
+    )
+
+    response: Final = litellm.completion(
+        model="azure_ai/grok-4.7",
+        messages=[{"role": "user", "content": "What is the meaning of life?"}],
+        api_base="https://example-resource.services.ai.azure.com/models",
+        api_key="azure-ai-test-key",
+    )
+    model_info: Final = litellm.get_model_info(model="grok-4.7", custom_llm_provider="azure_ai")
+    expected_cost: Final = 14 * model_info["input_cost_per_token"] + 322 * model_info["output_cost_per_token"]
+
+    assert route.call_count == 1
+    assert response.usage.completion_tokens == 322
+    assert response.usage.total_tokens == response.usage.prompt_tokens + response.usage.completion_tokens
+    assert response._hidden_params["response_cost"] == pytest.approx(expected_cost, rel=1e-9)
+
+
+@pytest.mark.respx(assert_all_called=True)
+def test_azure_ai_grok_stream_folds_reasoning_tokens_into_the_usage_chunk(respx_mock: respx.MockRouter) -> None:
+    api_url: Final = "https://example-resource.services.ai.azure.com/models/chat/completions"
+    stream_body: Final = (
+        'data: {"id":"chatcmpl-grok","object":"chat.completion.chunk","created":1700000000,"model":"grok-4.7",'
+        '"choices":[{"index":0,"delta":{"role":"assistant","content":"42"},"finish_reason":null}]}\n\n'
+        'data: {"id":"chatcmpl-grok","object":"chat.completion.chunk","created":1700000000,"model":"grok-4.7",'
+        '"choices":[{"index":0,"delta":{},"finish_reason":"stop"}]}\n\n'
+        'data: {"id":"chatcmpl-grok","object":"chat.completion.chunk","created":1700000000,"model":"grok-4.7",'
+        '"choices":[],"usage":{"prompt_tokens":14,"completion_tokens":10,"total_tokens":336,'
+        '"completion_tokens_details":{"reasoning_tokens":312}}}\n\n'
+        "data: [DONE]\n\n"
+    )
+    route: Final = respx_mock.post(url__startswith=api_url).mock(
+        return_value=Response(200, text=stream_body, headers={"content-type": "text/event-stream"})
+    )
+
+    chunks: Final = tuple(
+        litellm.completion(
+            model="azure_ai/grok-4.7",
+            messages=[{"role": "user", "content": "What is the meaning of life?"}],
+            api_base="https://example-resource.services.ai.azure.com/models",
+            api_key="azure-ai-test-key",
+            stream=True,
+            stream_options={"include_usage": True},
+        )
+    )
+    usage_chunks: Final = [chunk.usage for chunk in chunks if getattr(chunk, "usage", None) is not None]
+
+    assert route.call_count == 1
+    assert len(usage_chunks) == 1
+    assert usage_chunks[0].completion_tokens == 322
+    assert usage_chunks[0].total_tokens == usage_chunks[0].prompt_tokens + usage_chunks[0].completion_tokens
+
+
 def test_azure_model_router_response_shows_actual_model():
     """
     Test that Azure Model Router returns the actual model used in the response,
diff --git a/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude3_transformation.py b/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude3_transformation.py
index 72857246d85..16f44f4f35f 100644
--- a/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude3_transformation.py
+++ b/tests/unit/llms/bedrock/chat/invoke_transformations/test_bedrock_chat_invoke_transformations_anthropic_claude3_transformation.py
@@ -1087,6 +1087,35 @@ def test_bedrock_chat_invoke_eager_input_streaming_beta_not_duplicated_with_clie
     assert result["anthropic_beta"] == [FINE_GRAINED_TOOL_STREAMING_BETA]
 
 
+DANGEROUS_TOOL_USE_BETA: Final = "dangerous-tool-use-2026-09-03"
+
+
+def _chat_invoke_betas(extra_optional_params: dict[str, object]) -> object:
+    config: Final = AmazonAnthropicClaudeConfig()
+    model: Final = "us.anthropic.claude-sonnet-4-5-20250929-v1:0"
+    optional_params: Final = config.map_openai_params(
+        non_default_params={"max_tokens": 64}, optional_params={}, model=model, drop_params=False
+    )
+    return config.transform_request(
+        model=model,
+        messages=[{"role": "user", "content": "hi"}],
+        optional_params={**optional_params, **extra_optional_params},
+        litellm_params={},
+        headers={"anthropic-beta": f"claude-code-20250219,{DANGEROUS_TOOL_USE_BETA}"},
+    ).get("anthropic_beta")
+
+
+def test_bedrock_chat_invoke_drops_client_dangerous_tool_use_beta_without_safeguards() -> None:
+    assert _chat_invoke_betas({}) == ["claude-code-20250219"]
+
+
+def test_bedrock_chat_invoke_keeps_client_dangerous_tool_use_beta_with_safeguards() -> None:
+    assert _chat_invoke_betas({"safeguards": [{"type": "dangerous_tool_use"}]}) == [
+        "claude-code-20250219",
+        DANGEROUS_TOOL_USE_BETA,
+    ]
+
+
 def _mid_conversation_system_conversation() -> list[dict]:
     return [
         {
diff --git a/tests/unit/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py b/tests/unit/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py
index dffe2c36e20..c91eb75dbd9 100644
--- a/tests/unit/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py
+++ b/tests/unit/llms/bedrock/messages/invoke_transformations/test_anthropic_claude3_transformation.py
@@ -1677,6 +1677,60 @@ def test_bedrock_messages_does_not_add_dangerous_tool_use_beta_without_safeguard
     assert "dangerous-tool-use-2026-09-03" not in result.get("anthropic_beta", [])
 
 
+_NAME_SCHEMA: Final = {"type": "object", "properties": {"name": {"type": "string"}}, "required": ["name"]}
+
+
+@pytest.mark.parametrize(
+    "request_params",
+    [
+        {},
+        {"output_config": {"format": {"type": "json_schema", "schema": _NAME_SCHEMA}}},
+        {"tools": [{"name": "get_name", "strict": True, "input_schema": _NAME_SCHEMA}]},
+    ],
+    ids=["plain", "output_config_format", "strict_tool"],
+)
+def test_bedrock_messages_drops_client_dangerous_tool_use_beta_without_safeguards(
+    local_model_cost_map: None, local_beta_headers_config: None, request_params: dict[str, object]
+) -> None:
+    from litellm.types.router import GenericLiteLLMParams
+
+    result: Final = AmazonAnthropicClaudeMessagesConfig().transform_anthropic_messages_request(
+        model="us.anthropic.claude-haiku-4-5-20251001-v1:0",
+        messages=[{"role": "user", "content": [{"type": "text", "text": "Name a color."}]}],
+        anthropic_messages_optional_request_params={"max_tokens": 64, **request_params},
+        litellm_params=GenericLiteLLMParams(),
+        headers={"anthropic-beta": "dangerous-tool-use-2026-09-03"},
+    )
+
+    assert all(result.get(key) == value for key, value in request_params.items())
+    assert "dangerous-tool-use-2026-09-03" not in result.get("anthropic_beta", [])
+
+
+def test_bedrock_messages_keeps_client_dangerous_tool_use_beta_with_safeguards_and_structured_outputs(
+    local_model_cost_map: None, local_beta_headers_config: None
+) -> None:
+    from litellm.types.router import GenericLiteLLMParams
+
+    safeguards: Final = [{"type": "dangerous_tool_use", "classifier_context": {"v": 1, "permission_mode": "auto"}}]
+    strict_tool: Final = {"name": "get_name", "strict": True, "input_schema": _NAME_SCHEMA}
+
+    result: Final = AmazonAnthropicClaudeMessagesConfig().transform_anthropic_messages_request(
+        model="us.anthropic.claude-sonnet-5",
+        messages=[{"role": "user", "content": [{"type": "text", "text": "Name a color."}]}],
+        anthropic_messages_optional_request_params={
+            "max_tokens": 64,
+            "safeguards": safeguards,
+            "tools": [strict_tool],
+        },
+        litellm_params=GenericLiteLLMParams(),
+        headers={"anthropic-beta": "dangerous-tool-use-2026-09-03"},
+    )
+
+    assert result["safeguards"] == safeguards
+    assert result["tools"] == [strict_tool]
+    assert result["anthropic_beta"].count("dangerous-tool-use-2026-09-03") == 1
+
+
 def test_bedrock_messages_stream_decoder_keeps_safeguard_results():
     """Bedrock streams the classifier verdicts on message_start and on the final message_delta, exactly as api.anthropic.com does."""
     decoder = AmazonAnthropicClaudeMessagesStreamDecoder(model="us.anthropic.claude-sonnet-5")
diff --git a/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_messages_transformation.py b/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_messages_transformation.py
index 923572c4f46..3236efbbfba 100644
--- a/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_messages_transformation.py
+++ b/tests/unit/llms/bedrock_mantle/test_bedrock_mantle_messages_transformation.py
@@ -10,6 +10,7 @@ Bearer/SigV4 auth chain, and the wire request through the public entrypoint.
 """
 
 import json
+from typing import Final
 from unittest.mock import MagicMock
 
 import httpx
@@ -453,6 +454,14 @@ class TestBetaHeadersOnTheWire:
         assert _sent_betas(route) == ["dangerous-tool-use-2026-09-03"]
         assert _sent_body(route)["safeguards"] == safeguards
 
+    @pytest.mark.asyncio
+    @respx.mock
+    async def test_client_dangerous_tool_use_beta_reaches_mantle_without_safeguards(self) -> None:
+        route: Final = await self._send(extra_headers={"anthropic-beta": "dangerous-tool-use-2026-09-03"})
+
+        assert _sent_betas(route) == ["dangerous-tool-use-2026-09-03"]
+        assert "safeguards" not in _sent_body(route)
+
     @pytest.mark.asyncio
     @respx.mock
     async def test_betas_and_version_never_travel_in_the_body(self):
diff --git a/tests/unit/llms/openai/completion/test_handler.py b/tests/unit/llms/openai/completion/test_handler.py
index b4b224f0977..6a7302ec122 100644
--- a/tests/unit/llms/openai/completion/test_handler.py
+++ b/tests/unit/llms/openai/completion/test_handler.py
@@ -106,7 +106,7 @@ async def test_acompletion_uses_optimized_http_client():
 
     with patch.object(BaseOpenAILLM, "_get_async_http_client", return_value=mock_http_client) as mock_get_client:
         with patch(
-            "litellm.llms.openai.completion.handler.AsyncOpenAI",
+            "litellm.llms.openai.workload_identity.AsyncOpenAI",
             return_value=mock_async_openai,
         ) as mock_openai_class:
             handler = OpenAITextCompletion()
diff --git a/tests/unit/llms/openai/responses/test_openai_responses_transformation.py b/tests/unit/llms/openai/responses/test_openai_responses_transformation.py
index 0da28e7207e..f85e4db447b 100644
--- a/tests/unit/llms/openai/responses/test_openai_responses_transformation.py
+++ b/tests/unit/llms/openai/responses/test_openai_responses_transformation.py
@@ -1434,11 +1434,11 @@ class TestAzureResponsesAPIConfig:
         # Test with date-based version - should use openai/responses
         result_date = self.config.get_complete_url(
             api_base=base_url,
-            litellm_params={"api_version": "2025-01-01"},
+            litellm_params={"api_version": "2025-04-01-preview"},
         )
         assert (
             result_date
-            == "https://litellm8397336933.openai.azure.com/openai/responses?api-version=2025-01-01"
+            == "https://litellm8397336933.openai.azure.com/openai/responses?api-version=2025-04-01-preview"
         )
 
     def test_azure_transform_then_normalize_strips_custom_tool_call_namespace(self):
diff --git a/tests/unit/llms/openai/test_openai_common_utils.py b/tests/unit/llms/openai/test_openai_common_utils.py
index 3c7dff34296..831df30c98a 100644
--- a/tests/unit/llms/openai/test_openai_common_utils.py
+++ b/tests/unit/llms/openai/test_openai_common_utils.py
@@ -442,15 +442,26 @@ def _sdk_api_client(
         )
     if api == "image_variations":
         variation_factory: Final = OpenAIImageVariationsHandler()
-        params: Final = {
-            "api_key": "transport-only",
-            "base_url": kwargs["api_base"],
-            "timeout": timeout,
-        }
         return (
-            variation_factory.get_async_client(client=client, init_client_params=params)
+            variation_factory.get_async_client(
+                client=client,
+                api_key="transport-only",
+                api_base="https://sdk-default.example/v1",
+                timeout=timeout,
+                max_retries=0,
+                organization=None,
+                litellm_params={},
+            )
             if is_async
-            else variation_factory.get_sync_client(client=client, init_client_params=params)
+            else variation_factory.get_sync_client(
+                client=client,
+                api_key="transport-only",
+                api_base="https://sdk-default.example/v1",
+                timeout=timeout,
+                max_retries=0,
+                organization=None,
+                litellm_params={},
+            )
         )
     if api == "azure_gateway":
         return BaseAzureLLM()._init_azure_client_for_cloudflare_ai_gateway(
diff --git a/tests/unit/llms/openai/test_openai_workload_identity.py b/tests/unit/llms/openai/test_openai_workload_identity.py
index 2236de1eb5f..1a1a4ca7047 100644
--- a/tests/unit/llms/openai/test_openai_workload_identity.py
+++ b/tests/unit/llms/openai/test_openai_workload_identity.py
@@ -1,5 +1,9 @@
+import asyncio
+import io
 import json
 import sys
+import threading
+from collections.abc import Awaitable, Callable
 from functools import partial
 from pathlib import Path
 from typing import Final
@@ -7,21 +11,36 @@ from typing import Final
 import httpx
 import pytest
 import respx
-from openai import AsyncOpenAI, OpenAI
+from openai import DEFAULT_MAX_RETRIES as OPENAI_SDK_DEFAULT_MAX_RETRIES
+from openai import APIStatusError, AsyncOpenAI, OpenAI
 
 import litellm
+from litellm.containers import alist_container_files, aretrieve_container, list_container_files
+from litellm.integrations.custom_secret_manager import CustomSecretManager
 from litellm.llms.litellm_proxy.responses.transformation import LiteLLMProxyResponsesAPIConfig
 from litellm.llms.openai.chat.gpt_transformation import OpenAIGPTConfig
 from litellm.llms.openai.common_utils import BaseOpenAILLM, OpenAIError
+from litellm.llms.openai.containers.transformation import OpenAIContainerConfig
+from litellm.llms.openai.evals.transformation import OpenAIEvalsConfig
+from litellm.llms.openai.image_edit.transformation import OpenAIImageEditConfig
 from litellm.llms.openai.openai import OpenAIChatCompletion
+from litellm.llms.openai.responses.count_tokens.token_counter import OpenAITokenCounter
 from litellm.llms.openai.responses.transformation import OpenAIResponsesAPIConfig
+from litellm.llms.openai.vector_store_files.transformation import OpenAIVectorStoreFilesConfig
+from litellm.llms.openai.vector_stores.transformation import OpenAIVectorStoreConfig
+from litellm.llms.openai.videos.transformation import OpenAIVideoConfig
 from litellm.llms.openai.workload_identity import (
     OpenAIWorkloadIdentityConfig,
     _workload_identity_auth,
+    build_async_openai_client,
+    build_openai_client,
     get_workload_identity_bearer_token,
+    resolve_openai_bearer_token,
     resolve_openai_workload_identity_config,
 )
 from litellm.types.router import GenericLiteLLMParams
+from litellm.types.secret_managers.main import KeyManagementSettings, KeyManagementSystem
+from litellm.types.workload_identity import OPENAI_WIF_KWARGS_KEYS
 
 TOKEN_EXCHANGE_URL: Final = "https://auth.openai.com/oauth/token"
 CHAT_COMPLETIONS_URL: Final = "https://api.openai.com/v1/chat/completions"
@@ -190,6 +209,25 @@ class TestTokenExchange:
         assert first == second == "exchanged-bearer-token"
         assert route.call_count == 1
 
+    @respx.mock
+    def test_more_identities_than_the_old_cache_ceiling_stay_cached(
+        self, wif_env: OpenAIWorkloadIdentityConfig
+    ) -> None:
+        route: Final = mock_token_exchange()
+        identities: Final = tuple(
+            OpenAIWorkloadIdentityConfig(
+                identity_provider_id=wif_env.identity_provider_id,
+                service_account_id=f"user-{index}",
+                token_file=wif_env.token_file,
+            )
+            for index in range(24)
+        )
+        for identity in identities:
+            assert get_workload_identity_bearer_token(identity) == "exchanged-bearer-token"
+        for identity in identities:
+            assert get_workload_identity_bearer_token(identity) == "exchanged-bearer-token"
+        assert route.call_count == len(identities)
+
     def test_old_sdk_raises_upgrade_error(
         self, wif_env: OpenAIWorkloadIdentityConfig, monkeypatch: pytest.MonkeyPatch
     ) -> None:
@@ -410,9 +448,60 @@ class TestResolveConfigFromDeployment:
         )
         assert config == wif_env
 
-    def test_partial_litellm_params_without_env_disable(self, deployment_wif: dict[str, str]) -> None:
-        partial: Final = {key: value for key, value in deployment_wif.items() if key != "openai_identity_token_file"}
-        assert resolve_openai_workload_identity_config(api_key=None, api_base=None, litellm_params=partial) is None
+    @pytest.mark.parametrize("missing_key", sorted(OPENAI_WIF_KWARGS_KEYS))
+    def test_partial_litellm_params_without_env_raise_naming_the_missing_field(
+        self, deployment_wif: dict[str, str], missing_key: str
+    ) -> None:
+        subset: Final = {key: value for key, value in deployment_wif.items() if key != missing_key}
+        with pytest.raises(OpenAIError) as error:
+            resolve_openai_workload_identity_config(api_key=None, api_base=None, litellm_params=subset)
+        assert error.value.status_code == 401
+        assert f"missing {missing_key}." in error.value.message
+        assert all(key not in error.value.message.split(".")[0] for key in subset)
+
+    @respx.mock
+    @pytest.mark.parametrize(
+        "call",
+        [
+            partial(litellm.completion, model="openai/gpt-4o-mini", messages=[{"role": "user", "content": "hi"}]),
+            partial(litellm.image_generation, model="openai/gpt-image-2", prompt="a cat"),
+        ],
+        ids=["chat", "image"],
+    )
+    def test_partial_deployment_identity_surfaces_as_an_auth_error_naming_the_gap(
+        self, deployment_wif: dict[str, str], call: Callable[..., object]
+    ) -> None:
+        subset: Final = {key: value for key, value in deployment_wif.items() if key != "openai_service_account_id"}
+        with pytest.raises(litellm.AuthenticationError) as error:
+            call(**subset)
+        assert error.value.status_code == 401
+        assert "missing openai_service_account_id." in error.value.message
+
+    def test_partial_litellm_params_fall_back_to_the_process_key(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-from-env")
+        subset: Final = {key: value for key, value in deployment_wif.items() if key != "openai_identity_token_file"}
+        assert (
+            resolve_openai_workload_identity_config(api_key="sk-from-env", api_base=None, litellm_params=subset) is None
+        )
+
+    def test_deployment_key_equal_to_the_process_key_still_wins(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-shared")
+        assert (
+            resolve_openai_workload_identity_config(
+                api_key="sk-shared", api_base=None, litellm_params={**deployment_wif, "api_key": "sk-shared"}
+            )
+            is None
+        )
+
+    def test_partial_litellm_params_yield_to_the_deployments_own_key(self, deployment_wif: dict[str, str]) -> None:
+        subset: Final = {key: value for key, value in deployment_wif.items() if key != "openai_identity_token_file"}
+        assert (
+            resolve_openai_workload_identity_config(api_key="sk-static", api_base=None, litellm_params=subset) is None
+        )
 
     def test_static_api_key_beats_litellm_params(self, deployment_wif: dict[str, str]) -> None:
         assert (
@@ -420,7 +509,7 @@ class TestResolveConfigFromDeployment:
             is None
         )
 
-    def test_env_openai_api_key_beats_litellm_params(
+    def test_env_openai_api_key_beats_deployment_identity(
         self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch
     ) -> None:
         monkeypatch.setenv("OPENAI_API_KEY", "sk-from-env")
@@ -428,6 +517,16 @@ class TestResolveConfigFromDeployment:
             resolve_openai_workload_identity_config(api_key=None, api_base=None, litellm_params=deployment_wif) is None
         )
 
+    @pytest.mark.parametrize("global_attr", ["api_key", "openai_key"])
+    def test_litellm_module_key_beats_deployment_identity(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch, global_attr: str
+    ) -> None:
+        monkeypatch.setattr(litellm, global_attr, "sk-module-global")
+        assert (
+            resolve_openai_bearer_token(api_key=None, api_base=None, litellm_params=deployment_wif)
+            == "sk-module-global"
+        )
+
     def test_foreign_api_base_disables_deployment_wif(self, deployment_wif: dict[str, str]) -> None:
         assert (
             resolve_openai_workload_identity_config(
@@ -468,6 +567,108 @@ class TestDeploymentClientConstruction:
         assert first is not second
         assert again is first
 
+    def test_builders_reuse_cached_client_per_identity(self, deployment_wif: dict[str, str]) -> None:
+        other_deployment: Final = {**deployment_wif, "openai_service_account_id": "user-other"}
+        first: Final = build_openai_client(api_key=None, api_base=None, litellm_params=deployment_wif)
+        again: Final = build_openai_client(api_key=None, api_base=None, litellm_params=dict(deployment_wif))
+        other: Final = build_openai_client(api_key=None, api_base=None, litellm_params=other_deployment)
+        async_first: Final = build_async_openai_client(api_key=None, api_base=None, litellm_params=deployment_wif)
+        async_again: Final = build_async_openai_client(api_key=None, api_base=None, litellm_params=deployment_wif)
+        assert again is first
+        assert other is not first
+        assert async_again is async_first
+        assert isinstance(async_first, AsyncOpenAI)
+
+    @pytest.mark.parametrize("builder", [build_openai_client, build_async_openai_client])
+    def test_unset_max_retries_keep_the_sdk_default_and_explicit_ones_stick(
+        self, deployment_wif: dict[str, str], builder: Callable[..., OpenAI | AsyncOpenAI]
+    ) -> None:
+        assert (
+            builder(api_key="sk-static", api_base=None, max_retries=None).max_retries == OPENAI_SDK_DEFAULT_MAX_RETRIES
+        )
+        assert builder(api_key=None, api_base=None, max_retries=None, litellm_params=deployment_wif).max_retries == (
+            OPENAI_SDK_DEFAULT_MAX_RETRIES
+        )
+        assert builder(api_key=None, api_base=None, max_retries=0, litellm_params=deployment_wif).max_retries == 0
+
+    def test_builders_never_cache_static_key_clients(self) -> None:
+        first: Final = build_openai_client(api_key="sk-static", api_base=None, litellm_params=None)
+        again: Final = build_openai_client(api_key="sk-static", api_base=None, litellm_params=None)
+        assert again is not first
+
+    @respx.mock
+    def test_shared_workload_identity_client_never_borrows_the_callers_transport(
+        self, deployment_wif: dict[str, str]
+    ) -> None:
+        mock_token_exchange("process-transport-bearer")
+        models_route: Final = respx.get(MODELS_URL).mock(
+            return_value=httpx.Response(200, json={"object": "list", "data": []})
+        )
+        caller_transport: Final = httpx.Client(transport=httpx.MockTransport(lambda request: httpx.Response(418)))
+
+        federated: Final = build_openai_client(
+            api_key=None,
+            api_base=None,
+            litellm_params=deployment_wif,
+            static_key_http_client_factory=lambda: caller_transport,
+        )
+        federated.models.list()
+        static: Final = build_openai_client(
+            api_key="sk-static",
+            api_base=None,
+            litellm_params=None,
+            static_key_http_client_factory=lambda: caller_transport,
+        )
+        with pytest.raises(APIStatusError) as static_error:
+            static.models.list()
+
+        assert models_route.calls.last.request.headers["Authorization"] == "Bearer process-transport-bearer"
+        assert static_error.value.status_code == 418
+
+    def test_federated_builders_never_call_the_static_key_client_factory(self, deployment_wif: dict[str, str]) -> None:
+        def factory_that_must_stay_cold() -> httpx.Client | None:
+            raise AssertionError("static-key http client built on the federated path")
+
+        async def async_factory_that_must_stay_cold() -> httpx.AsyncClient | None:
+            raise AssertionError("static-key async http client built on the federated path")
+
+        assert isinstance(
+            build_openai_client(
+                api_key=None,
+                api_base=None,
+                litellm_params=deployment_wif,
+                static_key_http_client_factory=factory_that_must_stay_cold,
+            ),
+            OpenAI,
+        )
+        assert isinstance(
+            build_async_openai_client(
+                api_key=None,
+                api_base=None,
+                litellm_params=deployment_wif,
+                static_key_http_client_factory=async_factory_that_must_stay_cold,
+            ),
+            AsyncOpenAI,
+        )
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_shared_workload_identity_client_rides_the_process_session(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        mock_token_exchange("session-bearer")
+        session_models: Final = {"object": "list", "data": [{"id": "model-from-process-session", "object": "model"}]}
+        monkeypatch.setattr(
+            litellm,
+            "aclient_session",
+            httpx.AsyncClient(transport=httpx.MockTransport(lambda request: httpx.Response(200, json=session_models))),
+        )
+
+        federated: Final = build_async_openai_client(api_key=None, api_base=None, litellm_params=deployment_wif)
+        listed: Final = await federated.models.list()
+
+        assert [model.id for model in listed.data] == ["model-from-process-session"]
+
     @respx.mock
     def test_completion_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
         mock_token_exchange("deployment-bearer")
@@ -565,6 +766,145 @@ class TestResponsesValidateEnvironmentFromDeployment:
         )
         assert headers["Authorization"] == "Bearer sk-responses"
 
+    def test_static_key_equal_to_the_process_key_wins(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-shared")
+        assert (
+            OpenAIResponsesAPIConfig().validate_environment(
+                headers={},
+                model="gpt-4o-mini",
+                litellm_params=GenericLiteLLMParams(api_key="sk-shared", **deployment_wif),
+            )["Authorization"]
+            == "Bearer sk-shared"
+        )
+
+
+class TestResolveBearerToken:
+    @respx.mock
+    def test_keyless_deployment_mints_the_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        exchange: Final = mock_token_exchange("resolved-bearer")
+        assert (
+            resolve_openai_bearer_token(api_key=None, api_base=None, litellm_params=deployment_wif) == "resolved-bearer"
+        )
+        assert exchange.call_count == 1
+
+    @respx.mock
+    def test_deployment_key_wins_without_an_exchange(self, deployment_wif: dict[str, str]) -> None:
+        exchange: Final = mock_token_exchange()
+        assert (
+            resolve_openai_bearer_token(api_key="sk-static", api_base=None, litellm_params=deployment_wif)
+            == "sk-static"
+        )
+        assert exchange.call_count == 0
+
+    @respx.mock
+    def test_process_wide_key_beats_deployment_identity_without_an_exchange(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-from-env")
+        exchange: Final = mock_token_exchange()
+        assert resolve_openai_bearer_token(api_key=None, api_base=None, litellm_params=deployment_wif) == "sk-from-env"
+        assert exchange.call_count == 0
+
+    def test_process_wide_key_serves_deployments_without_identity(self, monkeypatch: pytest.MonkeyPatch) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-from-env")
+        assert (
+            resolve_openai_bearer_token(api_key=None, api_base=None, litellm_params={"model": "gpt-5.6"})
+            == "sk-from-env"
+        )
+
+    def test_nothing_configured_resolves_to_none(self, deployment_wif: dict[str, str]) -> None:
+        assert resolve_openai_bearer_token(api_key=None, api_base=None, litellm_params=None) is None
+
+
+HeadersFromParams = Callable[[GenericLiteLLMParams], dict[str, str]]
+HTTP_HANDLER_VALIDATORS: Final[tuple[tuple[str, HeadersFromParams], ...]] = (
+    (
+        "image_edit",
+        lambda params: OpenAIImageEditConfig().validate_environment(
+            headers={},
+            model="gpt-image-2",
+            api_key=params.api_key,
+            litellm_params=dict(params),
+            api_base=params.api_base,
+        ),
+    ),
+    ("vector_stores", lambda params: OpenAIVectorStoreConfig().validate_environment(headers={}, litellm_params=params)),
+    (
+        "vector_store_files",
+        lambda params: OpenAIVectorStoreFilesConfig().validate_environment(headers={}, litellm_params=params),
+    ),
+    (
+        "videos",
+        lambda params: OpenAIVideoConfig().validate_environment(
+            headers={}, model="sora-2", api_key=params.api_key, litellm_params=params
+        ),
+    ),
+    (
+        "containers",
+        lambda params: OpenAIContainerConfig().validate_environment(
+            headers={}, api_key=params.api_key, litellm_params=params
+        ),
+    ),
+    ("evals", lambda params: OpenAIEvalsConfig().validate_environment(headers={}, litellm_params=params)),
+)
+
+
+@pytest.mark.parametrize(
+    ("surface", "headers_from"), HTTP_HANDLER_VALIDATORS, ids=[name for name, _ in HTTP_HANDLER_VALIDATORS]
+)
+class TestHttpHandlersHonorDeploymentIdentity:
+    @respx.mock
+    def test_keyless_deployment_mints_the_exchanged_bearer(
+        self, deployment_wif: dict[str, str], surface: str, headers_from: HeadersFromParams
+    ) -> None:
+        exchange: Final = mock_token_exchange(f"{surface}-bearer")
+        headers: Final = headers_from(GenericLiteLLMParams(**deployment_wif))
+        assert headers["Authorization"] == f"Bearer {surface}-bearer"
+        assert exchange.call_count == 1
+
+    @respx.mock
+    def test_deployment_key_wins_without_an_exchange(
+        self, deployment_wif: dict[str, str], surface: str, headers_from: HeadersFromParams
+    ) -> None:
+        exchange: Final = mock_token_exchange()
+        headers: Final = headers_from(GenericLiteLLMParams(api_key=f"sk-{surface}", **deployment_wif))
+        assert headers["Authorization"] == f"Bearer sk-{surface}"
+        assert exchange.call_count == 0
+
+    @respx.mock
+    def test_process_wide_key_beats_deployment_identity_without_an_exchange(
+        self,
+        deployment_wif: dict[str, str],
+        monkeypatch: pytest.MonkeyPatch,
+        surface: str,
+        headers_from: HeadersFromParams,
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-from-env")
+        exchange: Final = mock_token_exchange()
+        headers: Final = headers_from(GenericLiteLLMParams(**deployment_wif))
+        assert headers["Authorization"] == "Bearer sk-from-env"
+        assert exchange.call_count == 0
+
+    def test_process_wide_key_still_serves_deployments_without_identity(
+        self,
+        deployment_wif: dict[str, str],
+        monkeypatch: pytest.MonkeyPatch,
+        surface: str,
+        headers_from: HeadersFromParams,
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-from-env")
+        headers: Final = headers_from(GenericLiteLLMParams())
+        assert headers["Authorization"] == "Bearer sk-from-env"
+
+    def test_partial_deployment_identity_fails_loudly(
+        self, deployment_wif: dict[str, str], surface: str, headers_from: HeadersFromParams
+    ) -> None:
+        subset: Final = {key: value for key, value in deployment_wif.items() if key != "openai_service_account_id"}
+        with pytest.raises(OpenAIError, match="missing openai_service_account_id"):
+            headers_from(GenericLiteLLMParams(**subset))
+
 
 class TestDiscoverModels:
     @staticmethod
@@ -650,6 +990,967 @@ class TestClientsideBaseOverride:
         )
 
 
+IMAGES_URL: Final = "https://api.openai.com/v1/images/generations"
+IMAGE_VARIATIONS_URL: Final = "https://api.openai.com/v1/images/variations"
+SPEECH_URL: Final = "https://api.openai.com/v1/audio/speech"
+TRANSCRIPTIONS_URL: Final = "https://api.openai.com/v1/audio/transcriptions"
+MODERATIONS_URL: Final = "https://api.openai.com/v1/moderations"
+COMPLETIONS_URL: Final = "https://api.openai.com/v1/completions"
+FILES_URL: Final = "https://api.openai.com/v1/files"
+BATCHES_URL: Final = "https://api.openai.com/v1/batches"
+FINE_TUNING_JOBS_URL: Final = "https://api.openai.com/v1/fine_tuning/jobs"
+ASSISTANTS_URL: Final = "https://api.openai.com/v1/assistants"
+THREADS_URL: Final = "https://api.openai.com/v1/threads"
+CONTAINERS_URL: Final = "https://api.openai.com/v1/containers"
+IMAGE_BODY: Final = {"created": 1, "data": [{"b64_json": "aGk="}]}
+MODERATION_BODY: Final = {
+    "id": "modr-1",
+    "model": "omni-moderation-latest",
+    "results": [{"flagged": False, "categories": {}, "category_scores": {}}],
+}
+TEXT_COMPLETION_BODY: Final = {
+    "id": "cmpl-1",
+    "object": "text_completion",
+    "created": 1,
+    "model": "gpt-3.5-turbo-instruct",
+    "choices": [{"text": "ok", "index": 0, "finish_reason": "stop", "logprobs": None}],
+    "usage": {"prompt_tokens": 1, "completion_tokens": 1, "total_tokens": 2},
+}
+FILE_BODY: Final = {
+    "id": "file-1",
+    "object": "file",
+    "bytes": 2,
+    "created_at": 1,
+    "filename": "in.jsonl",
+    "purpose": "batch",
+    "status": "processed",
+}
+FILE_DELETED_BODY: Final = {"id": "file-1", "object": "file", "deleted": True}
+BATCH_BODY: Final = {
+    "id": "batch-1",
+    "object": "batch",
+    "endpoint": "/v1/chat/completions",
+    "input_file_id": "file-1",
+    "completion_window": "24h",
+    "status": "validating",
+    "created_at": 1,
+}
+FINE_TUNING_JOB_BODY: Final = {
+    "id": "ftjob-1",
+    "object": "fine_tuning.job",
+    "created_at": 1,
+    "error": None,
+    "fine_tuned_model": None,
+    "finished_at": None,
+    "hyperparameters": {"n_epochs": "auto"},
+    "model": "gpt-5.4-nano",
+    "organization_id": "org-1",
+    "result_files": [],
+    "seed": 0,
+    "status": "queued",
+    "trained_tokens": None,
+    "training_file": "file-1",
+    "validation_file": None,
+}
+
+
+ASSISTANT_BODY: Final = {
+    "id": "asst-1",
+    "object": "assistant",
+    "created_at": 1,
+    "name": "wif",
+    "description": None,
+    "model": "gpt-5.4-nano",
+    "instructions": None,
+    "tools": [],
+    "metadata": {},
+}
+ASSISTANT_DELETED_BODY: Final = {"id": "asst-1", "object": "assistant.deleted", "deleted": True}
+THREAD_BODY: Final = {"id": "thread-1", "object": "thread", "created_at": 1, "metadata": {}}
+MESSAGE_BODY: Final = {
+    "id": "msg-1",
+    "object": "thread.message",
+    "created_at": 1,
+    "thread_id": "thread-1",
+    "role": "user",
+    "status": "completed",
+    "content": [{"type": "text", "text": {"value": "hi", "annotations": []}}],
+    "assistant_id": None,
+    "run_id": None,
+    "attachments": [],
+    "metadata": {},
+}
+RUN_BODY: Final = {
+    "id": "run-1",
+    "object": "thread.run",
+    "created_at": 1,
+    "thread_id": "thread-1",
+    "assistant_id": "asst-1",
+    "status": "completed",
+    "model": "gpt-5.4-nano",
+    "instructions": "",
+    "tools": [],
+    "metadata": {},
+    "parallel_tool_calls": False,
+}
+
+
+def mock_streaming_text_completions() -> respx.Route:
+    events: Final = (
+        {
+            "id": "cmpl-1",
+            "object": "text_completion",
+            "created": 1,
+            "model": "gpt-3.5-turbo-instruct",
+            "choices": [{"text": "ok", "index": 0, "finish_reason": None, "logprobs": None}],
+        },
+        {
+            "id": "cmpl-1",
+            "object": "text_completion",
+            "created": 1,
+            "model": "gpt-3.5-turbo-instruct",
+            "choices": [{"text": "", "index": 0, "finish_reason": "stop", "logprobs": None}],
+        },
+    )
+    body: Final = "".join(f"data: {json.dumps(event)}\n\n" for event in events) + "data: [DONE]\n\n"
+    return respx.post(COMPLETIONS_URL).mock(
+        return_value=httpx.Response(200, content=body, headers={"content-type": "text/event-stream"})
+    )
+
+
+def bearer_of(route: respx.Route) -> str:
+    return route.calls.last.request.headers["Authorization"]
+
+
+class TestDeploymentNonChatSurfaces:
+    @respx.mock
+    def test_image_generation_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("image-bearer")
+        route: Final = respx.post(IMAGES_URL).mock(return_value=httpx.Response(200, json=IMAGE_BODY))
+
+        response: Final = litellm.image_generation(model="openai/gpt-image-2", prompt="a cat", **deployment_wif)
+
+        assert response.data[0].b64_json == "aGk="
+        assert bearer_of(route) == "Bearer image-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_image_generation_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("aimage-bearer")
+        route: Final = respx.post(IMAGES_URL).mock(return_value=httpx.Response(200, json=IMAGE_BODY))
+
+        response: Final = await litellm.aimage_generation(model="openai/gpt-image-2", prompt="a cat", **deployment_wif)
+
+        assert response.data[0].b64_json == "aGk="
+        assert bearer_of(route) == "Bearer aimage-bearer"
+
+    @respx.mock
+    def test_image_variation_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("variation-bearer")
+        route: Final = respx.post(IMAGE_VARIATIONS_URL).mock(return_value=httpx.Response(200, json=IMAGE_BODY))
+
+        response: Final = litellm.image_variation(
+            model="openai/dall-e-2", image=b"png-bytes", custom_llm_provider="openai", **deployment_wif
+        )
+
+        assert response.data[0].b64_json == "aGk="
+        assert bearer_of(route) == "Bearer variation-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_image_variation_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("avariation-bearer")
+        route: Final = respx.post(IMAGE_VARIATIONS_URL).mock(return_value=httpx.Response(200, json=IMAGE_BODY))
+
+        response: Final = await litellm.aimage_variation(
+            model="openai/dall-e-2", image=b"png-bytes", custom_llm_provider="openai", **deployment_wif
+        )
+
+        assert response.data[0].b64_json == "aGk="
+        assert bearer_of(route) == "Bearer avariation-bearer"
+
+    @respx.mock
+    def test_speech_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("speech-bearer")
+        route: Final = respx.post(SPEECH_URL).mock(
+            return_value=httpx.Response(200, content=b"audio", headers={"content-type": "audio/mpeg"})
+        )
+
+        response: Final = litellm.speech(model="openai/gpt-4o-mini-tts", input="hi", voice="alloy", **deployment_wif)
+
+        assert response.content == b"audio"
+        assert bearer_of(route) == "Bearer speech-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_speech_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("aspeech-bearer")
+        route: Final = respx.post(SPEECH_URL).mock(
+            return_value=httpx.Response(200, content=b"audio", headers={"content-type": "audio/mpeg"})
+        )
+
+        response: Final = await litellm.aspeech(
+            model="openai/gpt-4o-mini-tts", input="hi", voice="alloy", **deployment_wif
+        )
+
+        assert response.content == b"audio"
+        assert bearer_of(route) == "Bearer aspeech-bearer"
+
+    @respx.mock
+    def test_transcription_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str], tmp_path: Path) -> None:
+        mock_token_exchange("transcribe-bearer")
+        route: Final = respx.post(TRANSCRIPTIONS_URL).mock(return_value=httpx.Response(200, json={"text": "hi"}))
+        audio: Final = tmp_path / "tone.wav"
+        audio.write_bytes(b"RIFF....WAVE")
+
+        with audio.open("rb") as audio_file:
+            response: Final = litellm.transcription(
+                model="openai/gpt-4o-mini-transcribe", file=audio_file, **deployment_wif
+            )
+
+        assert response.text == "hi"
+        assert bearer_of(route) == "Bearer transcribe-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_transcription_kwargs_carry_exchanged_bearer(
+        self, deployment_wif: dict[str, str], tmp_path: Path
+    ) -> None:
+        mock_token_exchange("atranscribe-bearer")
+        route: Final = respx.post(TRANSCRIPTIONS_URL).mock(return_value=httpx.Response(200, json={"text": "hi"}))
+        audio: Final = tmp_path / "tone.wav"
+        audio.write_bytes(b"RIFF....WAVE")
+
+        with audio.open("rb") as audio_file:
+            response: Final = await litellm.atranscription(
+                model="openai/gpt-4o-mini-transcribe", file=audio_file, **deployment_wif
+            )
+
+        assert response.text == "hi"
+        assert bearer_of(route) == "Bearer atranscribe-bearer"
+
+    @respx.mock
+    def test_moderation_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("moderation-bearer")
+        route: Final = respx.post(MODERATIONS_URL).mock(return_value=httpx.Response(200, json=MODERATION_BODY))
+
+        response: Final = litellm.moderation(input="hi", model="omni-moderation-latest", **deployment_wif)
+
+        assert response.results[0].flagged is False
+        assert bearer_of(route) == "Bearer moderation-bearer"
+
+    @respx.mock
+    def test_moderation_ignores_unrelated_kwargs_it_never_validated(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("moderation-bearer")
+        route: Final = respx.post(MODERATIONS_URL).mock(return_value=httpx.Response(200, json=MODERATION_BODY))
+
+        response: Final = litellm.moderation(
+            input="hi", model="omni-moderation-latest", api_version=20240101, **deployment_wif
+        )
+
+        assert response.results[0].flagged is False
+        assert bearer_of(route) == "Bearer moderation-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_moderation_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("amoderation-bearer")
+        route: Final = respx.post(MODERATIONS_URL).mock(return_value=httpx.Response(200, json=MODERATION_BODY))
+
+        response: Final = await litellm.amoderation(input="hi", model="omni-moderation-latest", **deployment_wif)
+
+        assert response.results[0].flagged is False
+        assert bearer_of(route) == "Bearer amoderation-bearer"
+
+    @respx.mock
+    def test_text_completion_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("text-bearer")
+        route: Final = respx.post(COMPLETIONS_URL).mock(return_value=httpx.Response(200, json=TEXT_COMPLETION_BODY))
+
+        response: Final = litellm.text_completion(
+            model="text-completion-openai/gpt-3.5-turbo-instruct", prompt="hi", **deployment_wif
+        )
+
+        assert response.choices[0].text == "ok"
+        assert bearer_of(route) == "Bearer text-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_text_completion_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("atext-bearer")
+        route: Final = respx.post(COMPLETIONS_URL).mock(return_value=httpx.Response(200, json=TEXT_COMPLETION_BODY))
+
+        response: Final = await litellm.atext_completion(
+            model="text-completion-openai/gpt-3.5-turbo-instruct", prompt="hi", **deployment_wif
+        )
+
+        assert response.choices[0].text == "ok"
+        assert bearer_of(route) == "Bearer atext-bearer"
+
+    @respx.mock
+    def test_streaming_text_completion_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("text-stream-bearer")
+        route: Final = mock_streaming_text_completions()
+
+        chunks: Final = tuple(
+            litellm.text_completion(
+                model="text-completion-openai/gpt-3.5-turbo-instruct", prompt="hi", stream=True, **deployment_wif
+            )
+        )
+
+        assert chunks[0].choices[0].text == "ok"
+        assert bearer_of(route) == "Bearer text-stream-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_streaming_text_completion_kwargs_carry_exchanged_bearer(
+        self, deployment_wif: dict[str, str]
+    ) -> None:
+        mock_token_exchange("atext-stream-bearer")
+        route: Final = mock_streaming_text_completions()
+
+        stream: Final = await litellm.atext_completion(
+            model="text-completion-openai/gpt-3.5-turbo-instruct", prompt="hi", stream=True, **deployment_wif
+        )
+        chunks: Final = [chunk async for chunk in stream]
+
+        assert chunks[0].choices[0].text == "ok"
+        assert bearer_of(route) == "Bearer atext-stream-bearer"
+
+    @respx.mock
+    @pytest.mark.parametrize(
+        ("method", "url", "response", "invoke"),
+        [
+            pytest.param(
+                "POST",
+                FILES_URL,
+                httpx.Response(200, json=FILE_BODY),
+                lambda p: litellm.create_file(file=("in.jsonl", b"{}"), purpose="batch", **p),
+                id="create_file",
+            ),
+            pytest.param(
+                "GET",
+                f"{FILES_URL}/file-1",
+                httpx.Response(200, json=FILE_BODY),
+                lambda p: litellm.file_retrieve(file_id="file-1", **p),
+                id="file_retrieve",
+            ),
+            pytest.param(
+                "DELETE",
+                f"{FILES_URL}/file-1",
+                httpx.Response(200, json=FILE_DELETED_BODY),
+                lambda p: litellm.file_delete(file_id="file-1", **p),
+                id="file_delete",
+            ),
+            pytest.param(
+                "GET",
+                FILES_URL,
+                httpx.Response(200, json={"object": "list", "data": [FILE_BODY]}),
+                lambda p: litellm.file_list(**p),
+                id="file_list",
+            ),
+            pytest.param(
+                "GET",
+                f"{FILES_URL}/file-1/content",
+                httpx.Response(200, content=b"{}"),
+                lambda p: litellm.file_content(file_id="file-1", **p),
+                id="file_content",
+            ),
+            pytest.param(
+                "POST",
+                BATCHES_URL,
+                httpx.Response(200, json=BATCH_BODY),
+                lambda p: litellm.create_batch(
+                    completion_window="24h", endpoint="/v1/chat/completions", input_file_id="file-1", **p
+                ),
+                id="create_batch",
+            ),
+            pytest.param(
+                "GET",
+                f"{BATCHES_URL}/batch-1",
+                httpx.Response(200, json=BATCH_BODY),
+                lambda p: litellm.retrieve_batch(batch_id="batch-1", **p),
+                id="retrieve_batch",
+            ),
+            pytest.param(
+                "POST",
+                f"{BATCHES_URL}/batch-1/cancel",
+                httpx.Response(200, json=BATCH_BODY),
+                lambda p: litellm.cancel_batch(batch_id="batch-1", **p),
+                id="cancel_batch",
+            ),
+            pytest.param(
+                "GET",
+                BATCHES_URL,
+                httpx.Response(200, json={"object": "list", "data": [BATCH_BODY], "has_more": False}),
+                lambda p: litellm.list_batches(**p),
+                id="list_batches",
+            ),
+            pytest.param(
+                "POST",
+                FINE_TUNING_JOBS_URL,
+                httpx.Response(200, json=FINE_TUNING_JOB_BODY),
+                lambda p: litellm.create_fine_tuning_job(model="gpt-5.4-nano", training_file="file-1", **p),
+                id="create_fine_tuning_job",
+            ),
+            pytest.param(
+                "POST",
+                f"{FINE_TUNING_JOBS_URL}/ftjob-1/cancel",
+                httpx.Response(200, json=FINE_TUNING_JOB_BODY),
+                lambda p: litellm.cancel_fine_tuning_job(fine_tuning_job_id="ftjob-1", **p),
+                id="cancel_fine_tuning_job",
+            ),
+            pytest.param(
+                "GET",
+                FINE_TUNING_JOBS_URL,
+                httpx.Response(200, json={"object": "list", "data": [FINE_TUNING_JOB_BODY], "has_more": False}),
+                lambda p: litellm.list_fine_tuning_jobs(**p),
+                id="list_fine_tuning_jobs",
+            ),
+            pytest.param(
+                "GET",
+                f"{FINE_TUNING_JOBS_URL}/ftjob-1",
+                httpx.Response(200, json=FINE_TUNING_JOB_BODY),
+                lambda p: litellm.retrieve_fine_tuning_job(fine_tuning_job_id="ftjob-1", **p),
+                id="retrieve_fine_tuning_job",
+            ),
+            pytest.param(
+                "GET",
+                ASSISTANTS_URL,
+                httpx.Response(200, json={"object": "list", "data": [ASSISTANT_BODY]}),
+                lambda p: litellm.get_assistants(**p),
+                id="get_assistants",
+            ),
+            pytest.param(
+                "POST",
+                ASSISTANTS_URL,
+                httpx.Response(200, json=ASSISTANT_BODY),
+                lambda p: litellm.create_assistants(model="gpt-5.4-nano", **p),
+                id="create_assistants",
+            ),
+            pytest.param(
+                "DELETE",
+                f"{ASSISTANTS_URL}/asst-1",
+                httpx.Response(200, json=ASSISTANT_DELETED_BODY),
+                lambda p: litellm.delete_assistant(assistant_id="asst-1", **p),
+                id="delete_assistant",
+            ),
+            pytest.param(
+                "POST",
+                THREADS_URL,
+                httpx.Response(200, json=THREAD_BODY),
+                lambda p: litellm.create_thread(**p),
+                id="create_thread",
+            ),
+            pytest.param(
+                "GET",
+                f"{THREADS_URL}/thread-1",
+                httpx.Response(200, json=THREAD_BODY),
+                lambda p: litellm.get_thread(thread_id="thread-1", **p),
+                id="get_thread",
+            ),
+            pytest.param(
+                "POST",
+                f"{THREADS_URL}/thread-1/messages",
+                httpx.Response(200, json=MESSAGE_BODY),
+                lambda p: litellm.add_message(thread_id="thread-1", role="user", content="hi", **p),
+                id="add_message",
+            ),
+            pytest.param(
+                "GET",
+                f"{THREADS_URL}/thread-1/messages",
+                httpx.Response(200, json={"object": "list", "data": [MESSAGE_BODY]}),
+                lambda p: litellm.get_messages(thread_id="thread-1", **p),
+                id="get_messages",
+            ),
+        ],
+    )
+    def test_managed_object_kwargs_carry_exchanged_bearer(
+        self,
+        deployment_wif: dict[str, str],
+        method: str,
+        url: str,
+        response: httpx.Response,
+        invoke: Callable[[dict[str, str]], object],
+    ) -> None:
+        mock_token_exchange("managed-bearer")
+        route: Final = respx.route(method=method, url__startswith=url).mock(return_value=response)
+
+        invoke({"custom_llm_provider": "openai", **deployment_wif})
+
+        assert bearer_of(route) == "Bearer managed-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_managed_object_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("amanaged-bearer")
+        files_route: Final = respx.get(url__startswith=FILES_URL).mock(
+            return_value=httpx.Response(200, json={"object": "list", "data": [FILE_BODY]})
+        )
+        batches_route: Final = respx.get(url__startswith=BATCHES_URL).mock(
+            return_value=httpx.Response(200, json={"object": "list", "data": [BATCH_BODY], "has_more": False})
+        )
+        jobs_route: Final = respx.get(url__startswith=FINE_TUNING_JOBS_URL).mock(
+            return_value=httpx.Response(200, json={"object": "list", "data": [FINE_TUNING_JOB_BODY], "has_more": False})
+        )
+
+        await litellm.afile_list(custom_llm_provider="openai", **deployment_wif)
+        await litellm.alist_batches(custom_llm_provider="openai", **deployment_wif)
+        await litellm.alist_fine_tuning_jobs(custom_llm_provider="openai", **deployment_wif)
+
+        assert bearer_of(files_route) == "Bearer amanaged-bearer"
+        assert bearer_of(batches_route) == "Bearer amanaged-bearer"
+        assert bearer_of(jobs_route) == "Bearer amanaged-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_repeated_managed_object_calls_exchange_the_token_once(self, deployment_wif: dict[str, str]) -> None:
+        exchange_route: Final = mock_token_exchange("once-bearer")
+        files_route: Final = respx.get(url__startswith=FILES_URL).mock(
+            return_value=httpx.Response(200, json={"object": "list", "data": [FILE_BODY]})
+        )
+
+        for _ in range(3):
+            await litellm.afile_list(custom_llm_provider="openai", **deployment_wif)
+
+        assert files_route.call_count == 3
+        assert exchange_route.call_count == 1
+        assert bearer_of(files_route) == "Bearer once-bearer"
+
+    @respx.mock
+    def test_run_thread_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("run-bearer")
+        create_route: Final = respx.post(f"{THREADS_URL}/thread-1/runs").mock(
+            return_value=httpx.Response(200, json=RUN_BODY)
+        )
+        poll_route: Final = respx.get(url__startswith=f"{THREADS_URL}/thread-1/runs/run-1").mock(
+            return_value=httpx.Response(200, json=RUN_BODY)
+        )
+
+        response: Final = litellm.run_thread(
+            custom_llm_provider="openai", thread_id="thread-1", assistant_id="asst-1", **deployment_wif
+        )
+
+        assert response.status == "completed"
+        assert bearer_of(create_route) == "Bearer run-bearer"
+        assert bearer_of(poll_route) == "Bearer run-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_async_assistant_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("aassistant-bearer")
+        assistants_route: Final = respx.get(url__startswith=ASSISTANTS_URL).mock(
+            return_value=httpx.Response(200, json={"object": "list", "data": [ASSISTANT_BODY]})
+        )
+        threads_route: Final = respx.post(url__startswith=THREADS_URL).mock(
+            return_value=httpx.Response(200, json=THREAD_BODY)
+        )
+
+        await litellm.aget_assistants(custom_llm_provider="openai", **deployment_wif)
+        await litellm.acreate_thread(custom_llm_provider="openai", **deployment_wif)
+
+        assert bearer_of(assistants_route) == "Bearer aassistant-bearer"
+        assert bearer_of(threads_route) == "Bearer aassistant-bearer"
+
+    @respx.mock
+    def test_container_file_kwargs_carry_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("container-files-bearer")
+        route: Final = respx.get(f"{CONTAINERS_URL}/cntr_1/files").mock(
+            return_value=httpx.Response(200, json={"object": "list", "data": [], "has_more": False})
+        )
+
+        response: Final = list_container_files(container_id="cntr_1", custom_llm_provider="openai", **deployment_wif)
+
+        assert response.has_more is False
+        assert bearer_of(route) == "Bearer container-files-bearer"
+
+    @respx.mock
+    def test_repeated_moderation_calls_exchange_the_token_once(self, deployment_wif: dict[str, str]) -> None:
+        exchange_route: Final = mock_token_exchange("once-bearer")
+        moderation_route: Final = respx.post(MODERATIONS_URL).mock(
+            return_value=httpx.Response(200, json=MODERATION_BODY)
+        )
+
+        for _ in range(3):
+            litellm.moderation(input="hi", model="omni-moderation-latest", **deployment_wif)
+
+        assert moderation_route.call_count == 3
+        assert exchange_route.call_count == 1
+
+
+EMBEDDING_BODY: Final = {
+    "object": "list",
+    "data": [{"object": "embedding", "index": 0, "embedding": [0.1, 0.2]}],
+    "model": "text-embedding-3-small",
+    "usage": {"prompt_tokens": 1, "total_tokens": 1},
+}
+DECISIONS_URL: Final = "https://api.openai.com/v1/decisions"
+DECISIONS_BODY: Final = {
+    "model": "gpt-6-luna",
+    "answers": [{"type": "predicate", "name": "is_defect", "probability": 0.9}],
+    "usage": {
+        "input_tokens": 3,
+        "input_tokens_details": {"cached_tokens": 0},
+        "output_tokens": 1,
+        "output_tokens_details": {"reasoning_tokens": 0},
+        "total_tokens": 4,
+    },
+}
+INPUT_TOKENS_URL: Final = "https://api.openai.com/v1/responses/input_tokens"
+DEPLOYMENT_KEY_ROUTES: Final = (
+    pytest.param(
+        CHAT_COMPLETIONS_URL,
+        httpx.Response(200, json=CHAT_COMPLETION_BODY),
+        lambda p: litellm.completion(model="openai/gpt-4o-mini", messages=[{"role": "user", "content": "hi"}], **p),
+        id="completion",
+    ),
+    pytest.param(
+        EMBEDDINGS_URL,
+        httpx.Response(200, json=EMBEDDING_BODY),
+        lambda p: litellm.embedding(model="openai/text-embedding-3-small", input=["hi"], **p),
+        id="embedding",
+    ),
+    pytest.param(
+        IMAGES_URL,
+        httpx.Response(200, json=IMAGE_BODY),
+        lambda p: litellm.image_generation(model="openai/gpt-image-2", prompt="a cat", **p),
+        id="image_generation",
+    ),
+    pytest.param(
+        TRANSCRIPTIONS_URL,
+        httpx.Response(200, json={"text": "hi"}),
+        lambda p: litellm.transcription(model="openai/gpt-4o-mini-transcribe", file=("tone.wav", b"RIFF"), **p),
+        id="transcription",
+    ),
+    pytest.param(
+        MODERATIONS_URL,
+        httpx.Response(200, json=MODERATION_BODY),
+        lambda p: litellm.moderation(input="hi", model="omni-moderation-latest", **p),
+        id="moderation",
+    ),
+    pytest.param(
+        MODERATIONS_URL,
+        httpx.Response(200, json=MODERATION_BODY),
+        lambda p: asyncio.run(litellm.amoderation(input="hi", model="omni-moderation-latest", **p)),
+        id="amoderation",
+    ),
+    pytest.param(
+        ASSISTANTS_URL,
+        httpx.Response(200, json={"object": "list", "data": [ASSISTANT_BODY]}),
+        lambda p: litellm.get_assistants(custom_llm_provider="openai", **p),
+        id="get_assistants",
+    ),
+    pytest.param(
+        ASSISTANTS_URL,
+        httpx.Response(200, json=ASSISTANT_BODY),
+        lambda p: litellm.create_assistants(custom_llm_provider="openai", model="gpt-5.4-nano", **p),
+        id="create_assistants",
+    ),
+    pytest.param(
+        f"{ASSISTANTS_URL}/asst-1",
+        httpx.Response(200, json=ASSISTANT_DELETED_BODY),
+        lambda p: litellm.delete_assistant(custom_llm_provider="openai", assistant_id="asst-1", **p),
+        id="delete_assistant",
+    ),
+    pytest.param(
+        DECISIONS_URL,
+        httpx.Response(200, json=DECISIONS_BODY),
+        lambda p: litellm.decisions(
+            model="openai/gpt-6-luna",
+            state="review",
+            questions={"is_defect": {"type": "noul", "instructions": "Is this a defect?"}},
+            **p,
+        ),
+        id="decisions",
+    ),
+)
+
+
+@pytest.mark.parametrize(("url", "response", "invoke"), DEPLOYMENT_KEY_ROUTES)
+class TestDeploymentKeyBesideIdentity:
+    @respx.mock
+    def test_deployment_key_equal_to_the_process_key_wins_without_an_exchange(
+        self,
+        deployment_wif: dict[str, str],
+        monkeypatch: pytest.MonkeyPatch,
+        url: str,
+        response: httpx.Response,
+        invoke: Callable[[dict[str, str]], object],
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-shared")
+        exchange: Final = mock_token_exchange()
+        route: Final = respx.route(url__startswith=url).mock(return_value=response)
+
+        invoke({"api_key": "sk-shared", **deployment_wif})
+
+        assert bearer_of(route) == "Bearer sk-shared"
+        assert exchange.call_count == 0
+
+    @respx.mock
+    def test_process_key_beats_deployment_identity_without_an_exchange(
+        self,
+        deployment_wif: dict[str, str],
+        monkeypatch: pytest.MonkeyPatch,
+        url: str,
+        response: httpx.Response,
+        invoke: Callable[[dict[str, str]], object],
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-shared")
+        exchange: Final = mock_token_exchange()
+        route: Final = respx.route(url__startswith=url).mock(return_value=response)
+
+        invoke(deployment_wif)
+
+        assert bearer_of(route) == "Bearer sk-shared"
+        assert exchange.call_count == 0
+
+    @respx.mock
+    def test_secret_manager_key_beats_deployment_identity_without_an_exchange(
+        self,
+        deployment_wif: dict[str, str],
+        monkeypatch: pytest.MonkeyPatch,
+        url: str,
+        response: httpx.Response,
+        invoke: Callable[[dict[str, str]], object],
+    ) -> None:
+        monkeypatch.setattr(litellm, "secret_manager_client", _VaultHoldingOpenAIKey())
+        monkeypatch.setattr(litellm, "_key_management_system", KeyManagementSystem.CUSTOM)
+        monkeypatch.setattr(litellm, "_key_management_settings", KeyManagementSettings(access_mode="read_only"))
+        exchange: Final = mock_token_exchange()
+        route: Final = respx.route(url__startswith=url).mock(return_value=response)
+
+        invoke(deployment_wif)
+
+        assert bearer_of(route) == "Bearer sk-from-vault"
+        assert exchange.call_count == 0
+
+
+class _VaultHoldingOpenAIKey(CustomSecretManager):
+    def __init__(self) -> None:
+        super().__init__(secret_manager_name="openai_key_vault")
+
+    async def async_read_secret(
+        self,
+        secret_name: str,
+        optional_params: dict[str, object] | None = None,
+        timeout: float | httpx.Timeout | None = None,
+    ) -> str | None:
+        return self.sync_read_secret(secret_name, optional_params, timeout)
+
+    def sync_read_secret(
+        self,
+        secret_name: str,
+        optional_params: dict[str, object] | None = None,
+        timeout: float | httpx.Timeout | None = None,
+    ) -> str | None:
+        return "sk-from-vault" if secret_name == "OPENAI_API_KEY" else None
+
+
+class TestCountTokensFromDeployment:
+    @staticmethod
+    async def count(litellm_params: dict[str, str]) -> int | None:
+        result: Final = await OpenAITokenCounter().count_tokens(
+            model_to_use="gpt-4o-mini",
+            messages=[{"role": "user", "content": "hi"}],
+            contents=None,
+            deployment={"litellm_params": litellm_params},
+        )
+        return None if result is None else result.total_tokens
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_keyless_deployment_counts_with_the_exchanged_bearer(self, deployment_wif: dict[str, str]) -> None:
+        mock_token_exchange("count-bearer")
+        route: Final = respx.post(INPUT_TOKENS_URL).mock(return_value=httpx.Response(200, json={"input_tokens": 7}))
+
+        assert await self.count(deployment_wif) == 7
+        assert bearer_of(route) == "Bearer count-bearer"
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_process_key_beats_deployment_identity_without_an_exchange(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        monkeypatch.setenv("OPENAI_API_KEY", "sk-from-env")
+        exchange: Final = mock_token_exchange()
+        route: Final = respx.post(INPUT_TOKENS_URL).mock(return_value=httpx.Response(200, json={"input_tokens": 7}))
+
+        await self.count(deployment_wif)
+
+        assert bearer_of(route) == "Bearer sk-from-env"
+        assert exchange.call_count == 0
+
+    @respx.mock
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("module_key", ["api_key", "openai_key"])
+    async def test_module_level_key_beats_deployment_identity_without_an_exchange(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch, module_key: str
+    ) -> None:
+        monkeypatch.setattr(litellm, module_key, "sk-module-level")
+        exchange: Final = mock_token_exchange()
+        route: Final = respx.post(INPUT_TOKENS_URL).mock(return_value=httpx.Response(200, json={"input_tokens": 7}))
+
+        await self.count(deployment_wif)
+
+        assert bearer_of(route) == "Bearer sk-module-level"
+        assert exchange.call_count == 0
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_deployment_key_wins_without_an_exchange(self, deployment_wif: dict[str, str]) -> None:
+        exchange: Final = mock_token_exchange()
+        route: Final = respx.post(INPUT_TOKENS_URL).mock(return_value=httpx.Response(200, json={"input_tokens": 7}))
+
+        await self.count({"api_key": "sk-count", **deployment_wif})
+
+        assert bearer_of(route) == "Bearer sk-count"
+        assert exchange.call_count == 0
+
+    @respx.mock
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        "identity_keys",
+        [tuple(OPENAI_WIF_KWARGS_KEYS), ("openai_identity_provider_id",)],
+        ids=["complete_trio", "partial_trio"],
+    )
+    async def test_secret_manager_key_beats_deployment_identity_without_an_exchange(
+        self, deployment_wif: dict[str, str], monkeypatch: pytest.MonkeyPatch, identity_keys: tuple[str, ...]
+    ) -> None:
+        monkeypatch.setattr(litellm, "secret_manager_client", _VaultHoldingOpenAIKey())
+        monkeypatch.setattr(litellm, "_key_management_system", KeyManagementSystem.CUSTOM)
+        monkeypatch.setattr(litellm, "_key_management_settings", KeyManagementSettings(access_mode="read_only"))
+        exchange: Final = mock_token_exchange()
+        route: Final = respx.post(INPUT_TOKENS_URL).mock(return_value=httpx.Response(200, json={"input_tokens": 7}))
+
+        assert await self.count({key: deployment_wif[key] for key in identity_keys}) == 7
+        assert bearer_of(route) == "Bearer sk-from-vault"
+        assert exchange.call_count == 0
+
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_partial_deployment_identity_answers_a_401_naming_the_gap_without_a_count_call(self) -> None:
+        exchange: Final = mock_token_exchange()
+        route: Final = respx.post(INPUT_TOKENS_URL).mock(return_value=httpx.Response(200, json={"input_tokens": 7}))
+
+        result: Final = await OpenAITokenCounter().count_tokens(
+            model_to_use="gpt-4o-mini",
+            messages=[{"role": "user", "content": "hi"}],
+            contents=None,
+            deployment={"litellm_params": {"openai_identity_provider_id": "idp-only"}},
+        )
+
+        assert result is not None
+        assert (result.error, result.status_code, result.total_tokens) == (True, 401, 0)
+        assert "openai_service_account_id" in (result.error_message or "")
+        assert route.call_count == 0
+        assert exchange.call_count == 0
+
+
+VECTOR_STORES_URL: Final = "https://api.openai.com/v1/vector_stores"
+LIST_PAGE_BODY: Final = {"object": "list", "data": [], "has_more": False}
+
+
+def mock_token_exchange_naming_its_thread(event_loop_thread: int) -> respx.Route:
+    def respond(request: httpx.Request) -> httpx.Response:
+        minted_on: Final = "event-loop" if threading.get_ident() == event_loop_thread else "worker-thread"
+        return httpx.Response(200, json={"access_token": f"minted-on-{minted_on}", "expires_in": 3600})
+
+    return respx.post(TOKEN_EXCHANGE_URL).mock(side_effect=respond)
+
+
+LOOP_BOUND_ROUTES: Final = (
+    pytest.param(
+        "POST",
+        "https://api.openai.com/v1/images/edits",
+        httpx.Response(200, json=IMAGE_BODY),
+        lambda p: litellm.aimage_edit(
+            model="openai/gpt-image-2", image=[io.BytesIO(b"png-bytes")], prompt="add a hat", **p
+        ),
+        id="image_edit",
+    ),
+    pytest.param(
+        "GET",
+        "https://api.openai.com/v1/videos/video_1",
+        httpx.Response(
+            200, json={"id": "video_1", "object": "video", "status": "completed", "created_at": 1, "model": "sora-2"}
+        ),
+        lambda p: litellm.avideo_status(video_id="video_1", custom_llm_provider="openai", **p),
+        id="video_status",
+    ),
+    pytest.param(
+        "GET",
+        f"{CONTAINERS_URL}/cntr_1",
+        httpx.Response(
+            200,
+            json={
+                "id": "cntr_1",
+                "object": "container",
+                "created_at": 1,
+                "status": "running",
+                "expires_after": {"anchor": "last_active_at", "minutes": 20},
+                "last_active_at": 1,
+                "name": "sandbox",
+            },
+        ),
+        lambda p: aretrieve_container(container_id="cntr_1", custom_llm_provider="openai", **p),
+        id="retrieve_container",
+    ),
+    pytest.param(
+        "GET",
+        f"{CONTAINERS_URL}/cntr_1/files",
+        httpx.Response(200, json=LIST_PAGE_BODY),
+        lambda p: alist_container_files(container_id="cntr_1", custom_llm_provider="openai", **p),
+        id="container_files",
+    ),
+    pytest.param(
+        "POST",
+        f"{VECTOR_STORES_URL}/vs_1/search",
+        httpx.Response(200, json={"object": "vector_store.search_results.page", "search_query": "q", "data": []}),
+        lambda p: litellm.vector_stores.asearch(vector_store_id="vs_1", query="q", custom_llm_provider="openai", **p),
+        id="vector_store_search",
+    ),
+    pytest.param(
+        "GET",
+        f"{VECTOR_STORES_URL}/vs_1/files",
+        httpx.Response(200, json=LIST_PAGE_BODY),
+        lambda p: litellm.vector_store_files.alist(vector_store_id="vs_1", custom_llm_provider="openai", **p),
+        id="vector_store_files",
+    ),
+    pytest.param(
+        "POST",
+        DECISIONS_URL,
+        httpx.Response(200, json=DECISIONS_BODY),
+        lambda p: litellm.adecisions(
+            model="openai/gpt-6-luna",
+            state="review",
+            questions={"is_defect": {"type": "noul", "instructions": "Is this a defect?"}},
+            **p,
+        ),
+        id="decisions",
+    ),
+)
+
+
+@pytest.mark.parametrize(("method", "url", "response", "invoke"), LOOP_BOUND_ROUTES)
+class TestTokenExchangeLeavesTheEventLoopFree:
+    @respx.mock
+    @pytest.mark.asyncio
+    async def test_token_exchange_runs_off_the_event_loop(
+        self,
+        deployment_wif: dict[str, str],
+        method: str,
+        url: str,
+        response: httpx.Response,
+        invoke: Callable[[dict[str, str]], Awaitable[object]],
+    ) -> None:
+        mock_token_exchange_naming_its_thread(threading.get_ident())
+        upstream: Final = respx.route(method=method, url=url).mock(return_value=response)
+
+        await invoke(deployment_wif)
+
+        assert bearer_of(upstream) == "Bearer minted-on-worker-thread"
+
+
 class TestCountTokens:
     @pytest.mark.asyncio
     @respx.mock
diff --git a/tests/unit/messages/__init__.py b/tests/unit/messages/__init__.py
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/tests/unit/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py b/tests/unit/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py
index c96e759b1a3..c4414003ca5 100644
--- a/tests/unit/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py
+++ b/tests/unit/proxy/_experimental/mcp_server/auth/test_user_api_key_auth_mcp.py
@@ -4,6 +4,7 @@ import os
 from collections.abc import Sequence
 from collections.abc import Set as AbstractSet
 from datetime import datetime, timedelta, timezone
+from types import SimpleNamespace
 from typing import Final, Literal
 from unittest.mock import AsyncMock, MagicMock, patch
 
@@ -12,6 +13,7 @@ from fastapi import HTTPException
 from fastapi.testclient import TestClient
 from starlette.datastructures import Headers
 
+from litellm.caching.caching import DualCache
 from litellm.constants import MCP_ALL_TOOLS_WILDCARD
 from litellm.models.access_group import LiteLLM_AccessGroupTable
 from litellm.proxy._experimental.mcp_server.auth.user_api_key_auth_mcp import (
@@ -23,6 +25,7 @@ from litellm.proxy._experimental.mcp_server.auth.user_api_key_auth_mcp import (
 from litellm.proxy._types import (
     LiteLLM_ObjectPermissionTable,
     LiteLLM_TeamTable,
+    LiteLLM_UserTable,
     ProxyException,
     SpecialHeaders,
     SpecialMCPServerNames,
@@ -11549,3 +11552,117 @@ class TestAccessGroupToolOwnershipAndFaults:
             patch("litellm.proxy.auth.auth_checks.get_access_object", self._loader(groups, missing={"typo-group"})),
         ):
             assert await MCPRequestHandler.get_allowed_tools_for_server("srv", auth) == ["read"]
+
+
+class _EmptyTables:
+    """Storage edge for a session credential's catalog refresh: the user row the real
+    ``reload_admitted_user`` reads, and every other table (keys, MCP servers, config) empty, so the
+    real ``_reload_admitted_key`` fails closed, since a session credential has no key row."""
+
+    def __init__(self, live_user: LiteLLM_UserTable) -> None:
+        self.litellm_usertable = SimpleNamespace(find_unique=AsyncMock(return_value=live_user))
+
+    def __getattr__(self, table: str) -> SimpleNamespace:
+        empty: Final = SimpleNamespace(
+            find_unique=AsyncMock(return_value=None),
+            find_first=AsyncMock(return_value=None),
+            find_many=AsyncMock(return_value=[]),
+            count=AsyncMock(return_value=0),
+        )
+        setattr(self, table, empty)
+        return empty
+
+
+def _session_credential_storage(live_user: LiteLLM_UserTable) -> SimpleNamespace:
+    tables: Final = _EmptyTables(live_user)
+    return SimpleNamespace(db=tables, writer_db=tables)
+
+
+@pytest.mark.asyncio
+async def test_catalog_refresh_reloads_session_credential_through_its_user_and_keeps_token_grants(monkeypatch):
+    """A ``/token``-minted or ``lite login`` credential has no key row: the catalog refresh must read the live
+    user policy, never the key table, and keep the team, routes and models sealed in the token."""
+    from litellm.proxy import proxy_server
+
+    database = _session_credential_storage(
+        LiteLLM_UserTable(user_id="session-user", organization_id="live-org", user_role="internal_user", teams=[])
+    )
+    monkeypatch.setattr(proxy_server, "prisma_client", database)
+    monkeypatch.setattr(proxy_server, "user_api_key_cache", DualCache())
+    caller = UserAPIKeyAuth(
+        api_key="session-token-hash",
+        user_id="session-user",
+        team_id="token-team",
+        org_id="stale-org",
+        user_role="proxy_admin",
+        models=["token-model"],
+        allowed_routes=["mcp_inference_routes"],
+        is_session_token=True,
+    )
+    caller.via_virtual_key = True
+    refreshed = await MCPRequestHandler.refresh_catalog_authority(caller)
+    assert database.writer_db.litellm_usertable.find_unique.await_count >= 1
+    database.writer_db.litellm_verificationtoken.find_unique.assert_not_awaited()
+    assert (refreshed.object_permission, refreshed.object_permission_id) == (None, None)
+    assert (refreshed.user_role, refreshed.org_id) == ("internal_user", "live-org")
+    assert (refreshed.team_id, refreshed.models, refreshed.allowed_routes) == (
+        "token-team",
+        ["token-model"],
+        ["mcp_inference_routes"],
+    )
+    assert refreshed.is_session_token and refreshed.requires_fresh_policy
+    assert caller.org_id == "stale-org" and not caller.requires_fresh_policy
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("scope", ["litellm:mcp litellm:llm", "litellm:mcp", None])
+async def test_token_minted_credential_lists_tools_for_every_scope_shape(monkeypatch, scope):
+    """``tools/list`` with the credential ``/token`` mints (a session token the shared auth marks
+    ``via_virtual_key`` at the key-cache boundary) returns the tool list instead of the JSON-RPC
+    credential error, for the combined, MCP-only and unscoped ID-JAG shapes."""
+    from mcp.types import ListToolsRequest, ListToolsResult, Tool
+
+    from litellm.proxy import proxy_server
+    from litellm.proxy._experimental.mcp_server import operations
+    from litellm.proxy._experimental.mcp_server.id_jag_grant import SubjectTokenRefusal, granted_scope
+    from litellm.proxy._experimental.mcp_server.operations import GatewayOperations, prepare_context
+    from litellm.proxy._types import MCPTransport
+    from litellm.proxy.auth.auth_checks import ExperimentalUIJWTToken
+    from litellm.types.mcp_server.mcp_server_manager import MCPServer
+
+    monkeypatch.setenv("LITELLM_SALT_KEY", "sk-session-credential-tools-list")
+    granted = granted_scope(scope, mcp_resource=False)
+    assert not isinstance(granted, SubjectTokenRefusal)
+    user = LiteLLM_UserTable(user_id="okta-user-1", user_email="okta@example.com", user_role="internal_user")
+    minted = ExperimentalUIJWTToken.get_cli_jwt_auth_token(
+        user, team_id="team-eng", team_alias="eng", allowed_routes=granted.allowed_routes
+    )
+    credential = ExperimentalUIJWTToken.get_key_object_from_ui_hash_key(minted)
+    assert credential is not None and credential.is_session_token
+    credential.api_key = "hash-of-" + minted[:16]
+    credential.via_virtual_key = True
+    server = MCPServer(
+        server_id="eng-server",
+        name="eng_server",
+        server_name="eng_server",
+        alias="eng_server",
+        url="https://upstream.example.com/mcp",
+        transport=MCPTransport.http,
+    )
+    database = _session_credential_storage(user)
+    monkeypatch.setattr(proxy_server, "prisma_client", database)
+    monkeypatch.setattr(proxy_server, "user_api_key_cache", DualCache())
+    tool = Tool(name="eng_server-list_repos", description="list repos", inputSchema={"type": "object"})
+    with (
+        patch.object(operations, "_get_allowed_mcp_servers", AsyncMock(return_value=[server])),
+        patch.object(
+            operations.global_mcp_server_manager,
+            "get_tools_page",
+            AsyncMock(return_value=ListToolsResult(tools=[tool])),
+        ),
+    ):
+        result = await GatewayOperations().execute(ListToolsRequest(), prepare_context(user_api_key_auth=credential))
+    assert [listed.name for listed in result.tools] == ["eng_server-list_repos"]
+    assert database.writer_db.litellm_usertable.find_unique.await_count >= 1
+    database.writer_db.litellm_verificationtoken.find_unique.assert_not_awaited()
+    assert credential.team_id == "team-eng" and credential.allowed_routes == list(granted.allowed_routes or ())
diff --git a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_adapter.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_adapter.py
index 2cdf716fa30..9cd19e9a1c9 100644
--- a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_adapter.py
+++ b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_adapter.py
@@ -31,6 +31,7 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.types import (
     ClientSecretAuth,
     CredError,
     IdJagConfig,
+    IdJagSubjectSource,
     NoneConfig,
     PassthroughConfig,
     PrivateKeyJwtAuth,
@@ -908,3 +909,25 @@ def test_incomplete_obo_keeps_exchange_ownership(client_secret: str | None, is_b
     assert isinstance(spec.config, TokenExchangeConfig)
     assert spec.config.client_id == "client"
     assert spec.config.client_secret is None
+    assert spec.config.client_id == "client"
+    assert spec.config.client_secret is None
+
+
+@pytest.mark.parametrize(
+    ("configured", "expected"),
+    [
+        (None, IdJagSubjectSource.login_assertion),
+        ("login_assertion", IdJagSubjectSource.login_assertion),
+        ("refresh_token", IdJagSubjectSource.refresh_token),
+    ],
+)
+def test_id_jag_subject_source_maps_to_config(configured: str | None, expected: IdJagSubjectSource) -> None:
+    spec = to_server_spec(_id_jag_server(id_jag_subject_source=configured))
+
+    assert spec is not None
+    assert isinstance(spec.config, IdJagConfig)
+    assert spec.config.subject_source is expected
+
+
+def test_id_jag_unknown_subject_source_defers_like_a_half_configured_server() -> None:
+    assert to_server_spec(_id_jag_server(id_jag_subject_source="assertion")) is None
diff --git a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_login_assertion_exchange.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_login_assertion_exchange.py
new file mode 100644
index 00000000000..bb228544e14
--- /dev/null
+++ b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_login_assertion_exchange.py
@@ -0,0 +1,327 @@
+"""The login-time exchange of a captured identity assertion for an IdP refresh token."""
+
+import asyncio
+import logging
+from datetime import datetime, timedelta, timezone
+
+import pytest
+from pydantic import SecretStr
+
+from litellm.proxy._experimental.mcp_server.outbound_credentials.login_assertion_exchange import (
+    exchange_login_assertion_for_refresh_token,
+    login_exchange_servers,
+    refresh_token_exchange_targets,
+)
+from litellm.proxy._experimental.mcp_server.outbound_credentials.result import Error, Ok, Result
+from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+    SAML2_SUBJECT_TOKEN_TYPE,
+    SSOIdentityAssertion,
+    assertion_from_saml_login,
+    login_refresh_token_expired,
+    with_login_refresh_token,
+)
+from litellm.proxy._experimental.mcp_server.outbound_credentials.token_endpoint import ExchangedToken
+from litellm.proxy._experimental.mcp_server.outbound_credentials.types import (
+    ClientAuth,
+    ClientSecretAuth,
+    CredError,
+    IdJagConfig,
+    IdJagResourceClient,
+    IdJagSubjectSource,
+    NoneConfig,
+    ServerSpec,
+)
+from litellm.proxy._types import LiteLLM_MCPServerTable
+from litellm.types.mcp import MCPAuth, MCPTransport
+from litellm.types.mcp_server.mcp_server_manager import MCPServer
+
+_NOW = datetime(2026, 10, 16, 12, 0, tzinfo=timezone.utc)
+
+
+def _config(
+    *, source: IdJagSubjectSource = IdJagSubjectSource.refresh_token, client_id: str = "agent", endpoint: str = ""
+) -> IdJagConfig:
+    return IdJagConfig(
+        org_token_endpoint=endpoint or "https://idp.example.com/token",
+        resource_token_endpoint="https://mcp-as.example.com/token",
+        client_id=client_id,
+        client_auth=ClientSecretAuth(client_secret=SecretStr("s")),
+        resource_client=IdJagResourceClient(
+            client_id=client_id, client_auth=ClientSecretAuth(client_secret=SecretStr("s"))
+        ),
+        subject_source=source,
+    )
+
+
+def _spec(config: IdJagConfig | NoneConfig, server_id: str = "srv") -> ServerSpec:
+    return ServerSpec(server_id=server_id, resource="https://mcp.example.com", config=config)
+
+
+def _saml() -> SSOIdentityAssertion:
+    return assertion_from_saml_login(b"<saml:Assertion/>", int(_NOW.timestamp()) + 300, "https://idp.example.com")
+
+
+class _Endpoint:
+    def __init__(self, result: Result[ExchangedToken, CredError]) -> None:
+        self._result = result
+        self.calls: list[tuple[str, str, dict[str, str], ClientAuth]] = []
+
+    async def fetch(
+        self, endpoint: str, client_id: str, grant_params: dict[str, str], client_auth: ClientAuth
+    ) -> Result[ExchangedToken, CredError]:
+        self.calls.append((endpoint, client_id, dict(grant_params), client_auth))
+        return self._result
+
+
+def test_targets_keep_only_refresh_token_sourced_id_jag_servers_one_per_idp_client():
+    direct = _config(source=IdJagSubjectSource.login_assertion)
+    first = _config(client_id="agent")
+    twin = _config(client_id="agent")
+    other = _config(client_id="other-agent")
+
+    targets = refresh_token_exchange_targets(
+        [_spec(direct, "a"), None, _spec(NoneConfig(), "b"), _spec(first, "c"), _spec(other, "d"), _spec(twin, "e")]
+    )
+
+    assert targets == (first, other)
+
+
+@pytest.mark.asyncio
+async def test_exchange_presents_the_captured_assertion_and_keeps_the_refresh_token():
+    endpoint = _Endpoint(Ok(ExchangedToken(access_token="rt-1", expires_in=3600)))
+    config = _config()
+    saml = _saml()
+
+    exchanged = await exchange_login_assertion_for_refresh_token(saml, (config,), endpoint, _NOW)
+
+    ((url, client_id, params, auth),) = endpoint.calls
+    assert (url, client_id, auth) == (config.org_token_endpoint, config.client_id, config.client_auth)
+    assert params == {
+        "grant_type": "urn:ietf:params:oauth:grant-type:token-exchange",
+        "requested_token_type": "urn:ietf:params:oauth:token-type:refresh_token",
+        "subject_token": saml.id_token.get_secret_value(),
+        "subject_token_type": SAML2_SUBJECT_TOKEN_TYPE,
+        "scope": "openid offline_access",
+    }
+    assert exchanged.exchanged_refresh_token is not None
+    assert exchanged.exchanged_refresh_token.get_secret_value() == "rt-1"
+    assert exchanged.exchanged_refresh_token_endpoint == "https://idp.example.com/token"
+    assert exchanged.exchanged_refresh_token_client_id == "agent"
+    assert exchanged.exchanged_refresh_token_expires_at == _NOW + timedelta(seconds=3600)
+    assert exchanged.id_token == saml.id_token
+    assert exchanged.expires_at == saml.expires_at
+    assert exchanged.subject_token_type == SAML2_SUBJECT_TOKEN_TYPE
+    assert not login_refresh_token_expired(exchanged, _NOW + timedelta(seconds=3599))
+    assert login_refresh_token_expired(exchanged, _NOW + timedelta(seconds=3600))
+
+
+@pytest.mark.asyncio
+async def test_exchange_without_a_lifetime_leaves_expiry_to_the_idp():
+    endpoint = _Endpoint(Ok(ExchangedToken(access_token="rt-1", expires_in=None)))
+
+    exchanged = await exchange_login_assertion_for_refresh_token(_saml(), (_config(),), endpoint, _NOW)
+
+    assert exchanged.exchanged_refresh_token_expires_at is None
+    assert not login_refresh_token_expired(exchanged, _NOW + timedelta(days=365))
+
+
+@pytest.mark.asyncio
+async def test_a_refused_exchange_keeps_the_plain_assertion(caplog: pytest.LogCaptureFixture):
+    endpoint = _Endpoint(Error(CredError.of_upstream_unavailable("token exchange failed with status 400")))
+    saml = _saml()
+
+    with caplog.at_level("WARNING"):
+        exchanged = await exchange_login_assertion_for_refresh_token(saml, (_config(),), endpoint, _NOW)
+
+    assert exchanged == saml
+    assert exchanged.exchanged_refresh_token is None
+    assert any("refused to exchange the login assertion" in message for message in caplog.messages)
+
+
+@pytest.mark.asyncio
+async def test_no_exchange_without_a_refresh_token_sourced_server():
+    endpoint = _Endpoint(Ok(ExchangedToken(access_token="rt-1", expires_in=3600)))
+    saml = _saml()
+
+    assert await exchange_login_assertion_for_refresh_token(saml, (), endpoint, _NOW) == saml
+    assert endpoint.calls == []
+
+
+@pytest.mark.asyncio
+async def test_an_oidc_login_is_exchanged_at_the_id_jag_client_and_keeps_its_sso_refresh_token():
+    """The SSO refresh token belongs to the SSO client and cannot be redeemed by the ID-JAG client, so
+    an OIDC login still exchanges its id_token and both tokens live side by side."""
+    endpoint = _Endpoint(Ok(ExchangedToken(access_token="rt-1", expires_in=3600)))
+    oidc = SSOIdentityAssertion(id_token=SecretStr("id-token"), refresh_token=SecretStr("sso-rt"))
+
+    exchanged = await exchange_login_assertion_for_refresh_token(oidc, (_config(),), endpoint, _NOW)
+
+    assert endpoint.calls[0][2]["subject_token"] == "id-token"
+    assert endpoint.calls[0][2]["subject_token_type"] == "urn:ietf:params:oauth:token-type:id_token"
+    assert exchanged.refresh_token is not None and exchanged.refresh_token.get_secret_value() == "sso-rt"
+    assert exchanged.exchanged_refresh_token is not None
+    assert exchanged.exchanged_refresh_token.get_secret_value() == "rt-1"
+
+
+@pytest.mark.asyncio
+async def test_a_login_already_exchanged_is_not_exchanged_again():
+    endpoint = _Endpoint(Ok(ExchangedToken(access_token="rt-2", expires_in=3600)))
+    done = with_login_refresh_token(_saml(), "rt-1", 3600, _NOW)
+
+    assert await exchange_login_assertion_for_refresh_token(done, (_config(),), endpoint, _NOW) == done
+    assert endpoint.calls == []
+
+
+@pytest.mark.asyncio
+async def test_several_idp_clients_mint_for_the_first_and_warn(caplog: pytest.LogCaptureFixture):
+    endpoint = _Endpoint(Ok(ExchangedToken(access_token="rt-1", expires_in=3600)))
+    first, second = _config(client_id="agent"), _config(client_id="other-agent")
+
+    with caplog.at_level("WARNING"):
+        exchanged = await exchange_login_assertion_for_refresh_token(_saml(), (first, second), endpoint, _NOW)
+
+    assert [call[1] for call in endpoint.calls] == ["agent"]
+    assert exchanged.exchanged_refresh_token is not None
+    assert any("2 IdP clients" in message and "client_id=agent" in message for message in caplog.messages)
+
+
+class _FakeCatalog:
+    def __init__(self, config_servers: dict[str, MCPServer]) -> None:
+        self.config_mcp_servers = config_servers
+        self.built: list[tuple[str, bool]] = []
+
+    async def build_mcp_server_from_table(
+        self,
+        mcp_server: LiteLLM_MCPServerTable,
+        *,
+        credentials_are_encrypted: bool = True,
+        env_vars_are_encrypted: bool | None = None,
+        register_oauth_discovery: bool = True,
+    ) -> MCPServer:
+        self.built.append((mcp_server.server_id, register_oauth_discovery))
+        return MCPServer(
+            server_id=mcp_server.server_id, name=mcp_server.server_id, url=mcp_server.url, transport=MCPTransport.http
+        )
+
+
+def _row(server_id: str, auth_type: MCPAuth, approval_status: str | None = None) -> LiteLLM_MCPServerTable:
+    return LiteLLM_MCPServerTable(
+        server_id=server_id,
+        alias=server_id,
+        url=f"https://{server_id}.example.com/mcp",
+        transport=MCPTransport.http,
+        auth_type=auth_type,
+        approval_status=approval_status,
+        created_at=_NOW,
+        updated_at=_NOW,
+    )
+
+
+@pytest.mark.asyncio
+async def test_login_exchange_servers_reads_config_and_db_id_jag_rows_not_the_registry():
+    """A server added on another pod is in the DB before this pod's registry reloads, so the login
+    exchange has to judge against the DB rows, like the retention gate, and only the ID-JAG ones."""
+    config_server = MCPServer(
+        server_id="from-config", name="from-config", url="https://cfg.example.com/mcp", transport=MCPTransport.http
+    )
+    catalog = _FakeCatalog({"from-config": config_server})
+
+    servers = await login_exchange_servers(
+        catalog,
+        [
+            _row("db-id-jag", MCPAuth.oauth2_id_jag),
+            _row("db-id-jag-approved", MCPAuth.oauth2_id_jag, "approved"),
+            _row("db-oauth", MCPAuth.oauth2),
+        ],
+    )
+
+    assert [server.server_id for server in servers] == ["from-config", "db-id-jag", "db-id-jag-approved"]
+    assert catalog.built == [("db-id-jag", False), ("db-id-jag-approved", False)]
+
+
+@pytest.mark.asyncio
+async def test_a_db_row_hides_the_config_server_with_the_same_id_like_the_live_catalog():
+    """The catalog serves ``config_mcp_servers | registry``, so a DB row wins its server_id. The login
+    exchange must mint for that live server, not for the hidden config entry's IdP client."""
+    hidden = MCPServer(
+        server_id="shared", name="shared", url="https://cfg.example.com/mcp", transport=MCPTransport.http
+    )
+    catalog = _FakeCatalog({"shared": hidden})
+
+    servers = await login_exchange_servers(catalog, [_row("shared", MCPAuth.oauth2_id_jag)])
+
+    assert [(server.server_id, server.url) for server in servers] == [("shared", "https://shared.example.com/mcp")]
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("approval_status", ["pending_review", "rejected", "draft"])
+async def test_login_exchange_servers_skip_unapproved_submissions(approval_status: str):
+    """A team key can submit an ID-JAG server naming any token endpoint. Until an admin approves it,
+    no login assertion is posted there."""
+    catalog = _FakeCatalog({})
+
+    servers = await login_exchange_servers(catalog, [_row("submitted", MCPAuth.oauth2_id_jag, approval_status)])
+
+    assert servers == ()
+    assert catalog.built == []
+
+
+class _StalledEndpoint(_Endpoint):
+    """An IdP that accepts the connection and never answers."""
+
+    async def fetch(
+        self, endpoint: str, client_id: str, grant_params: dict[str, str], client_auth: ClientAuth
+    ) -> Result[ExchangedToken, CredError]:
+        await asyncio.sleep(0.5)
+        return await super().fetch(endpoint, client_id, grant_params, client_auth)
+
+
+@pytest.mark.asyncio
+async def test_a_stalled_idp_does_not_hold_up_the_login(caplog: pytest.LogCaptureFixture):
+    """The exchange is optional. A user who only wants the dashboard must not wait on an MCP IdP that
+    stopped answering, so the exchange has its own short deadline and the login keeps the plain assertion."""
+    saml = _saml()
+
+    with caplog.at_level(logging.WARNING, logger="litellm.proxy"):
+        exchanged = await exchange_login_assertion_for_refresh_token(
+            saml,
+            (_config(),),
+            _StalledEndpoint(Ok(ExchangedToken(access_token="rt-1", expires_in=3600))),
+            _NOW,
+            deadline_seconds=0.05,
+        )
+
+    assert exchanged == saml
+    assert any("did not answer the login-time refresh token exchange" in r.getMessage() for r in caplog.records)
+
+
+class _OneBadRowCatalog(_FakeCatalog):
+    async def build_mcp_server_from_table(
+        self,
+        mcp_server: LiteLLM_MCPServerTable,
+        *,
+        credentials_are_encrypted: bool = True,
+        env_vars_are_encrypted: bool | None = None,
+        register_oauth_discovery: bool = True,
+    ) -> MCPServer:
+        if mcp_server.server_id == "broken":
+            raise ValueError("credentials cannot be decrypted")
+        return await super().build_mcp_server_from_table(
+            mcp_server,
+            credentials_are_encrypted=credentials_are_encrypted,
+            env_vars_are_encrypted=env_vars_are_encrypted,
+            register_oauth_discovery=register_oauth_discovery,
+        )
+
+
+@pytest.mark.asyncio
+async def test_one_unbuildable_db_row_does_not_cost_the_other_servers_their_exchange(caplog: pytest.LogCaptureFixture):
+    catalog = _OneBadRowCatalog({})
+
+    with caplog.at_level(logging.WARNING, logger="litellm.proxy"):
+        servers = await login_exchange_servers(
+            catalog, [_row("broken", MCPAuth.oauth2_id_jag), _row("healthy", MCPAuth.oauth2_id_jag)]
+        )
+
+    assert [server.server_id for server in servers] == ["healthy"]
+    assert any("server_id=broken" in r.getMessage() for r in caplog.records)
diff --git a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_resolver.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_resolver.py
index 283d0754940..527475b86a9 100644
--- a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_resolver.py
+++ b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_resolver.py
@@ -32,6 +32,7 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials import (
     Error,
     IdJagConfig,
     IdJagResourceClient,
+    IdJagSubjectSource,
     NoneConfig,
     NoOpAuth,
     Ok,
@@ -55,8 +56,11 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_r
     SSOClientConfig,
 )
 from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+    SAML2_SUBJECT_TOKEN_TYPE,
     AssertionStoreUnavailable,
     SSOIdentityAssertion,
+    assertion_from_saml_login,
+    with_login_refresh_token,
 )
 from litellm.proxy._experimental.mcp_server.outbound_credentials.token_endpoint import (
     ExchangedToken,
@@ -111,6 +115,10 @@ class _FakeAssertionStore:
         self._assertions = dict(assertions or {})
         self.lookups: list[str] = []
 
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+
+        return await self.fetch(user_id)
+
     async def fetch(self, user_id: str) -> SSOIdentityAssertion | None:
         self.lookups.append(user_id)
         return self._assertions.get(user_id)
@@ -539,12 +547,8 @@ async def test_id_jag_runs_both_legs_and_returns_the_leg2_bearer():
     assert leg1_client_id == "litellm"
     assert isinstance(endpoint.auths[0], ClientSecretAuth)
     assert endpoint.auths[0].client_secret.get_secret_value() == "s"
-    assert (
-        leg1_params["grant_type"] == "urn:ietf:params:oauth:grant-type:token-exchange"
-    )
-    assert (
-        leg1_params["requested_token_type"] == "urn:ietf:params:oauth:token-type:id-jag"
-    )
+    assert leg1_params["grant_type"] == "urn:ietf:params:oauth:grant-type:token-exchange"
+    assert leg1_params["requested_token_type"] == "urn:ietf:params:oauth:token-type:id-jag"
     assert leg1_params["subject_token"] == "user-id-token"
 
     leg2_endpoint, leg2_client_id, leg2_params = endpoint.calls[1]
@@ -563,9 +567,7 @@ async def test_id_jag_without_inbound_token_or_stored_assertion_is_precondition_
     endpoint = _FakeTokenEndpoint([])
     store = _FakeAssertionStore()
     provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
-    result = await provider.resolve_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
     assert isinstance(result, Error)
     assert result.error.tag == "precondition_required"
@@ -581,9 +583,7 @@ async def test_id_jag_exchanges_the_stored_sso_assertion_when_the_caller_present
     store = _FakeAssertionStore({"alice": _assertion("alice-id-token")})
     provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
 
-    result = await provider.resolve_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
     assert isinstance(result, Ok)
     assert _emitted(result.ok)["Authorization"] == "Bearer final-access"
@@ -593,6 +593,54 @@ async def test_id_jag_exchanges_the_stored_sso_assertion_when_the_caller_present
     assert leg1_params["requested_token_type"] == "urn:ietf:params:oauth:token-type:id-jag"
 
 
+@pytest.mark.asyncio
+async def test_id_jag_declares_a_stored_saml_assertion_as_a_saml2_subject_token():
+    """A SAML login retains the signed assertion, not an id_token, so leg 1 has to tell the IdP what
+    it is being handed even though the server is configured with the id_token default."""
+    endpoint = _FakeTokenEndpoint(_two_leg_ok("final-access"))
+    saml = assertion_from_saml_login(b"<saml:Assertion/>", int(time.time()) + 300, "https://idp.example.com")
+    store = _FakeAssertionStore({"alice": saml})
+    provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
+
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
+
+    assert isinstance(result, Ok)
+    _, _, leg1_params = endpoint.calls[0]
+    assert leg1_params["subject_token"] == saml.id_token.get_secret_value()
+    assert leg1_params["subject_token_type"] == SAML2_SUBJECT_TOKEN_TYPE
+    assert leg1_params["grant_type"] == "urn:ietf:params:oauth:grant-type:token-exchange"
+    assert leg1_params["requested_token_type"] == "urn:ietf:params:oauth:token-type:id-jag"
+
+
+@pytest.mark.asyncio
+async def test_id_jag_sends_the_configured_type_for_a_stored_oidc_assertion():
+    endpoint = _FakeTokenEndpoint(_two_leg_ok("final-access"))
+    store = _FakeAssertionStore({"alice": _assertion("alice-id-token")})
+    config = _id_jag_config().model_copy(update={"subject_token_type": "urn:ietf:params:oauth:token-type:jwt"})
+    provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
+
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(config))
+
+    assert isinstance(result, Ok)
+    _, _, leg1_params = endpoint.calls[0]
+    assert leg1_params["subject_token_type"] == "urn:ietf:params:oauth:token-type:jwt"
+
+
+@pytest.mark.asyncio
+async def test_id_jag_refuses_a_saml_assertion_past_its_not_on_or_after_without_calling_the_idp():
+    endpoint = _FakeTokenEndpoint([])
+    saml = assertion_from_saml_login(b"<saml:Assertion/>", int(time.time()) - 1, "https://idp.example.com")
+    provider = UpstreamCredentialProvider(
+        token_endpoint=endpoint, sso_assertion_store=_FakeAssertionStore({"alice": saml})
+    )
+
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
+
+    assert isinstance(result, Error)
+    assert result.error.tag == "precondition_required"
+    assert endpoint.calls == []
+
+
 @pytest.mark.asyncio
 async def test_id_jag_prefers_the_callers_own_token_over_the_stored_assertion():
     endpoint = _FakeTokenEndpoint(_two_leg_ok("final-access"))
@@ -613,9 +661,7 @@ async def test_id_jag_refuses_an_expired_stored_assertion_without_calling_the_id
     store = _FakeAssertionStore({"alice": _assertion("stale-id-token", expires_in=-timedelta(seconds=1))})
     provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
 
-    result = await provider.resolve_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
     assert isinstance(result, Error)
     assert result.error.tag == "precondition_required"
@@ -646,6 +692,9 @@ async def test_id_jag_renews_an_expired_stored_assertion_instead_of_challenging(
         rows[user_id] = assertion
 
     class _Inner:
+        async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+            return await self.fetch(user_id)
+
         async def fetch(self, user_id: str) -> SSOIdentityAssertion | None:
             return await _read(user_id)
 
@@ -672,9 +721,7 @@ async def test_id_jag_renews_an_expired_stored_assertion_instead_of_challenging(
         ),
     )
 
-    result = await provider.resolve_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
     assert isinstance(result, Ok)
     _, _, leg1_params = endpoint.calls[0]
@@ -686,7 +733,7 @@ def test_the_resolver_defaults_to_the_renewing_assertion_store():
     the plain database reader would strand every agent an id_token lifetime after its user's login."""
     provider = UpstreamCredentialProvider()
 
-    assert isinstance(provider._sso_assertion_store, RefreshingSSOAssertionStore)  # noqa: SLF001  # the wiring is the assertion
+    assert isinstance(provider._sso_assertion_store, RefreshingSSOAssertionStore)  # the wiring is the assertion
 
 
 @pytest.mark.asyncio
@@ -695,9 +742,7 @@ async def test_id_jag_accepts_a_stored_assertion_that_declares_no_expiry():
     store = _FakeAssertionStore({"alice": _assertion("undated-id-token", expires_in=None)})
     provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
 
-    result = await provider.resolve_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
     assert isinstance(result, Ok)
     _, _, leg1_params = endpoint.calls[0]
@@ -730,14 +775,10 @@ async def test_id_jag_keeps_store_sourced_bearers_partitioned_per_user():
             Ok(ExchangedToken(access_token="bob-bearer", expires_in=3600)),
         ]
     )
-    store = _FakeAssertionStore(
-        {"alice": _assertion("alice-id-token"), "bob": _assertion("bob-id-token")}
-    )
+    store = _FakeAssertionStore({"alice": _assertion("alice-id-token"), "bob": _assertion("bob-id-token")})
     provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
 
-    alice = await provider.resolve_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    alice = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
     bob = await provider.resolve_credentials(Subject(tenant_id="", subject_id="bob"), _spec(_id_jag_config()))
 
     assert isinstance(alice, Ok) and isinstance(bob, Ok)
@@ -754,6 +795,10 @@ class _OutageAssertionStore:
     def __init__(self) -> None:
         self.lookups: list[str] = []
 
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+
+        return await self.fetch(user_id)
+
     async def fetch(self, user_id: str) -> SSOIdentityAssertion | None:
         self.lookups.append(user_id)
         raise AssertionStoreUnavailable(_DRIVER_DETAIL)
@@ -766,9 +811,7 @@ async def test_id_jag_maps_an_assertion_store_outage_to_upstream_unavailable():
     endpoint = _FakeTokenEndpoint([])
     provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=_OutageAssertionStore())
 
-    result = await provider.resolve_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
     assert isinstance(result, Error)
     assert result.error.tag == "upstream_unavailable"
@@ -784,9 +827,7 @@ async def test_id_jag_store_outage_does_not_leak_driver_detail_to_the_caller(cap
     )
 
     with caplog.at_level(logging.WARNING):
-        result = await provider.resolve_credentials(
-            Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-        )
+        result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
     assert isinstance(result, Error)
     assert _DRIVER_DETAIL not in result.error.summary
@@ -803,9 +844,7 @@ async def test_id_jag_invalidation_survives_an_assertion_store_outage():
         token_endpoint=_FakeTokenEndpoint([]), sso_assertion_store=_OutageAssertionStore()
     )
 
-    await provider.invalidate_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    await provider.invalidate_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
 
 class _FlakyAssertionStore:
@@ -815,6 +854,10 @@ class _FlakyAssertionStore:
         self._assertion = assertion
         self.down = False
 
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+
+        return await self.fetch(user_id)
+
     async def fetch(self, user_id: str) -> SSOIdentityAssertion | None:
         if self.down:
             raise AssertionStoreUnavailable("connection refused")
@@ -855,6 +898,10 @@ class _SwitchableAssertionStore:
     def __init__(self, id_token: str) -> None:
         self.id_token = id_token
 
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+
+        return await self.fetch(user_id)
+
     async def fetch(self, user_id: str) -> SSOIdentityAssertion | None:
         return _assertion(self.id_token)
 
@@ -899,6 +946,10 @@ class _SequentialAssertionStore:
         self.issued: list[str] = []
         self._n = 0
 
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+
+        return await self.fetch(user_id)
+
     async def fetch(self, user_id: str) -> SSOIdentityAssertion | None:
         await asyncio.sleep(0)
         if self.pinned is not None:
@@ -996,14 +1047,10 @@ async def test_id_jag_reads_a_naive_stored_expiry_as_utc():
     comparison would be a TypeError on the egress path, turning a 412 into a 500."""
     endpoint = _FakeTokenEndpoint([])
     naive_past = datetime.now(timezone.utc).replace(tzinfo=None) - timedelta(hours=1)
-    store = _FakeAssertionStore(
-        {"alice": SSOIdentityAssertion(id_token=SecretStr("stale"), expires_at=naive_past)}
-    )
+    store = _FakeAssertionStore({"alice": SSOIdentityAssertion(id_token=SecretStr("stale"), expires_at=naive_past)})
     provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
 
-    result = await provider.resolve_credentials(
-        Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(Subject(tenant_id="", subject_id="alice"), _spec(_id_jag_config()))
 
     assert isinstance(result, Error)
     assert result.error.tag == "precondition_required"
@@ -1032,13 +1079,9 @@ async def test_invalidate_evicts_a_store_sourced_id_jag_bearer():
 
 @pytest.mark.asyncio
 async def test_id_jag_propagates_a_leg1_error_without_calling_leg2():
-    endpoint = _FakeTokenEndpoint(
-        [Error(CredError.of_upstream_unavailable("leg1 down"))]
-    )
+    endpoint = _FakeTokenEndpoint([Error(CredError.of_upstream_unavailable("leg1 down"))])
     provider = UpstreamCredentialProvider(token_endpoint=endpoint)
-    result = await provider.resolve_credentials(
-        _with_inbound("user-id-token"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(_with_inbound("user-id-token"), _spec(_id_jag_config()))
 
     assert isinstance(result, Error)
     assert result.error.tag == "upstream_unavailable"
@@ -1055,9 +1098,7 @@ async def test_id_jag_propagates_a_leg2_error():
         ]
     )
     provider = UpstreamCredentialProvider(token_endpoint=endpoint)
-    result = await provider.resolve_credentials(
-        _with_inbound("user-id-token"), _spec(_id_jag_config())
-    )
+    result = await provider.resolve_credentials(_with_inbound("user-id-token"), _spec(_id_jag_config()))
 
     assert isinstance(result, Error)
     assert result.error.tag == "upstream_unavailable"
@@ -1065,7 +1106,7 @@ async def test_id_jag_propagates_a_leg2_error():
     assert len(endpoint.calls) == 2
 
 
-def _two_leg_ok(bearer: str) -> list:
+def _two_leg_ok(bearer: str) -> list[Result[ExchangedToken, CredError]]:
     return [
         Ok(ExchangedToken(access_token="the-id-jag", expires_in=300)),
         Ok(ExchangedToken(access_token=bearer, expires_in=3600)),
@@ -1256,8 +1297,18 @@ async def test_passthrough_ignores_the_carrier_and_keeps_the_callers_slot():
         (NoneConfig(), _SUBJECT, "no-auth", None),
         (PassthroughConfig(), _SUBJECT, "no-auth", None),
         (PassthroughConfig(), _with_inbound("Bearer caller-token"), "oauth2-passthrough", "Bearer caller-token"),
-        (ApiKeyConfig(key_source=SharedKey(value=SecretStr("static-key"))), _SUBJECT, "static-token", "Bearer static-key"),
-        (AuthorizationCodeConfig(), Subject(tenant_id="", subject_id="alice"), "stored-user-token", "Bearer stored-alice"),
+        (
+            ApiKeyConfig(key_source=SharedKey(value=SecretStr("static-key"))),
+            _SUBJECT,
+            "static-token",
+            "Bearer static-key",
+        ),
+        (
+            AuthorizationCodeConfig(),
+            Subject(tenant_id="", subject_id="alice"),
+            "stored-user-token",
+            "Bearer stored-alice",
+        ),
     ],
 )
 async def test_resolved_source_matches_the_credential_sent_upstream(
@@ -1279,7 +1330,9 @@ async def test_resolved_source_matches_the_credential_sent_upstream(
 async def test_resolved_source_preserves_missing_user_token_error() -> None:
     from litellm.proxy._experimental.mcp_server.outbound_credentials.resolver import resolve_credentials_with_source
 
-    result = await resolve_credentials_with_source(UpstreamCredentialProvider(), _SUBJECT, _spec(AuthorizationCodeConfig()))
+    result = await resolve_credentials_with_source(
+        UpstreamCredentialProvider(), _SUBJECT, _spec(AuthorizationCodeConfig())
+    )
     assert isinstance(result, Error)
     assert result.error.tag == "unauthorized"
 
@@ -1289,7 +1342,9 @@ async def test_minted_token_sources_match_egress_and_do_not_fetch_twice() -> Non
     from litellm.proxy._experimental.mcp_server.outbound_credentials.resolver import resolve_credentials_with_source
 
     source = _FakeM2MSource(Ok(OAuthToken(access_token="m2m-at")))
-    m2m = await resolve_credentials_with_source(UpstreamCredentialProvider(client_credentials_source=source), _SUBJECT, _spec(_M2M))
+    m2m = await resolve_credentials_with_source(
+        UpstreamCredentialProvider(client_credentials_source=source), _SUBJECT, _spec(_M2M)
+    )
     assert isinstance(m2m, Ok)
     headers, _ = await _emitted_async(m2m.ok.auth)
     assert headers["Authorization"] == "Bearer m2m-at"
@@ -1297,7 +1352,9 @@ async def test_minted_token_sources_match_egress_and_do_not_fetch_twice() -> Non
     assert source.gets == ["s"]
 
     exchanger = _FakeExchanger(Ok(OAuthToken(access_token="exchanged-at")))
-    exchanged = await resolve_credentials_with_source(UpstreamCredentialProvider(token_exchanger=exchanger), _with_inbound("subject"), _spec(_OBO))
+    exchanged = await resolve_credentials_with_source(
+        UpstreamCredentialProvider(token_exchanger=exchanger), _with_inbound("subject"), _spec(_OBO)
+    )
     assert isinstance(exchanged, Ok)
     assert _emitted(exchanged.ok.auth)["Authorization"] == "Bearer exchanged-at"
     assert exchanged.ok.source.value == "token-exchange"
@@ -1321,9 +1378,14 @@ async def test_id_jag_source_describes_final_token_after_both_exchanges() -> Non
 async def test_client_credentials_subscription_identity_preserves_resolved_grant_scopes():
     async def resolve(token):
         source = _FakeM2MSource(Ok(token))
-        result = await UpstreamCredentialProvider(client_credentials_source=source).resolve_credentials(_SUBJECT, _spec(_M2M))
+        result = await UpstreamCredentialProvider(client_credentials_source=source).resolve_credentials(
+            _SUBJECT, _spec(_M2M)
+        )
         assert isinstance(result, Ok)
-        from litellm.proxy._experimental.mcp_server.outbound_credentials.client_credentials import ClientCredentialsBearerAuth
+        from litellm.proxy._experimental.mcp_server.outbound_credentials.client_credentials import (
+            ClientCredentialsBearerAuth,
+        )
+
         assert isinstance(result.ok, ClientCredentialsBearerAuth)
         return result.ok.subscription_identity
 
@@ -1333,3 +1395,175 @@ async def test_client_credentials_subscription_identity_preserves_resolved_grant
     assert original is not None
     assert original == renewed
     assert original != reduced
+
+
+def _login_with_refresh_token(expires_in: int | None) -> SSOIdentityAssertion:
+    saml = assertion_from_saml_login(b"<saml:Assertion/>", int(time.time()) + 300, "https://idp.example.com")
+    return with_login_refresh_token(
+        saml,
+        "rt-from-login",
+        expires_in,
+        datetime.now(timezone.utc),
+        endpoint="https://idp.example.com/token",
+        client_id="litellm",
+    )
+
+
+def _refresh_token_source_config() -> IdJagConfig:
+    return _id_jag_config().model_copy(update={"subject_source": IdJagSubjectSource.refresh_token})
+
+
+@pytest.mark.asyncio
+async def test_id_jag_presents_the_login_refresh_token_when_the_server_asks_for_it():
+    """``id_jag_subject_source: refresh_token`` presents the refresh token the login assertion was
+    exchanged for, typed as one, never the SAML assertion itself."""
+    endpoint = _FakeTokenEndpoint(_two_leg_ok("final-access"))
+    store = _FakeAssertionStore({"alice": _login_with_refresh_token(3600)})
+    provider = UpstreamCredentialProvider(token_endpoint=endpoint, sso_assertion_store=store)
+
+    result = await provider.resolve_credentials(
+        Subject(tenant_id="", subject_id="alice"), _spec(_refresh_token_source_config())
+    )
+
+    assert isinstance(result, Ok)
+    _, _, leg1_params = endpoint.calls[0]
+    assert leg1_params["subject_token"] == "rt-from-login"
+    assert leg1_params["subject_token_type"] == "urn:ietf:params:oauth:token-type:refresh_token"
+    assert leg1_params["requested_token_type"] == "urn:ietf:params:oauth:token-type:id-jag"
+
+
+@pytest.mark.asyncio
+async def test_id_jag_refresh_token_source_never_presents_the_sso_refresh_token():
+    """An OIDC login holds a refresh token for the SSO client. Only the token the ID-JAG client
+    exchanged at login is presented, the SSO one cannot be redeemed there."""
+    endpoint = _FakeTokenEndpoint(_two_leg_ok("final-access"))
+    oidc = SSOIdentityAssertion(id_token=SecretStr("id-token"), refresh_token=SecretStr("sso-rt"))
+    row = with_login_refresh_token(
+        oidc,
+        "rt-from-login",
+        3600,
+        datetime.now(timezone.utc),
+        endpoint="https://idp.example.com/token",
+        client_id="litellm",
+    )
+    provider = UpstreamCredentialProvider(
+        token_endpoint=endpoint, sso_assertion_store=_FakeAssertionStore({"alice": row})
+    )
+
+    result = await provider.resolve_credentials(
+        Subject(tenant_id="", subject_id="alice"), _spec(_refresh_token_source_config())
+    )
+
+    assert isinstance(result, Ok)
+    assert endpoint.calls[0][2]["subject_token"] == "rt-from-login"
+
+
+@pytest.mark.asyncio
+async def test_id_jag_refresh_token_source_refuses_a_token_minted_for_another_idp_client():
+    """A refresh token is bound to the client that received it. One minted for another server's IdP
+    client is never posted to this server's endpoint, the user is told to sign in again instead."""
+    endpoint = _FakeTokenEndpoint(_two_leg_ok("final-access"))
+    row = with_login_refresh_token(
+        _login_with_refresh_token(3600),
+        "rt-for-other",
+        3600,
+        datetime.now(timezone.utc),
+        endpoint="https://other-idp.example.com/token",
+        client_id="other-agent",
+    )
+    provider = UpstreamCredentialProvider(
+        token_endpoint=endpoint, sso_assertion_store=_FakeAssertionStore({"alice": row})
+    )
+
+    result = await provider.resolve_credentials(
+        Subject(tenant_id="", subject_id="alice"), _spec(_refresh_token_source_config())
+    )
+
+    assert isinstance(result, Error)
+    assert result.error.tag == "precondition_required"
+    assert "different IdP client" in str(result.error)
+    assert endpoint.calls == []
+
+
+class _RenewalFailsStore(_FakeAssertionStore):
+    """An SSO renewal that is timing out: ``fetch`` raises the way RefreshingSSOAssertionStore does,
+    while the row itself is still readable."""
+
+    async def fetch_stored(self, user_id: str) -> SSOIdentityAssertion | None:
+        return self._assertions.get(user_id)
+
+    async def fetch(self, user_id: str) -> SSOIdentityAssertion | None:
+        raise AssertionStoreUnavailable("IdP token endpoint timed out")
+
+
+@pytest.mark.asyncio
+async def test_id_jag_refresh_token_source_does_not_wait_on_an_sso_renewal():
+    """The exchanged refresh token has its own lifetime. A failing renewal of the unrelated SSO
+    id_token must not turn into a 503 for a server that never presents that id_token."""
+    endpoint = _FakeTokenEndpoint(_two_leg_ok("final-access"))
+    provider = UpstreamCredentialProvider(
+        token_endpoint=endpoint, sso_assertion_store=_RenewalFailsStore({"alice": _login_with_refresh_token(3600)})
+    )
+
+    result = await provider.resolve_credentials(
+        Subject(tenant_id="", subject_id="alice"), _spec(_refresh_token_source_config())
+    )
+
+    assert isinstance(result, Ok)
+    assert endpoint.calls[0][2]["subject_token"] == "rt-from-login"
+
+
+@pytest.mark.asyncio
+async def test_id_jag_refresh_token_source_outlives_the_saml_assertion():
+    """The SAML assertion is spent minutes after login; the refresh token it bought is what counts."""
+    endpoint = _FakeTokenEndpoint(_two_leg_ok("final-access"))
+    expired_saml = assertion_from_saml_login(b"<saml:Assertion/>", int(time.time()) - 60, "https://idp.example.com")
+    row = with_login_refresh_token(
+        expired_saml,
+        "rt-from-login",
+        3600,
+        datetime.now(timezone.utc),
+        endpoint="https://idp.example.com/token",
+        client_id="litellm",
+    )
+    provider = UpstreamCredentialProvider(
+        token_endpoint=endpoint, sso_assertion_store=_FakeAssertionStore({"alice": row})
+    )
+
+    result = await provider.resolve_credentials(
+        Subject(tenant_id="", subject_id="alice"), _spec(_refresh_token_source_config())
+    )
+
+    assert isinstance(result, Ok)
+    assert endpoint.calls[0][2]["subject_token"] == "rt-from-login"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("row", "expected"),
+    [
+        (
+            assertion_from_saml_login(b"<saml:Assertion/>", int(time.time()) + 300, "https://idp.example.com"),
+            "none is stored",
+        ),
+        (_login_with_refresh_token(-1), "has expired"),
+    ],
+    ids=["no refresh token", "expired refresh token"],
+)
+async def test_id_jag_refresh_token_source_is_a_precondition_without_a_live_refresh_token(
+    row: SSOIdentityAssertion, expected: str
+):
+    endpoint = _FakeTokenEndpoint([])
+    provider = UpstreamCredentialProvider(
+        token_endpoint=endpoint, sso_assertion_store=_FakeAssertionStore({"alice": row})
+    )
+
+    result = await provider.resolve_credentials(
+        Subject(tenant_id="", subject_id="alice"), _spec(_refresh_token_source_config())
+    )
+
+    assert isinstance(result, Error)
+    assert result.error.tag == "precondition_required"
+    assert expected in result.error.summary
+    assert "Sign in through LiteLLM SSO" in result.error.summary
+    assert endpoint.calls == []
diff --git a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_refresher.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_refresher.py
index d80913f8d33..53d0d82a7f2 100644
--- a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_refresher.py
+++ b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_refresher.py
@@ -35,8 +35,10 @@ from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_r
     sso_client_config,
 )
 from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+    with_login_refresh_token,
     AssertionStoreUnavailable,
     SSOIdentityAssertion,
+    assertion_from_saml_login,
 )
 
 SIGNING_KEY = "test-idp-signing-key-32-bytes-long-xxxx"
@@ -318,6 +320,53 @@ async def test_a_missing_refresh_token_names_the_scope_the_operator_has_to_set(c
     assert "offline_access" in caplog.text
 
 
+@pytest.mark.asyncio
+async def test_an_expired_saml_assertion_is_never_redeemed_and_names_the_re_login(caplog: pytest.LogCaptureFixture):
+    """SAML has no refresh grant. Even a row that somehow carries a refresh token must not be posted
+    to the generic OIDC client, and the operator hint about GENERIC_SCOPE does not apply."""
+    saml = assertion_from_saml_login(b"<saml:Assertion/>", int(time.time()) - 1, "https://idp.example.com")
+    with_refresh_token = saml.model_copy(update={"refresh_token": SecretStr("rt_saml")})
+    rows = _FakeRows({"alice": with_refresh_token})
+    transport = _FakeTransport(_renewal(_id_token()))
+
+    served = await _store(rows, transport).fetch("alice")
+    refresher = SSOAssertionRefresher(transport, client_config=lambda: _CLIENT, read=rows.fetch, write=rows.write)
+    with caplog.at_level(logging.WARNING):
+        outcome = await refresher.refresh("alice", with_refresh_token)
+
+    assert served == with_refresh_token
+    assert transport.calls == []
+    assert rows.writes == []
+    match outcome:
+        case Error(failure):
+            assert failure.kind == "rejected"
+            assert "sign in" in failure.detail
+        case Ok(_):
+            pytest.fail("a SAML assertion must not be renewable")
+    assert "sign in" in caplog.text
+    assert "GENERIC_SCOPE" not in caplog.text
+
+
+class _ForbiddenCoordinator:
+    async def run(self, user_id: str, key: str, *, refresh: object, reread: object) -> None:
+        raise AssertionError(f"a SAML assertion must never enter the refresh path (user_id={user_id}, key={key})")
+
+
+@pytest.mark.asyncio
+async def test_a_saml_assertion_inside_the_expiry_skew_is_served_as_is_without_electing_a_renewal():
+    """SAML cannot be renewed, so a still-valid assertion near its NotOnOrAfter is handed out untouched
+    instead of running the single-flight election that would 503 the losers."""
+    saml = assertion_from_saml_login(b"<saml:Assertion/>", int(time.time()) + 30, "https://idp.example.com")
+    rows = _FakeRows({"alice": saml})
+    transport = _FakeTransport(_renewal(_id_token()))
+
+    served = await _store(rows, transport, coordinator_factory=_ForbiddenCoordinator).fetch("alice")
+
+    assert served == saml
+    assert transport.calls == []
+    assert rows.writes == []
+
+
 @pytest.mark.asyncio
 async def test_an_unconfigured_sso_client_never_calls_the_idp(caplog):
     rows = _FakeRows({"alice": _stored(_id_token(exp_offset=-1), expires_in=-1)})
@@ -694,6 +743,9 @@ async def test_the_in_process_coordinator_is_retried_until_redis_appears():
         {"GENERIC_TOKEN_ENDPOINT": TOKEN_ENDPOINT, "GENERIC_CLIENT_SECRET": "s"},
         {"GENERIC_TOKEN_ENDPOINT": TOKEN_ENDPOINT, "GENERIC_CLIENT_ID": "litellm"},
         {"GENERIC_TOKEN_ENDPOINT": "", "GENERIC_CLIENT_ID": "litellm", "GENERIC_CLIENT_SECRET": "s"},
+        {"GOOGLE_CLIENT_ID": "google-cid"},
+        {"MICROSOFT_CLIENT_ID": "ms-cid", "MICROSOFT_CLIENT_SECRET": "s"},
+        {"MICROSOFT_CLIENT_ID": "ms-cid", "MICROSOFT_TENANT": "tenant"},
     ],
 )
 def test_a_partial_sso_client_is_no_client(env):
@@ -717,6 +769,64 @@ def test_the_configured_sso_client_is_the_one_the_login_used():
     assert config.client_secret.get_secret_value() == "s3cret"
 
 
+def test_a_google_login_is_renewed_at_googles_token_endpoint_as_the_google_client():
+    """fastapi-sso's Google login redeems the code at Google's token endpoint with HTTP Basic, so
+    that is where and how the refresh token it handed back is redeemed."""
+    config = sso_client_config({"GOOGLE_CLIENT_ID": "google-cid", "GOOGLE_CLIENT_SECRET": "google-secret"})
+
+    assert config is not None
+    assert config.token_endpoint == "https://oauth2.googleapis.com/token"
+    assert config.client_id == "google-cid"
+    assert config.client_secret.get_secret_value() == "google-secret"
+    assert config.auth_method == "client_secret_basic"
+
+
+def test_a_microsoft_login_is_renewed_at_the_tenant_token_endpoint_as_the_microsoft_client():
+    config = sso_client_config(
+        {"MICROSOFT_CLIENT_ID": "ms-cid", "MICROSOFT_CLIENT_SECRET": "ms-secret", "MICROSOFT_TENANT": "tenant-123"}
+    )
+
+    assert config is not None
+    assert config.token_endpoint == "https://login.microsoftonline.com/tenant-123/oauth2/v2.0/token"
+    assert config.client_id == "ms-cid"
+    assert config.client_secret.get_secret_value() == "ms-secret"
+    assert config.auth_method == "client_secret_basic"
+
+
+def test_a_custom_microsoft_token_endpoint_wins_over_the_tenant_template():
+    """``MICROSOFT_TOKEN_ENDPOINT`` is what the Microsoft login itself honours for sovereign
+    clouds, so the renewal has to go to the same place."""
+    config = sso_client_config(
+        {
+            "MICROSOFT_CLIENT_ID": "ms-cid",
+            "MICROSOFT_CLIENT_SECRET": "ms-secret",
+            "MICROSOFT_TENANT": "tenant-123",
+            "MICROSOFT_TOKEN_ENDPOINT": "https://login.microsoftonline.us/tenant-123/oauth2/v2.0/token",
+        }
+    )
+
+    assert config is not None
+    assert config.token_endpoint == "https://login.microsoftonline.us/tenant-123/oauth2/v2.0/token"
+
+
+def test_the_client_follows_the_login_callbacks_provider_order():
+    """A deployment carrying a Google and a generic client signs users in through Google, so the
+    stored refresh token belongs to the Google client and only that client can redeem it."""
+    config = sso_client_config(
+        {
+            "GOOGLE_CLIENT_ID": "google-cid",
+            "GOOGLE_CLIENT_SECRET": "google-secret",
+            "GENERIC_TOKEN_ENDPOINT": TOKEN_ENDPOINT,
+            "GENERIC_CLIENT_ID": "litellm",
+            "GENERIC_CLIENT_SECRET": "s3cret",
+        }
+    )
+
+    assert config is not None
+    assert config.client_id == "google-cid"
+    assert config.token_endpoint == "https://oauth2.googleapis.com/token"
+
+
 def test_the_live_store_renews_over_the_database_reader():
     """The composition root has to produce a renewing store, or none of this runs in production."""
     assert isinstance(default_sso_assertion_store(), RefreshingSSOAssertionStore)
@@ -792,3 +902,43 @@ async def test_a_successful_grant_is_handed_back_as_the_parsed_body():
 
     assert isinstance(outcome, Ok)
     assert outcome.ok["id_token"] == "idt"
+
+
+@pytest.mark.asyncio
+async def test_a_renewal_keeps_the_refresh_token_exchanged_at_login_in_the_stored_row():
+    """Renewal replaces the id_token and the SSO refresh token. The refresh token the ID-JAG client
+    exchanged at login is unrelated to either and must still be in the row the next MCP call reads."""
+    stale, fresh = _id_token(exp_offset=-1), _id_token()
+    row = with_login_refresh_token(
+        _stored(stale, expires_in=-1),
+        "rt-from-login",
+        3600,
+        datetime.now(timezone.utc),
+        endpoint="https://idp.example.com/token",
+        client_id="agent",
+    )
+    rows = _FakeRows({"alice": row})
+
+    served = await _store(rows, _FakeTransport(_renewal(fresh, "rt_2"))).fetch("alice")
+
+    stored = rows.rows["alice"]
+    assert stored.id_token.get_secret_value() == fresh
+    assert stored.refresh_token is not None and stored.refresh_token.get_secret_value() == "rt_2"
+    assert stored.exchanged_refresh_token is not None
+    assert stored.exchanged_refresh_token.get_secret_value() == "rt-from-login"
+    assert stored.exchanged_refresh_token_client_id == "agent"
+    assert served is not None and served.exchanged_refresh_token is not None
+
+
+@pytest.mark.asyncio
+async def test_fetch_stored_hands_back_the_row_without_renewing_it():
+    """The read a refresh-token server uses: the row as stored, no IdP round trip even when the SSO
+    id_token is about to expire."""
+    rows = _FakeRows({"alice": _stored(_id_token(exp_offset=-1), expires_in=-1)})
+    transport = _FakeTransport(_renewal(_id_token()))
+
+    served = await _store(rows, transport).fetch_stored("alice")
+
+    assert served is not None
+    assert served.id_token.get_secret_value() == rows.rows["alice"].id_token.get_secret_value()
+    assert transport.calls == []
diff --git a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_store.py b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_store.py
index 088b232f3b6..af62594e3b8 100644
--- a/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_store.py
+++ b/tests/unit/proxy/_experimental/mcp_server/outbound_credentials/test_sso_assertion_store.py
@@ -8,9 +8,11 @@ rotation re-encrypts stored rows like the sibling per-user credential tables.
 """
 
 import asyncio
+import base64
 import json
 import os
 import time
+from datetime import datetime, timedelta, timezone
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import jwt as pyjwt
@@ -18,15 +20,20 @@ import pytest
 
 from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
     _ASSERTION_CACHE,
+    SAML2_SUBJECT_TOKEN_TYPE,
     AssertionStoreUnavailable,
     DbSSOAssertionStore,
     SSOAssertionCache,
+    assertion_from_saml_login,
     assertion_from_sso_login,
+    carry_exchanged_refresh_token,
     ema_assertion_retention_enabled,
     fetch_sso_identity_assertion,
+    login_refresh_token_expired,
     persist_sso_identity_assertion,
     retain_sso_identity_assertion_for_ema,
     rotate_sso_identity_assertions_master_key,
+    with_login_refresh_token,
 )
 from litellm.proxy.common_utils.encrypt_decrypt_utils import decrypt_value_helper, encrypt_value_helper
 from litellm.types.mcp import MCPAuth
@@ -111,6 +118,41 @@ def test_assertion_from_sso_login_happy_path():
     assert assertion.expires_at.timestamp() == pytest.approx(time.time() + 3600, abs=5)
 
 
+SAML_ASSERTION_XML = (
+    b'<saml:Assertion xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" ID="_a1" Version="2.0">'
+    b"<saml:Issuer>https://idp.example.com/metadata</saml:Issuer></saml:Assertion>"
+)
+
+
+def _saml_subject_bytes(encoded: str) -> bytes:
+    assert set(encoded) <= set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"), encoded[:40]
+    return base64.urlsafe_b64decode(encoded + "=" * (-len(encoded) % 4))
+
+
+def test_assertion_from_saml_login_carries_the_base64url_assertion_as_a_saml2_subject_token():
+    not_on_or_after = int(time.time()) + 300
+    assertion = assertion_from_saml_login(SAML_ASSERTION_XML, not_on_or_after, "https://idp.example.com/metadata")
+    assert _saml_subject_bytes(assertion.id_token.get_secret_value()) == SAML_ASSERTION_XML
+    assert assertion.subject_token_type == SAML2_SUBJECT_TOKEN_TYPE
+    assert assertion.refresh_token is None
+    assert assertion.issuer == "https://idp.example.com/metadata"
+    assert assertion.expires_at is not None
+    assert assertion.expires_at.tzinfo is not None
+    assert assertion.expires_at.timestamp() == not_on_or_after
+
+
+def test_assertion_from_saml_login_without_not_on_or_after_has_no_expiry():
+    assertion = assertion_from_saml_login(SAML_ASSERTION_XML, None, None)
+    assert assertion.expires_at is None
+    assert assertion.subject_token_type == SAML2_SUBJECT_TOKEN_TYPE
+
+
+def test_oidc_login_assertion_leaves_the_subject_token_type_to_the_operator():
+    assertion = assertion_from_sso_login(_make_id_token(), None)
+    assert assertion is not None
+    assert assertion.subject_token_type is None
+
+
 def test_assertion_repr_never_leaks_token_material():
     token = _make_id_token()
     assertion = assertion_from_sso_login(token, "rt_secret_value")
@@ -226,6 +268,37 @@ async def test_persist_and_fetch_round_trip_encrypted_at_rest():
     assert json.loads(decrypted)["id_token"] == token
 
 
+@pytest.mark.asyncio
+async def test_saml_assertion_round_trips_with_its_subject_token_type():
+    stored: dict[str, str] = {}
+    prisma = _make_prisma(stored)
+    assertion = assertion_from_saml_login(SAML_ASSERTION_XML, int(time.time()) + 300, "https://idp.example.com")
+    with patch("litellm.proxy.proxy_server.prisma_client", prisma):
+        await persist_sso_identity_assertion("user-saml", assertion)
+        fetched = await fetch_sso_identity_assertion("user-saml")
+    assert fetched is not None
+    assert fetched.subject_token_type == SAML2_SUBJECT_TOKEN_TYPE
+    assert _saml_subject_bytes(fetched.id_token.get_secret_value()) == SAML_ASSERTION_XML
+    assert fetched.expires_at == assertion.expires_at
+    assert fetched.refresh_token is None
+    assert SAML_ASSERTION_XML.decode() not in stored["user-saml"]
+
+
+@pytest.mark.asyncio
+async def test_oidc_row_written_before_subject_token_types_reads_back_without_one():
+    stored: dict[str, str] = {}
+    prisma = _make_prisma(stored)
+    token = _make_id_token()
+    with patch("litellm.proxy.proxy_server.prisma_client", prisma):
+        await persist_sso_identity_assertion("user-a", assertion_from_sso_login(token, None))
+        fetched = await fetch_sso_identity_assertion("user-a")
+    assert fetched is not None
+    assert fetched.subject_token_type is None
+    decrypted = decrypt_value_helper(stored["user-a"], "test", exception_type="debug")
+    assert decrypted is not None
+    assert "subject_token_type" not in json.loads(decrypted)
+
+
 @pytest.mark.asyncio
 async def test_persist_overwrites_previous_login():
     stored = {}
@@ -248,7 +321,9 @@ async def test_fetch_serves_second_read_from_cache_without_db_read():
     cache = SSOAssertionCache()
     token = _make_id_token()
     assertion = assertion_from_sso_login(token, "rt_1")
-    with patch("litellm.proxy.proxy_server.prisma_client", prisma):  # test-quality-ok: fake DB seam has no injection boundary
+    with patch(
+        "litellm.proxy.proxy_server.prisma_client", prisma
+    ):  # test-quality-ok: fake DB seam has no injection boundary
         await persist_sso_identity_assertion("user-a", assertion, cache=cache)
         first = await fetch_sso_identity_assertion("user-a", cache=cache)
         second = await fetch_sso_identity_assertion("user-a", cache=cache)
@@ -266,7 +341,9 @@ async def test_persist_busts_cache_so_relogin_is_visible_immediately():
     cache = SSOAssertionCache()
     first_token = _make_id_token(exp_offset=100)
     second_token = _make_id_token(exp_offset=7200)
-    with patch("litellm.proxy.proxy_server.prisma_client", prisma):  # test-quality-ok: fake DB seam has no injection boundary
+    with patch(
+        "litellm.proxy.proxy_server.prisma_client", prisma
+    ):  # test-quality-ok: fake DB seam has no injection boundary
         await persist_sso_identity_assertion("user-a", assertion_from_sso_login(first_token, None), cache=cache)
         first = await fetch_sso_identity_assertion("user-a", cache=cache)
         await persist_sso_identity_assertion("user-a", assertion_from_sso_login(second_token, "rt_new"), cache=cache)
@@ -295,7 +372,9 @@ async def test_fetch_racing_a_relogin_does_not_cache_the_previous_assertion():
         return row
 
     prisma.db.litellm_ssoidentityassertion.find_unique = _paused_find_unique
-    with patch("litellm.proxy.proxy_server.prisma_client", prisma):  # test-quality-ok: fake DB seam has no injection boundary
+    with patch(
+        "litellm.proxy.proxy_server.prisma_client", prisma
+    ):  # test-quality-ok: fake DB seam has no injection boundary
         await persist_sso_identity_assertion("user-a", assertion_from_sso_login(first_token, None), cache=cache)
         racing_fetch = asyncio.create_task(fetch_sso_identity_assertion("user-a", cache=cache))
         await db_read_started.wait()
@@ -324,7 +403,9 @@ async def test_fetch_missing_row_returns_none():
 async def test_fetch_does_not_cache_a_missing_row():
     prisma = _make_prisma({})
     cache = SSOAssertionCache()
-    with patch("litellm.proxy.proxy_server.prisma_client", prisma):  # test-quality-ok: fake DB seam has no injection boundary
+    with patch(
+        "litellm.proxy.proxy_server.prisma_client", prisma
+    ):  # test-quality-ok: fake DB seam has no injection boundary
         first = await fetch_sso_identity_assertion("nobody", cache=cache)
         second = await fetch_sso_identity_assertion("nobody", cache=cache)
     assert first is None
@@ -353,7 +434,9 @@ async def test_cached_assertion_expires_after_ttl():
     cache = SSOAssertionCache(ttl_seconds=1)
     first_token = _make_id_token(exp_offset=100)
     second_token = _make_id_token(exp_offset=7200)
-    with patch("litellm.proxy.proxy_server.prisma_client", prisma):  # test-quality-ok: fake DB seam has no injection boundary
+    with patch(
+        "litellm.proxy.proxy_server.prisma_client", prisma
+    ):  # test-quality-ok: fake DB seam has no injection boundary
         await persist_sso_identity_assertion("user-a", assertion_from_sso_login(first_token, None), cache=cache)
         first = await fetch_sso_identity_assertion("user-a", cache=cache)
         await persist_sso_identity_assertion(
@@ -477,7 +560,9 @@ async def test_db_store_uses_injected_cache():
     prisma = _make_prisma(stored)
     cache = SSOAssertionCache()
     token = _make_id_token()
-    with patch("litellm.proxy.proxy_server.prisma_client", prisma):  # test-quality-ok: fake DB seam has no injection boundary
+    with patch(
+        "litellm.proxy.proxy_server.prisma_client", prisma
+    ):  # test-quality-ok: fake DB seam has no injection boundary
         await persist_sso_identity_assertion("alice", assertion_from_sso_login(token, None), cache=cache)
         store = DbSSOAssertionStore(cache=cache)
         first = await store.fetch("alice")
@@ -496,3 +581,58 @@ async def test_db_store_returns_none_for_a_user_with_no_stored_assertion():
     with patch.dict(os.environ, {"LITELLM_SALT_KEY": SALT_KEY}):
         with patch("litellm.proxy.proxy_server.prisma_client", _make_prisma({})):
             assert await DbSSOAssertionStore().fetch("nobody") is None
+
+
+@pytest.mark.asyncio
+async def test_login_refresh_token_round_trips_beside_the_saml_assertion():
+    """A SAML login exchanged for a refresh token keeps the assertion, its type and its expiry, and adds
+    the refresh token with the lifetime the IdP gave it, all encrypted at rest."""
+    stored: dict[str, str] = {}
+    prisma = _make_prisma(stored)
+    now = datetime.now(timezone.utc).replace(microsecond=0)
+    saml = assertion_from_saml_login(SAML_ASSERTION_XML, int(time.time()) + 300, "https://idp.example.com")
+    assertion = with_login_refresh_token(
+        saml, "rt-from-login", 3600, now, endpoint="https://idp.example.com/token", client_id="agent"
+    )
+    with patch("litellm.proxy.proxy_server.prisma_client", prisma):
+        await persist_sso_identity_assertion("user-rt", assertion)
+        fetched = await fetch_sso_identity_assertion("user-rt")
+    assert fetched is not None
+    assert fetched.exchanged_refresh_token is not None
+    assert fetched.exchanged_refresh_token.get_secret_value() == "rt-from-login"
+    assert fetched.exchanged_refresh_token_expires_at == now + timedelta(seconds=3600)
+    assert fetched.exchanged_refresh_token_endpoint == "https://idp.example.com/token"
+    assert fetched.exchanged_refresh_token_client_id == "agent"
+    assert fetched.refresh_token is None
+    assert fetched.id_token == saml.id_token
+    assert fetched.expires_at == saml.expires_at
+    assert fetched.subject_token_type == SAML2_SUBJECT_TOKEN_TYPE
+    assert "rt-from-login" not in stored["user-rt"]
+    assert not login_refresh_token_expired(fetched, now)
+    assert login_refresh_token_expired(fetched, now + timedelta(seconds=3600))
+
+
+def test_renewal_carries_the_exchanged_refresh_token_forward():
+    """An OIDC renewal rebuilds the row from the new id_token. The refresh token the ID-JAG client
+    exchanged at login is unrelated to that renewal and must survive it."""
+    now = datetime.now(timezone.utc).replace(microsecond=0)
+    previous = with_login_refresh_token(
+        assertion_from_sso_login(_make_id_token(), "sso-rt"),
+        "rt-from-login",
+        3600,
+        now,
+        endpoint="https://idp.example.com/token",
+        client_id="agent",
+    )
+    renewed = assertion_from_sso_login(_make_id_token(7200), "sso-rt-2")
+    assert previous is not None and renewed is not None
+
+    carried = carry_exchanged_refresh_token(previous, renewed)
+
+    assert carried.id_token == renewed.id_token
+    assert carried.refresh_token is not None and carried.refresh_token.get_secret_value() == "sso-rt-2"
+    assert carried.exchanged_refresh_token is not None
+    assert carried.exchanged_refresh_token.get_secret_value() == "rt-from-login"
+    assert carried.exchanged_refresh_token_expires_at == now + timedelta(seconds=3600)
+    assert carried.exchanged_refresh_token_endpoint == "https://idp.example.com/token"
+    assert carried.exchanged_refresh_token_client_id == "agent"
diff --git a/tests/unit/proxy/_experimental/mcp_server/test_discoverable_endpoints.py b/tests/unit/proxy/_experimental/mcp_server/test_discoverable_endpoints.py
index f09409a023d..5fdc7669496 100644
--- a/tests/unit/proxy/_experimental/mcp_server/test_discoverable_endpoints.py
+++ b/tests/unit/proxy/_experimental/mcp_server/test_discoverable_endpoints.py
@@ -102,9 +102,8 @@ def isolate_global_mcp_registry(monkeypatch):
     restore, entries leak into other test modules sharing the same worker and break
     assertions over the full registry contents.
     """
-    from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
-
     from litellm.proxy._experimental.mcp_server.catalog import CatalogSnapshots
+    from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
 
     monkeypatch.setattr(global_mcp_server_manager, "catalog", CatalogSnapshots(global_mcp_server_manager))
     snapshot = dict(global_mcp_server_manager.registry)
@@ -8133,9 +8132,9 @@ async def test_resolve_active_litellm_key_resolves_key_without_user_id(proxy_glo
     blocked and expiry, and the key hash (not the user) is what the mint seals. The per-user token
     store still gets no user for such a key, since there is none to key a stored credential by."""
     from litellm.proxy._experimental.mcp_server.bridge_token_flow import (
-        extract_user_id_from_request,
-        _ResolvedKey,
         _resolve_active_litellm_key,
+        _ResolvedKey,
+        extract_user_id_from_request,
     )
     from litellm.proxy._types import UserAPIKeyAuth, hash_token
     from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
@@ -8417,8 +8416,8 @@ async def test_load_active_user_by_id_serves_a_cached_row_without_a_database_rea
     cached row answers without a database read, and only a caller that asks for the database row pays for
     one."""
     from litellm.proxy._experimental.mcp_server.bridge_token_flow import (
-        reload_active_user_by_id,
         load_active_user_by_id,
+        reload_active_user_by_id,
     )
     from litellm.proxy._types import LiteLLM_UserTable
     from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
@@ -11428,11 +11427,10 @@ async def test_upstream_resource_sent_on_dcr_bridge_relay_authorize():
     """The DCR-bridge relay arm builds its own upstream authorize params, so it needs the resource
     too. Without it the relayed authorize would omit the resource while the gateway's token leg
     still sent one, which is itself an invalid_target."""
-    from litellm.types.mcp import MCPAuth
-
     from litellm.proxy._experimental.mcp_server.discoverable_endpoints import (
         _dcr_bridge_relays_client_registration,
     )
+    from litellm.types.mcp import MCPAuth
 
     server = _resource_server(
         client_id=None,
@@ -11693,7 +11691,7 @@ def _native_client_app(monkeypatch):
     monkeypatch.setattr("litellm.proxy.proxy_server.master_key", _NATIVE_CLIENT_MASTER_KEY, raising=False)
     minted = []
 
-    async def fake_mint(user_id, team_id):
+    async def fake_mint(user_id, team_id, allowed_routes=None):
         minted.append((user_id, team_id))
         return MintedProxyCredential(key=f"sk-cli-{len(minted)}", expires_in=3600, user_id=user_id, team_id=team_id)
 
@@ -12136,7 +12134,9 @@ def test_introspect_route_answers_for_authenticated_caller(monkeypatch):
 async def test_identity_bound_authorization_carries_nonce_and_caller_through_callback(monkeypatch):
     from http.cookies import SimpleCookie
     from urllib.parse import parse_qs, urlparse
+
     from fastapi import Request
+
     from litellm.proxy._experimental.mcp_server.discoverable_endpoints import (
         _oauth_state_cookie_name,
         authorize_with_server,
@@ -12211,6 +12211,7 @@ async def test_identity_bound_authorization_carries_nonce_and_caller_through_cal
 @pytest.mark.asyncio
 async def test_enforced_login_warms_verified_token_readable_without_database_lookup(monkeypatch):
     from types import SimpleNamespace
+
     from litellm.caching.caching import DualCache
     from litellm.proxy import proxy_server
     from litellm.proxy._experimental.mcp_server import db, mcp_server_manager
@@ -12279,9 +12280,10 @@ async def test_enforced_login_warms_verified_token_readable_without_database_loo
 async def test_dcr_refusal_is_actionable_without_upstream_body(
     upstream_status: int, auth_type: MCPAuth, dcr_bridge: bool, flow: str, monkeypatch: pytest.MonkeyPatch
 ) -> None:
-    import httpx
     from typing import Final
 
+    import httpx
+
     from litellm.proxy._experimental.mcp_server.discoverable_endpoints import (
         mint_ephemeral_dcr_client,
         register_client_with_server,
@@ -12522,8 +12524,8 @@ async def test_oauth_exchange_stores_token_for_validated_jwt_user(
     import litellm
     from litellm.caching.llm_caching_handler import LLMClientCache
     from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
-    from litellm.proxy import proxy_server
     from litellm.models.user import LiteLLM_UserTable
+    from litellm.proxy import proxy_server
     from litellm.proxy.common_utils.encrypt_decrypt_utils import decrypt_value_helper
     from litellm.types.llms.custom_http import httpxSpecialProvider
 
@@ -12618,8 +12620,8 @@ async def test_oauth_jwt_identity_rejects_untrusted_or_inactive_owner(
     from litellm.proxy import proxy_server
     from litellm.proxy._experimental.mcp_server import mcp_server_manager
     from litellm.proxy._experimental.mcp_server.bridge_token_flow import (
-        extract_user_id_from_request,
         authorize_oauth_credential_request,
+        extract_user_id_from_request,
     )
 
     allowed_servers: Final = AsyncMock(return_value=["server-a"])
@@ -12688,7 +12690,7 @@ async def test_oauth_jwt_uses_configured_virtual_key_owner(
 ) -> None:
     from litellm.models.user import LiteLLM_UserTable
     from litellm.proxy._experimental.mcp_server.bridge_token_flow import extract_user_id_from_request
-    from litellm.proxy._types import UserAPIKeyAuth, UnregisteredJWTClientBehavior, hash_token
+    from litellm.proxy._types import UnregisteredJWTClientBehavior, UserAPIKeyAuth, hash_token
     from litellm.proxy.auth.auth_checks import jwt_key_mapping_cache_key
 
     handler, signing_key = jwt_oauth_identity
@@ -13069,8 +13071,8 @@ async def test_signed_oauth_callback_honors_credential_write_policy(
     cimd: bool,
 ) -> None:
     import httpx
-    import litellm
 
+    import litellm
     from litellm.caching.llm_caching_handler import LLMClientCache
     from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
     from litellm.proxy import proxy_server
@@ -13186,17 +13188,16 @@ async def test_identity_bound_authorize_preserves_presented_jwt_permissions(
     allowed: bool,
     credential: str,
 ) -> None:
-    import jwt
     from datetime import datetime, timedelta, timezone
     from urllib.parse import parse_qs, urlparse
 
+    import jwt
+
     from litellm.models.user import LiteLLM_UserTable
     from litellm.proxy import proxy_server
-    from litellm.proxy._types import JWTIssuerConfig, UserAPIKeyAuth, hash_token
-    from litellm.proxy.auth.auth_checks import ExperimentalUIJWTToken
-
     from litellm.proxy._experimental.mcp_server import discoverable_endpoints, mcp_server_manager
-    from litellm.proxy._types import MCPTransport
+    from litellm.proxy._types import JWTIssuerConfig, MCPTransport, UserAPIKeyAuth, hash_token
+    from litellm.proxy.auth.auth_checks import ExperimentalUIJWTToken
     from litellm.types.mcp_server.mcp_server_manager import MCPOAuthIdentityBinding, MCPServer
 
     handler, signing_key = jwt_oauth_identity
@@ -13330,9 +13331,10 @@ async def test_identity_bound_authorize_unrelated_bearer_uses_browser_session(
     credential: str,
     cookie_state: str,
 ) -> None:
-    import jwt
     from urllib.parse import parse_qs, urlparse
 
+    import jwt
+
     from litellm.models.user import LiteLLM_UserTable
     from litellm.proxy import proxy_server
     from litellm.proxy._experimental.mcp_server import discoverable_endpoints, mcp_server_manager
@@ -13664,6 +13666,7 @@ def test_persisted_client_is_not_applied_to_another_upstream(issuer, url):
 async def test_registration_does_not_write_client_after_upstream_edit(monkeypatch):
     monkeypatch.setenv("LITELLM_SALT_KEY", "test-mcp-registration-salt")
     from prisma import models
+
     from litellm.proxy import proxy_server
     from litellm.proxy._experimental.mcp_server.discoverable_endpoints import _persist_dcr_client_registration
 
@@ -13750,6 +13753,7 @@ async def test_callback_does_not_forward_error_from_another_issuer(monkeypatch):
 @pytest.mark.parametrize("operation", ["authorize", "token"])
 async def test_bound_client_cannot_be_sent_to_a_different_issuer(monkeypatch, operation):
     from fastapi import Request
+
     from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
     from litellm.types.mcp_server.mcp_server_manager import MCPServer
 
@@ -13796,6 +13800,7 @@ async def test_bound_client_cannot_be_sent_to_a_different_issuer(monkeypatch, op
 @pytest.mark.asyncio
 async def test_failed_registration_preserves_cached_credentials(monkeypatch):
     from fastapi import Request
+
     from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
 
     server = _dcr_redirect_test_server("old-client").model_copy(
@@ -13819,8 +13824,13 @@ async def test_failed_registration_preserves_cached_credentials(monkeypatch):
     request.headers = {}
     with pytest.raises(HTTPException) as error:
         await endpoints.register_client_with_server(
-            request=request, mcp_server=server, client_name="app", grant_types=["authorization_code"],
-            response_types=["code"], token_endpoint_auth_method="none", replace_stale_client=True,
+            request=request,
+            mcp_server=server,
+            client_name="app",
+            grant_types=["authorization_code"],
+            response_types=["code"],
+            token_endpoint_auth_method="none",
+            replace_stale_client=True,
         )
     assert error.value.status_code == 503
     assert "could not be saved" in error.value.detail
@@ -13835,6 +13845,7 @@ async def test_failed_registration_preserves_cached_credentials(monkeypatch):
 @pytest.mark.asyncio
 async def test_registration_without_database_keeps_client_in_temporary_server(monkeypatch):
     from fastapi import Request
+
     from litellm.proxy import proxy_server
     from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
 
@@ -13850,8 +13861,13 @@ async def test_registration_without_database_keeps_client_in_temporary_server(mo
     request.base_url = "https://gateway.example/"
     request.headers = {}
     response = await endpoints.register_client_with_server(
-        request=request, mcp_server=server, client_name="app", grant_types=["authorization_code"],
-        response_types=["code"], token_endpoint_auth_method="none", replace_stale_client=True,
+        request=request,
+        mcp_server=server,
+        client_name="app",
+        grant_types=["authorization_code"],
+        response_types=["code"],
+        token_endpoint_auth_method="none",
+        replace_stale_client=True,
     )
     assert response.status_code == 200
     assert json.loads(response.body)["client_id"] == "temporary-client"
@@ -13864,9 +13880,10 @@ async def test_registration_without_database_keeps_client_in_temporary_server(mo
 @pytest.mark.asyncio
 @pytest.mark.parametrize("config_store", [False, True])
 async def test_registration_does_not_overwrite_credentials_after_failed_identity_read(monkeypatch, config_store):
-    from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints, db
-    from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
     from litellm.proxy import utils
+    from litellm.proxy._experimental.mcp_server import db
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
+    from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
 
     server = _dcr_redirect_test_server(None)
     monkeypatch.setattr(utils, "get_prisma_client_or_throw", lambda _: MagicMock())
@@ -13895,9 +13912,10 @@ async def test_registration_does_not_overwrite_credentials_after_failed_identity
 @pytest.mark.asyncio
 @pytest.mark.parametrize("winner_available", [False, True])
 async def test_registration_losing_conditional_write_reuses_only_a_matching_winner(monkeypatch, winner_available):
-    from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints, db
-    from litellm.proxy._types import LiteLLM_MCPServerTable
     from litellm.proxy import utils
+    from litellm.proxy._experimental.mcp_server import db
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
+    from litellm.proxy._types import LiteLLM_MCPServerTable
 
     server = _dcr_redirect_test_server(None).model_copy(update={"url": "https://upstream.example/mcp"})
     row = LiteLLM_MCPServerTable.model_validate(server.model_dump(exclude_none=True))
@@ -14503,7 +14521,8 @@ async def test_managed_authorize_retains_the_callers_previous_grant(
     from urllib.parse import parse_qs, urlsplit
 
     from litellm.proxy import proxy_server
-    from litellm.proxy._experimental.mcp_server import db, discoverable_endpoints as endpoints
+    from litellm.proxy._experimental.mcp_server import db
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
     from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
 
     _, signing_key = jwt_oauth_identity
@@ -14548,7 +14567,8 @@ async def test_managed_code_exchange_preserves_requested_scope_only_when_omitted
     from urllib.parse import parse_qs, urlsplit
 
     from litellm.proxy import proxy_server
-    from litellm.proxy._experimental.mcp_server import db, discoverable_endpoints as endpoints
+    from litellm.proxy._experimental.mcp_server import db
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
     from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
 
     _, signing_key = jwt_oauth_identity
@@ -14692,7 +14712,8 @@ async def test_managed_refresh_retains_only_the_actual_grant(
     from types import SimpleNamespace
 
     from litellm.proxy import proxy_server
-    from litellm.proxy._experimental.mcp_server import db, discoverable_endpoints as endpoints
+    from litellm.proxy._experimental.mcp_server import db
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
     from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
 
     _, signing_key = jwt_oauth_identity
@@ -14774,7 +14795,8 @@ async def test_managed_resource_metadata_excludes_refresh_permission(monkeypatch
     ],
 )
 async def test_connect_requires_the_requested_vendor_grant(monkeypatch, granted, required, expected):
-    from litellm.proxy._experimental.mcp_server import db, discoverable_endpoints as endpoints
+    from litellm.proxy._experimental.mcp_server import db
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints as endpoints
 
     credential = {**_stored_grant(), "scopes": granted}
     read = AsyncMock(return_value=credential)
@@ -14836,3 +14858,137 @@ def test_aggregate_protected_resource_advertises_header_server_scopes(
     )
     with patch.object(mcp_server_manager, "global_mcp_server_manager", manager):
         assert _build_aggregate_protected_resource_response(request)["scopes_supported"] == expected
+
+
+@pytest.mark.asyncio
+async def test_token_endpoint_routes_the_jwt_bearer_grant_to_the_aggregate_gateway():
+    """A requesting app presents its identity provider's client_id, never a gateway DCR one, so
+    the aggregate dispatch keys on the grant type for RFC 7523 and hands the assertion to the
+    ID-JAG redeemer. A per-server token endpoint never serves that grant."""
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints
+    from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import JWT_BEARER_GRANT_TYPE
+    from litellm.proxy._experimental.mcp_server.id_jag_grant import IdJagPrerequisites
+
+    request = _mock_callback_request("https://litellm.example.com/")
+    with patch("litellm.proxy.proxy_server.master_key", "sk-test-salt-for-lit9670"):
+        response = await discoverable_endpoints.token_endpoint(
+            request=request,
+            grant_type=JWT_BEARER_GRANT_TYPE,
+            client_id="0oa-requesting-app",
+            client_secret="app-secret",
+            assertion="eyJ.assertion.sig",
+            resource=None,
+        )
+    assert response.status_code == 400
+    refused = json.loads(bytes(response.body))
+    assert refused["error"] == "unsupported_grant_type"
+    unmet = IdJagPrerequisites(
+        jwt_auth_enabled=False,
+        has_database=False,
+        licensed=False,
+        maps_jwts_to_virtual_keys=False,
+        shared_replay_store=False,
+        base_url=None,
+        requesting_apps=(),
+    ).refusal()
+    assert unmet is not None and refused["error_description"] == unmet.description
+    with pytest.raises(HTTPException):
+        await discoverable_endpoints.token_endpoint(
+            request=request,
+            grant_type=JWT_BEARER_GRANT_TYPE,
+            client_id="0oa-requesting-app",
+            assertion="eyJ.assertion.sig",
+            mcp_server_name="no-such-server",
+        )
+
+
+@pytest.mark.asyncio
+async def test_token_endpoint_takes_the_client_id_from_http_basic_when_the_form_leaves_it_out():
+    """RFC 6749 section 2.3.1: a confidential app may authenticate with HTTP Basic alone, so the
+    aggregate dispatch reads client_id from that header. With neither the form field nor the
+    header the request is a 400 invalid_request, not a 422."""
+    from base64 import b64encode
+
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints
+    from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import JWT_BEARER_GRANT_TYPE
+
+    request = _mock_callback_request("https://litellm.example.com/")
+    request.headers = {"authorization": "Basic " + b64encode(b"0oa-requesting-app:app-secret").decode()}
+    with patch("litellm.proxy.proxy_server.master_key", "sk-test-salt-for-lit9670"):
+        response = await discoverable_endpoints.token_endpoint(
+            request=request,
+            grant_type=JWT_BEARER_GRANT_TYPE,
+            client_id=None,
+            assertion="eyJ.assertion.sig",
+            resource=None,
+        )
+    assert response.status_code == 400
+    assert json.loads(bytes(response.body))["error"] == "unsupported_grant_type"
+    request.headers = {}
+    with pytest.raises(HTTPException) as refused:
+        await discoverable_endpoints.token_endpoint(
+            request=request, grant_type=JWT_BEARER_GRANT_TYPE, client_id=None, assertion="eyJ.assertion.sig"
+        )
+    assert refused.value.status_code == 400
+    assert refused.value.detail["error"] == "invalid_request"
+
+
+@pytest.mark.parametrize("available", [True, False])
+def test_root_metadata_is_the_gateways_own_and_lists_the_jwt_bearer_grant_when_it_is_served(available):
+    """With no OAuth2 MCP server resolving at the root, the bare-origin document is the gateway's
+    own authorization server metadata: issuer is the origin an ID-JAG names as ``aud``, the token
+    endpoint is ``{base}/token``, and the jwt-bearer grant (with HTTP Basic client auth) is listed
+    exactly when the gateway serves it, under the same gates as the aggregate ``/mcp`` document."""
+    from fastapi import Request
+
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints
+    from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import JWT_BEARER_GRANT_TYPE
+    from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
+
+    global_mcp_server_manager.registry.clear()
+    request = MagicMock(spec=Request)
+    request.base_url = "https://llm.example.com/"
+    request.headers = {}
+    with (
+        patch.object(discoverable_endpoints, "jwt_bearer_available", return_value=available),  # test-quality-ok: deployment gate seam
+        patch.object(discoverable_endpoints, "token_exchange_available", return_value=True),  # test-quality-ok: deployment gate seam
+    ):
+        document = discoverable_endpoints._build_oauth_authorization_server_response(request=request, mcp_server_name=None)
+    assert document["issuer"] == "https://llm.example.com"
+    assert document["token_endpoint"] == "https://llm.example.com/token"
+    assert (JWT_BEARER_GRANT_TYPE in document["grant_types_supported"]) is available
+    assert ("client_secret_basic" in document["token_endpoint_auth_methods_supported"]) is available
+    assert ("none" in document["token_endpoint_auth_methods_supported"]) is available
+    assert "urn:ietf:params:oauth:grant-type:token-exchange" in document["grant_types_supported"]
+
+
+def test_root_metadata_owned_by_a_resolved_oauth2_server_never_lists_the_gateways_grant():
+    """When exactly one OAuth2 MCP server resolves at the root, the root document describes that
+    upstream's token endpoint, which cannot redeem an ID-JAG, so the jwt-bearer grant is not
+    advertised there even though the gateway serves it; a requesting app uses the aggregate
+    ``/.well-known/oauth-authorization-server/mcp`` document in that deployment."""
+    from fastapi import Request
+
+    from litellm.proxy._experimental.mcp_server import discoverable_endpoints
+    from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import JWT_BEARER_GRANT_TYPE
+    from litellm.proxy._experimental.mcp_server.mcp_server_manager import global_mcp_server_manager
+
+    server = _create_oauth2_server()
+    global_mcp_server_manager.registry.clear()
+    global_mcp_server_manager.registry[server.server_id] = server
+    request = MagicMock(spec=Request)
+    request.base_url = "https://llm.example.com/"
+    request.headers = {}
+    try:
+        with (
+            patch.object(discoverable_endpoints, "jwt_bearer_available", return_value=True),  # test-quality-ok: deployment gate seam
+            patch.object(discoverable_endpoints, "token_exchange_available", return_value=True),  # test-quality-ok: deployment gate seam
+            patch.object(global_mcp_server_manager, "get_mcp_server_by_name", return_value=server),  # test-quality-ok: resolver seam
+        ):
+            document = discoverable_endpoints._build_oauth_authorization_server_response(request=request, mcp_server_name=None)
+    finally:
+        global_mcp_server_manager.registry.clear()
+    assert document["token_endpoint"] == "https://llm.example.com/test_oauth/token"
+    assert JWT_BEARER_GRANT_TYPE not in document["grant_types_supported"]
+    assert document["grant_types_supported"] == ["authorization_code", "refresh_token"]
+    assert document["token_endpoint_auth_methods_supported"] == ["client_secret_post"]
diff --git a/tests/unit/proxy/_experimental/mcp_server/test_gateway_dcr_flow.py b/tests/unit/proxy/_experimental/mcp_server/test_gateway_dcr_flow.py
index 1417e77c8e2..ef95df23ff8 100644
--- a/tests/unit/proxy/_experimental/mcp_server/test_gateway_dcr_flow.py
+++ b/tests/unit/proxy/_experimental/mcp_server/test_gateway_dcr_flow.py
@@ -20,10 +20,12 @@ from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import (
     CONNECT_FLOW_COOKIE_PREFIX,
     GATEWAY_AUTH_CODE_PREFIX,
     GATEWAY_AUTH_CODE_TTL_SECONDS,
+    JWT_BEARER_GRANT_TYPE,
     MANUAL_DELIVERY_AUTH_CODE_TTL_SECONDS,
     MAX_CLIENT_ID_LENGTH,
     SUBJECT_TOKEN_TYPES,
     TOKEN_EXCHANGE_GRANT_TYPE,
+    AssertionIdentity,
     ConsentTeam,
     MintedProxyCredential,
     SubjectIdentity,
@@ -44,6 +46,7 @@ from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import (
     open_gateway_dcr_client,
     register_aggregate_client,
     revoke_refresh_token,
+    supported_grant_types,
 )
 from litellm.proxy._experimental.mcp_server.outbound_credentials.session_credentials import (
     SessionBearerAdmitted,
@@ -1771,10 +1774,12 @@ CONSENT_TEAMS = (ConsentTeam(team_id="team-a", team_alias="Team A"), ConsentTeam
 class _Minter:
     def __init__(self, result=None):
         self.calls = []
+        self.allowed_routes = []
         self.result = result
 
-    async def __call__(self, user_id, team_id):
+    async def __call__(self, user_id, team_id, allowed_routes=None):
         self.calls.append((user_id, team_id))
+        self.allowed_routes.append(allowed_routes)
         if self.result is not None:
             return self.result
         return MintedProxyCredential(key=f"sk-cli-{user_id}", expires_in=3600, user_id=user_id, team_id=team_id)
@@ -3296,3 +3301,200 @@ async def test_gateway_scope_still_narrows_when_the_resource_does_not_resolve()
     _, cookies = _flow_cookie_from(response)
     sealed_flow: Final = _sealed_wire_json(next(iter(cookies.values())), "", "gateway_connect_flow")
     assert sealed_flow["resource_server_id"] == "alpha-id"
+
+
+ID_JAG = "eyJhbGciOiJSUzI1NiIsInR5cCI6Im9hdXRoLWlkLWphZytqd3QifQ.eyJzdWIiOiJ1MSJ9.idp-signature"
+REQUESTING_APP = "0oa-requesting-app"
+ASSERTED = AssertionIdentity(
+    user_id="u1",
+    team_id="team-b",
+    replay_key="mcp_gateway_dcr:id_jag:jti-1",
+    replay_ttl_seconds=300,
+    scope="litellm:mcp",
+    allowed_routes=("mcp_inference_routes",),
+)
+
+
+class _Redeemer:
+    def __init__(self, result=None):
+        self.calls = []
+        self.result = result
+
+    async def __call__(self, assertion, client_id, client_secret, request):
+        self.calls.append((assertion, client_id, client_secret, request.url.path))
+        return self.result if self.result is not None else ASSERTED
+
+
+async def _redeem_assertion_native(minter, redeemer, cache=None, client_id=REQUESTING_APP, **overrides):
+    arguments = {
+        "grant_type": JWT_BEARER_GRANT_TYPE,
+        "assertion": ID_JAG,
+        "client_secret": "app-secret",
+        "redeem_assertion": redeemer,
+    }
+    return await _redeem_native(None, client_id, minter, cache=cache, **{**arguments, **overrides})
+
+
+@pytest.mark.asyncio
+async def test_jwt_bearer_grant_mints_the_proxy_credential_for_the_asserted_user_once_per_assertion():
+    """RFC 7523: an allowlisted requesting app redeems the ID-JAG its identity provider minted for
+    the same credential the consent flow mints, attributed to the user the assertion names and
+    the team asked for, with the assertion's scope stated and no refresh token (RFC 7521 section
+    4.1, the app renews with a fresh assertion). The assertion's jti is single-use: presenting it again is a replay and mints
+    nothing, while a fresh assertion for the same user is served."""
+    minter, redeemer, cache = _Minter(), _Redeemer(), DualCache()
+    response = await _redeem_assertion_native(minter, redeemer, cache=cache)
+    assert response.status_code == 200
+    assert response.headers["cache-control"] == "no-store"
+    body = json.loads(response.body)
+    assert redeemer.calls == [(ID_JAG, REQUESTING_APP, "app-secret", "/token")]
+    assert minter.calls == [("u1", "team-b")]
+    assert body["access_token"] == "sk-cli-u1"
+    assert body["token_type"] == "Bearer"
+    assert body["scope"] == "litellm:mcp"
+    assert "issued_token_type" not in body
+    assert (body["user_id"], body["team_id"]) == ("u1", "team-b")
+    assert "refresh_token" not in body
+    replayed = await _redeem_assertion_native(minter, redeemer, cache=cache)
+    assert replayed.status_code == 400
+    assert json.loads(replayed.body)["error"] == "invalid_grant"
+    assert minter.calls == [("u1", "team-b")]
+    fresh = _Redeemer(ASSERTED.model_copy(update={"replay_key": "mcp_gateway_dcr:id_jag:jti-2", "scope": None}))
+    again = await _redeem_assertion_native(minter, fresh, cache=cache)
+    assert again.status_code == 200
+    assert "scope" not in json.loads(again.body)
+    assert minter.calls == [("u1", "team-b"), ("u1", "team-b")]
+
+
+@pytest.mark.asyncio
+async def test_jwt_bearer_grant_claims_the_jti_before_it_mints():
+    """A mint the gateway could not complete still consumed the assertion: the client gets the
+    503 and comes back with a fresh assertion, never with the same one."""
+    minter, cache = _Minter(result="unavailable"), DualCache()
+    first = await _redeem_assertion_native(minter, _Redeemer(), cache=cache)
+    assert first.status_code == 503
+    retried = await _redeem_assertion_native(_Minter(), _Redeemer(), cache=cache)
+    assert retried.status_code == 400
+    assert json.loads(retried.body)["error"] == "invalid_grant"
+
+
+@pytest.mark.parametrize(
+    "error, status",
+    [
+        ("invalid_client", 401),
+        ("invalid_grant", 400),
+        ("invalid_request", 400),
+        ("unsupported_grant_type", 400),
+        ("temporarily_unavailable", 503),
+    ],
+)
+@pytest.mark.asyncio
+async def test_jwt_bearer_grant_refusals_keep_their_oauth_error_and_status(error, status):
+    minter, cache = _Minter(), DualCache()
+    refusal = SubjectTokenRefusal(error=error, description="why")
+    response = await _redeem_assertion_native(minter, _Redeemer(refusal), cache=cache)
+    assert response.status_code == status
+    assert json.loads(response.body) == {"error": error, "error_description": "why"}
+    assert minter.calls == []
+    served = await _redeem_assertion_native(minter, _Redeemer(), cache=cache)
+    assert served.status_code == 200
+
+
+@pytest.mark.asyncio
+async def test_jwt_bearer_grant_requires_an_assertion_and_the_proxy_api_target():
+    minter, redeemer = _Minter(), _Redeemer()
+    missing = await _redeem_assertion_native(minter, redeemer, assertion=None)
+    assert missing.status_code == 400
+    assert json.loads(missing.body)["error"] == "invalid_request"
+    foreign = await _redeem_assertion_native(minter, redeemer, resource="https://elsewhere.example/api")
+    assert foreign.status_code == 400
+    assert json.loads(foreign.body)["error"] == "invalid_target"
+    assert redeemer.calls == []
+    assert minter.calls == []
+
+
+@pytest.mark.asyncio
+async def test_jwt_bearer_grant_is_refused_where_no_redeemer_is_wired():
+    minter = _Minter()
+    response = await _redeem_native(
+        None, REQUESTING_APP, minter, grant_type=JWT_BEARER_GRANT_TYPE, assertion=ID_JAG, client_secret=None
+    )
+    assert response.status_code == 400
+    assert json.loads(response.body)["error"] == "unsupported_grant_type"
+    assert minter.calls == []
+
+
+@pytest.mark.asyncio
+async def test_an_unknown_grant_type_names_the_jwt_bearer_grant_among_the_served_ones():
+    response = await _redeem_native(None, REQUESTING_APP, _Minter(), grant_type="urn:example:nope")
+    assert response.status_code == 400
+    assert JWT_BEARER_GRANT_TYPE in json.loads(response.body)["error_description"]
+
+
+@pytest.mark.parametrize(
+    "token_exchange, jwt_bearer, expected",
+    [
+        (False, False, ("authorization_code", "refresh_token")),
+        (True, False, ("authorization_code", "refresh_token", TOKEN_EXCHANGE_GRANT_TYPE)),
+        (False, True, ("authorization_code", "refresh_token", JWT_BEARER_GRANT_TYPE)),
+        (True, True, ("authorization_code", "refresh_token", TOKEN_EXCHANGE_GRANT_TYPE, JWT_BEARER_GRANT_TYPE)),
+    ],
+)
+def test_the_jwt_bearer_grant_is_advertised_exactly_when_it_is_served(token_exchange, jwt_bearer, expected):
+    assert supported_grant_types(token_exchange, jwt_bearer) == expected
+    contract = native_client_auth_contract(_request("/.well-known/litellm-cli-auth"), token_exchange, jwt_bearer)
+    assert contract["grant_types_supported"] == expected
+
+
+@pytest.mark.asyncio
+async def test_jwt_bearer_grant_narrows_the_credential_to_the_routes_the_scope_bought():
+    """The route groups the assertion's scope resolved to reach the minter, so the credential is
+    enforced on every proxy route the way a virtual key's allowed_routes is, and the response states
+    exactly the scope that was enforced. No scope on the assertion mints the full credential."""
+    minter = _Minter()
+    both = ASSERTED.model_copy(
+        update={"scope": "litellm:mcp litellm:llm", "allowed_routes": ("mcp_inference_routes", "openai_routes")}
+    )
+    scoped = await _redeem_assertion_native(minter, _Redeemer(both), cache=DualCache())
+    assert scoped.status_code == 200
+    assert json.loads(scoped.body)["scope"] == "litellm:mcp litellm:llm"
+    full = await _redeem_assertion_native(
+        minter, _Redeemer(ASSERTED.model_copy(update={"scope": None, "allowed_routes": None})), cache=DualCache()
+    )
+    assert full.status_code == 200
+    assert "scope" not in json.loads(full.body)
+    assert minter.allowed_routes == [("mcp_inference_routes", "openai_routes"), None]
+
+
+@pytest.mark.asyncio
+async def test_jwt_bearer_grant_accepts_the_mcp_resource_indicator_as_its_target():
+    """RFC 8707 clients send the ID-JAG's audience as ``resource``, and that audience may be the MCP
+    resource ``{base}/mcp``, so it is a valid target next to the proxy origin. Anything else stays
+    ``invalid_target``."""
+    minter = _Minter()
+    served = await _redeem_assertion_native(
+        minter, _Redeemer(), cache=DualCache(), resource=PROXY_API_RESOURCE.rstrip("/") + "/mcp"
+    )
+    assert served.status_code == 200
+    foreign = await _redeem_assertion_native(
+        minter, _Redeemer(), cache=DualCache(), resource=PROXY_API_RESOURCE.rstrip("/") + "/other/mcp"
+    )
+    assert json.loads(foreign.body)["error"] == "invalid_target"
+    assert minter.calls == [("u1", "team-b")]
+
+
+@pytest.mark.parametrize("jwt_bearer_available", [True, False])
+def test_aggregate_metadata_advertises_basic_client_auth_only_with_the_grant_that_reads_it(jwt_bearer_available):
+    """Only the jwt-bearer redemption reads an HTTP Basic client secret, the other grants take
+    ``client_secret`` from the form, so ``client_secret_basic`` is advertised only when that grant
+    is on. A client following the document otherwise sends Basic alone and authenticates with no
+    secret."""
+    from litellm.proxy._experimental.mcp_server.discoverable_endpoints import (
+        _build_aggregate_authorization_server_response,
+    )
+
+    document = _build_aggregate_authorization_server_response(_request(), True, jwt_bearer_available)
+    methods = document["token_endpoint_auth_methods_supported"]
+    assert isinstance(methods, list)
+    assert ("client_secret_basic" in methods) is jwt_bearer_available
+    assert "none" in methods and "client_secret_post" in methods
diff --git a/tests/unit/proxy/_experimental/mcp_server/test_id_jag_grant.py b/tests/unit/proxy/_experimental/mcp_server/test_id_jag_grant.py
new file mode 100644
index 00000000000..fdfa0544ad1
--- /dev/null
+++ b/tests/unit/proxy/_experimental/mcp_server/test_id_jag_grant.py
@@ -0,0 +1,738 @@
+import hashlib
+import logging
+import math
+from base64 import b64encode
+from collections.abc import Mapping, Sequence
+from typing import Final
+
+import jwt
+import pytest
+from fastapi import HTTPException
+
+from litellm.caching.caching import DualCache
+from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import (
+    AssertionIdentity,
+    ConsentTeam,
+    ReloadUserFailure,
+    SubjectIdentity,
+    SubjectTokenRefusal,
+)
+from litellm.proxy._experimental.mcp_server.id_jag_grant import (
+    ID_JAG_REQUIRED_CLAIMS,
+    REJECTED_ASSERTION,
+    TEAM_HEADER,
+    AssertionRedemption,
+    GrantedScope,
+    IdJagPrerequisites,
+    LookupTeams,
+    _claim_reader,
+    basic_client_id,
+    gateway_audiences,
+    granted_scope,
+    identity_from_id_jag,
+    jwt_bearer_available,
+    names_mcp_resource,
+    proxy_user_lookup,
+    select_team,
+    subject_resolver,
+)
+from litellm.proxy._types import IdJagRequestingApp, LiteLLM_JWTAuth, LiteLLMRoutes
+from litellm.proxy.auth.handle_jwt import (
+    ID_JAG_TYP,
+    AssertionRejection,
+    JWKSUnreachableError,
+    JWTHandler,
+    jwks_unavailable_exception,
+)
+
+ISSUER = "https://idp.example.com"
+GATEWAY = "https://gateway.example.com"
+AUDIENCES = (f"{GATEWAY}/mcp", GATEWAY)
+NOW = 1_800_000_000.0
+PUBLIC_APP = IdJagRequestingApp(client_id="0oa-public")
+CONFIDENTIAL_APP = IdJagRequestingApp(client_id="0oa-confidential", client_secret="s3cret")
+SPACED_APP = IdJagRequestingApp(client_id="0oa spaced", client_secret="app secret")
+EVERY_GATE_HOLDS = {
+    "jwt_auth_enabled": True,
+    "has_database": True,
+    "licensed": True,
+    "maps_jwts_to_virtual_keys": False,
+    "shared_replay_store": True,
+    "base_url": "https://gateway.example.com",
+    "requesting_apps": (PUBLIC_APP, CONFIDENTIAL_APP, SPACED_APP),
+}
+JWKS_DOWN = jwks_unavailable_exception(JWKSUnreachableError("ConnectError fetching the IdP's JWKS after 3 attempts"))
+
+
+def _claims(**overrides: object) -> dict[str, object]:
+    return {
+        "iss": ISSUER,
+        "sub": "okta-user-1",
+        "aud": AUDIENCES[1],
+        "exp": NOW + 300,
+        "iat": NOW - 5,
+        "jti": "jti-1",
+        "client_id": PUBLIC_APP.client_id,
+        "scope": "litellm:mcp",
+        **overrides,
+    }
+
+
+def _assertion(typ: str = ID_JAG_TYP, **claims: object) -> str:
+    return jwt.encode(
+        _claims(**claims),
+        "unused-by-the-fake-verifier-but-long-enough-for-hs256",
+        algorithm="HS256",
+        headers={"typ": typ},
+    )
+
+
+class _Verifier:
+    """Stands in for the injected ``DecodeAssertion`` port; records each call as a new tuple."""
+
+    def __init__(
+        self, result: Mapping[str, object] | AssertionRejection | None = None, raises: BaseException | None = None
+    ) -> None:
+        self.calls: tuple[tuple[str, tuple[str, ...], tuple[str, ...]], ...] = ()
+        self.result = result
+        self.raises = raises
+
+    async def __call__(
+        self, assertion: str, audience: Sequence[str], required_claims: Sequence[str]
+    ) -> Mapping[str, object] | AssertionRejection:
+        self.calls = (*self.calls, (assertion, tuple(audience), tuple(required_claims)))  # rebind-ok: immutable record
+        if self.raises is not None:
+            raise self.raises
+        return self.result if self.result is not None else jwt.decode(assertion, options={"verify_signature": False})
+
+
+class _Resolver:
+    """Stands in for the injected ``ResolveSubject`` port; records each call as a new tuple."""
+
+    def __init__(
+        self,
+        user_id: str | None = "u1",
+        raises: BaseException | None = None,
+        result: SubjectIdentity | SubjectTokenRefusal | None = None,
+    ) -> None:
+        self.calls: tuple[tuple[Mapping[str, object], str | None], ...] = ()
+        self.user_id = user_id
+        self.raises = raises
+        self.result = result
+
+    async def __call__(
+        self, claims: Mapping[str, object], team_header: str | None
+    ) -> SubjectIdentity | SubjectTokenRefusal | None:
+        self.calls = (*self.calls, (dict(claims), team_header))  # rebind-ok: immutable record
+        if self.raises is not None:
+            raise self.raises
+        if self.result is not None:
+            return self.result
+        return None if self.user_id is None else SubjectIdentity(user_id=self.user_id, team_id=team_header)
+
+
+def _redemption(
+    assertion: str,
+    client_id: str = PUBLIC_APP.client_id,
+    client_secret: str | None = None,
+    authorization: str | None = None,
+    team_id: str | None = "team-b",
+    leeway: float = 0.0,
+) -> AssertionRedemption:
+    return AssertionRedemption(
+        assertion=assertion,
+        client_id=client_id,
+        client_secret=client_secret,
+        authorization_header=authorization,
+        team_id=team_id,
+        audiences=AUDIENCES,
+        now=NOW,
+        leeway_seconds=leeway,
+    )
+
+
+@pytest.mark.asyncio
+async def test_the_replay_marker_outlives_the_leeway_the_verifier_grants_exp():
+    """PyJWT accepts an assertion until ``exp`` plus the handler's leeway, so the marker must
+    live that long too, including for an assertion already past ``exp`` but inside the leeway."""
+    within_leeway = await _identity(_redemption(_assertion(), leeway=30), _Verifier(), _Resolver())
+    assert isinstance(within_leeway, AssertionIdentity)
+    assert within_leeway.replay_ttl_seconds == 330
+    just_expired = await _identity(
+        _redemption(_assertion(), leeway=30), _Verifier(result=_claims(exp=NOW - 10)), _Resolver()
+    )
+    assert isinstance(just_expired, AssertionIdentity)
+    assert just_expired.replay_ttl_seconds == 20
+
+
+async def _identity(
+    redemption: AssertionRedemption,
+    verifier: _Verifier | None = None,
+    resolver: _Resolver | None = None,
+    **unmet: object,
+) -> AssertionIdentity | SubjectTokenRefusal:
+    return await identity_from_id_jag(
+        redemption,
+        prerequisites=IdJagPrerequisites(**{**EVERY_GATE_HOLDS, **unmet}),
+        decode=verifier if verifier is not None else _Verifier(),
+        resolve_subject=resolver if resolver is not None else _Resolver(),
+    )
+
+
+@pytest.mark.asyncio
+async def test_a_valid_id_jag_names_the_user_its_single_use_key_and_its_scope():
+    """The verifier is asked for the gateway's own issuer values as audience and for every claim
+    the ID-JAG profile requires, the subject lookup sees the verified claims, and the identity
+    carries the team asked for, a replay key derived from iss and jti, a marker TTL that outlives
+    the assertion, and the assertion's scope."""
+    assertion, verifier, resolver = _assertion(), _Verifier(), _Resolver()
+    identity = await _identity(_redemption(assertion), verifier, resolver)
+    assert isinstance(identity, AssertionIdentity)
+    assert verifier.calls == ((assertion, AUDIENCES, ID_JAG_REQUIRED_CLAIMS),)
+    assert {"iss", "sub", "aud", "exp", "iat", "jti", "client_id"} <= set(ID_JAG_REQUIRED_CLAIMS)
+    assert resolver.calls == ((_claims(), "team-b"),)
+    assert (identity.user_id, identity.team_id, identity.scope) == ("u1", "team-b", "litellm:mcp")
+    assert identity.allowed_routes == ("mcp_inference_routes",)
+    assert identity.replay_key == "mcp_gateway_dcr:id_jag:" + hashlib.sha256(f"{ISSUER}\njti-1".encode()).hexdigest()
+    assert identity.replay_ttl_seconds == math.ceil(300)
+    other_jti = await _identity(_redemption(_assertion(jti="jti-2")), _Verifier(), _Resolver())
+    assert isinstance(other_jti, AssertionIdentity)
+    assert other_jti.replay_key != identity.replay_key
+    teamless = await _identity(_redemption(_assertion(scope=""), team_id=None))
+    assert isinstance(teamless, AssertionIdentity)
+    assert (teamless.team_id, teamless.scope, teamless.allowed_routes) == (None, None, None)
+
+
+@pytest.mark.asyncio
+async def test_a_requesting_app_the_operator_did_not_allowlist_learns_nothing_about_the_assertion():
+    verifier, resolver = _Verifier(), _Resolver()
+    refused = await _identity(_redemption(_assertion(), client_id="0oa-stranger"), verifier, resolver)
+    assert refused == SubjectTokenRefusal(
+        error="invalid_client", description="client_id is not an allowlisted requesting app"
+    )
+    assert verifier.calls == ()
+    assert resolver.calls == ()
+
+
+def _basic(client_id: str, secret: str) -> str:
+    return "Basic " + b64encode(f"{client_id}:{secret}".encode()).decode()
+
+
+@pytest.mark.parametrize(
+    "client_secret, authorization, accepted",
+    [
+        (None, None, False),
+        ("wrong", None, False),
+        ("s3cr\u00e9t", None, False),
+        ("s3cret", None, True),
+        (None, _basic(CONFIDENTIAL_APP.client_id, "s3cr\u00e9t"), False),
+        (None, _basic(CONFIDENTIAL_APP.client_id, "s3cret"), True),
+        (None, _basic(CONFIDENTIAL_APP.client_id, "wrong"), False),
+        (None, _basic(PUBLIC_APP.client_id, "s3cret"), False),
+        ("s3cret", _basic(CONFIDENTIAL_APP.client_id, "wrong"), False),
+        (None, "Basic not-base64!", False),
+        (None, "Bearer s3cret", False),
+    ],
+)
+@pytest.mark.asyncio
+async def test_a_confidential_app_must_authenticate_with_its_secret(client_secret, authorization, accepted):
+    verifier = _Verifier()
+    assertion = _assertion(client_id=CONFIDENTIAL_APP.client_id)
+    redemption = _redemption(assertion, CONFIDENTIAL_APP.client_id, client_secret, authorization)
+    identity = await _identity(redemption, verifier)
+    if accepted:
+        assert isinstance(identity, AssertionIdentity)
+        return
+    assert identity == SubjectTokenRefusal(error="invalid_client", description="client authentication failed")
+    assert verifier.calls == ()
+
+
+@pytest.mark.parametrize(
+    "client_secret, authorization, accepted",
+    [
+        ("app secret", None, True),
+        (None, "Basic " + b64encode(b"0oa+spaced:app+secret").decode(), True),
+        (None, "Basic " + b64encode(b"0oa%20spaced:app%20secret").decode(), True),
+        (None, "Basic " + b64encode(b"0oa spaced:app secret").decode(), True),
+        (None, "Basic " + b64encode(b"0oa+spaced:app+wrong").decode(), False),
+        (None, "Basic " + b64encode(b"0oa-spaced:app+secret").decode(), False),
+    ],
+)
+@pytest.mark.asyncio
+async def test_basic_credentials_are_form_decoded_so_a_space_in_an_id_or_secret_still_matches(
+    client_secret, authorization, accepted
+):
+    """RFC 6749 section 2.3.1 form-encodes the id and secret before base64, so ``+`` is a space. The
+    endpoint hands over the ``client_id`` it read from the header, so the header must name the same app."""
+    assertion = _assertion(client_id=SPACED_APP.client_id)
+    identity = await _identity(_redemption(assertion, SPACED_APP.client_id, client_secret, authorization), _Verifier())
+    if accepted:
+        assert isinstance(identity, AssertionIdentity)
+        return
+    assert identity == SubjectTokenRefusal(error="invalid_client", description="client authentication failed")
+
+
+@pytest.mark.asyncio
+async def test_a_public_app_is_identified_by_client_id_alone():
+    identity = await _identity(_redemption(_assertion(), client_secret="anything", authorization="Bearer x"))
+    assert isinstance(identity, AssertionIdentity)
+
+
+@pytest.mark.parametrize(
+    "assertion, description",
+    [
+        ("not-a-jwt", "assertion is not a JWT"),
+        (_assertion(typ="JWT"), f"assertion typ must be {ID_JAG_TYP}"),
+        (_assertion(typ="at+jwt"), f"assertion typ must be {ID_JAG_TYP}"),
+    ],
+)
+@pytest.mark.asyncio
+async def test_a_bearer_or_id_token_is_not_an_id_jag(assertion, description):
+    verifier = _Verifier()
+    refused = await _identity(_redemption(assertion), verifier)
+    assert refused == SubjectTokenRefusal(error="invalid_grant", description=description)
+    assert verifier.calls == ()
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "verifier, reason",
+    [
+        (_Verifier(result=AssertionRejection(reason="Signature verification failed")), "Signature verification"),
+        (_Verifier(result=AssertionRejection(reason="Audience doesn't match")), "Audience"),
+        (_Verifier(result=AssertionRejection(reason='Token is missing the "jti" claim')), "jti"),
+        (_Verifier(result=AssertionRejection(reason="Signature has expired")), "expired"),
+        (_Verifier(result=AssertionRejection(reason="iss is not an issuer this gateway trusts")), "iss"),
+        (_Verifier(raises=Exception("Validation fails: Invalid audience")), "Invalid audience"),
+        (_Verifier(result=AssertionRejection(reason="bad kid\nWARNING forged line")), "bad kid WARNING forged line"),
+    ],
+)
+async def test_an_assertion_the_verifier_rejects_is_refused_with_the_reason_kept_in_the_log(verifier, reason, caplog):
+    resolver = _Resolver()
+    with caplog.at_level(logging.WARNING, logger="litellm.proxy"):
+        refused = await _identity(_redemption(_assertion()), verifier, resolver)
+    assert refused == SubjectTokenRefusal(error="invalid_grant", description=REJECTED_ASSERTION)
+    assert reason not in refused.description
+    assert reason in caplog.text
+    assert resolver.calls == ()
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "claims, reason",
+    [
+        ({"client_id": "0oa-confidential"}, "client_id"),
+        ({"exp": NOW}, "expired"),
+        ({"exp": NOW - 1}, "expired"),
+        ({"jti": ""}, "jti"),
+        ({"jti": 7}, "jti"),
+        ({"iss": None}, "iss"),
+        ({"cnf": {"jkt": "thumbprint"}}, "proof"),
+    ],
+)
+async def test_verified_claims_that_do_not_fit_the_profile_are_refused(claims, reason, caplog):
+    resolver = _Resolver()
+    with caplog.at_level(logging.WARNING, logger="litellm.proxy"):
+        refused = await _identity(_redemption(_assertion()), _Verifier(result=_claims(**claims)), resolver)
+    assert refused == SubjectTokenRefusal(error="invalid_grant", description=REJECTED_ASSERTION)
+    assert reason in caplog.text
+    assert resolver.calls == ()
+
+
+@pytest.mark.asyncio
+async def test_an_assertion_that_names_no_user_the_gateway_knows_cannot_be_redeemed(caplog):
+    with caplog.at_level(logging.WARNING, logger="litellm.proxy"):
+        refused = await _identity(_redemption(_assertion()), resolver=_Resolver(user_id=None))
+    assert refused == SubjectTokenRefusal(error="invalid_grant", description=REJECTED_ASSERTION)
+    assert "names no user" in caplog.text
+    missing = await _identity(
+        _redemption(_assertion()), resolver=_Resolver(raises=ValueError("User doesn't exist in db. 'user_id'=u1"))
+    )
+    assert missing == SubjectTokenRefusal(error="invalid_grant", description=REJECTED_ASSERTION)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "verifier, resolver",
+    [
+        (_Verifier(raises=JWKS_DOWN), _Resolver()),
+        (_Verifier(), _Resolver(raises=HTTPException(status_code=503, detail="database unavailable"))),
+    ],
+)
+async def test_a_gateway_outage_is_reported_as_retryable_not_as_a_bad_assertion(verifier, resolver):
+    refused = await _identity(_redemption(_assertion()), verifier, resolver)
+    assert isinstance(refused, SubjectTokenRefusal)
+    assert refused.error == "temporarily_unavailable"
+    assert "retry" in refused.description
+    assert "assertion" in refused.description
+    assert "subject_token" not in refused.description
+
+
+@pytest.mark.parametrize(
+    "unmet, description",
+    [
+        ({"jwt_auth_enabled": False}, "JWT auth is not enabled"),
+        ({"has_database": False}, "no database"),
+        ({"licensed": False}, "enterprise only"),
+        ({"maps_jwts_to_virtual_keys": True}, "maps IdP tokens to virtual keys"),
+        ({"shared_replay_store": False}, "Redis"),
+        ({"base_url": None}, "PROXY_BASE_URL"),
+        ({"requesting_apps": ()}, "no requesting apps allowlisted"),
+    ],
+)
+@pytest.mark.asyncio
+async def test_the_deployment_gates_refuse_before_any_verification(unmet, description):
+    verifier = _Verifier()
+    refused = await _identity(_redemption(_assertion()), verifier, **unmet)
+    assert isinstance(refused, SubjectTokenRefusal)
+    assert refused.error == "unsupported_grant_type"
+    assert description in refused.description
+    assert verifier.calls == ()
+    assert IdJagPrerequisites(**{**EVERY_GATE_HOLDS, **unmet}).available is False
+    assert IdJagPrerequisites(**EVERY_GATE_HOLDS).available is True
+
+
+def _running_jwt_handler(litellm_jwtauth: LiteLLM_JWTAuth | None) -> JWTHandler:
+    handler: Final = JWTHandler()
+    if litellm_jwtauth is not None:
+        handler.update_environment(prisma_client=None, user_api_key_cache=DualCache(), litellm_jwtauth=litellm_jwtauth)
+    return handler
+
+
+@pytest.mark.parametrize(
+    "general_settings, prisma_client, premium_user, litellm_jwtauth, expected",
+    [
+        ({"enable_jwt_auth": True}, object(), True, LiteLLM_JWTAuth(id_jag_requesting_apps=[PUBLIC_APP]), True),
+        (
+            {"enable_jwt_auth": True, "redis": None},
+            object(),
+            True,
+            LiteLLM_JWTAuth(id_jag_requesting_apps=[PUBLIC_APP]),
+            False,
+        ),
+        (
+            {"enable_jwt_auth": True, "base_url": ""},
+            object(),
+            True,
+            LiteLLM_JWTAuth(id_jag_requesting_apps=[PUBLIC_APP]),
+            False,
+        ),
+        ({"enable_jwt_auth": True}, object(), True, LiteLLM_JWTAuth(id_jag_requesting_apps=[]), False),
+        (
+            {"enable_jwt_auth": True},
+            object(),
+            True,
+            LiteLLM_JWTAuth(id_jag_requesting_apps=[PUBLIC_APP], virtual_key_claim_field="vkey"),
+            False,
+        ),
+        ({"enable_jwt_auth": True}, object(), True, LiteLLM_JWTAuth(), False),
+        ({"enable_jwt_auth": True}, object(), True, None, False),
+        ({}, object(), True, LiteLLM_JWTAuth(id_jag_requesting_apps=[PUBLIC_APP]), False),
+        ({"enable_jwt_auth": True}, None, True, LiteLLM_JWTAuth(id_jag_requesting_apps=[PUBLIC_APP]), False),
+        ({"enable_jwt_auth": True}, object(), False, LiteLLM_JWTAuth(id_jag_requesting_apps=[PUBLIC_APP]), False),
+    ],
+)
+def test_availability_is_read_from_the_running_proxy(
+    monkeypatch, general_settings, prisma_client, premium_user, litellm_jwtauth, expected
+):
+    monkeypatch.setenv("PROXY_BASE_URL", general_settings.get("base_url", "https://gateway.example.com"))
+    monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", general_settings)
+    monkeypatch.setattr("litellm.proxy.proxy_server.prisma_client", prisma_client)
+    monkeypatch.setattr("litellm.proxy.proxy_server.premium_user", premium_user)
+    monkeypatch.setattr("litellm.proxy.proxy_server.redis_usage_cache", general_settings.get("redis", object()))
+    monkeypatch.setattr("litellm.proxy.proxy_server.jwt_handler", _running_jwt_handler(litellm_jwtauth))
+    assert jwt_bearer_available() is expected
+
+
+def test_the_assertion_audience_is_the_fixed_gateway_url_not_the_request_host():
+    """An ID-JAG must name this gateway's MCP resource or its authorization server under the
+    operator-fixed PROXY_BASE_URL. Without it there is no audience, so there is no grant."""
+    assert gateway_audiences("https://gateway.example.com") == (
+        "https://gateway.example.com/mcp",
+        "https://gateway.example.com",
+    )
+    assert gateway_audiences(None) == ()
+
+
+@pytest.mark.asyncio
+async def test_a_team_the_subject_lookup_cannot_settle_is_refused_before_the_assertion_is_consumed():
+    """The resolver's refusal (a user on several teams who named none, or a header naming a team
+    they are not on) comes back as is, so the client fixes its request and presents the same
+    assertion again instead of finding its jti burned."""
+    refusal = SubjectTokenRefusal(error="invalid_request", description=f"send the {TEAM_HEADER} header")
+    refused = await _identity(_redemption(_assertion()), resolver=_Resolver(result=refusal))
+    assert refused is refusal
+    teamed = await _identity(
+        _redemption(_assertion()), resolver=_Resolver(result=SubjectIdentity(user_id="u1", team_id="t9"))
+    )
+    assert isinstance(teamed, AssertionIdentity)
+    assert teamed.team_id == "t9"
+
+
+ENG = ConsentTeam(team_id="team-eng", team_alias="engineering")
+OPS = ConsentTeam(team_id="team-ops", team_alias=None)
+
+
+@pytest.mark.parametrize(
+    "team_header, claim_teams, teams, expected",
+    [
+        (None, (), (), None),
+        (None, (), (ENG,), "team-eng"),
+        ("team-eng", (), (ENG, OPS), "team-eng"),
+        ("engineering", (), (ENG, OPS), "team-eng"),
+        ("team-ops", ("team-eng",), (ENG, OPS), "team-ops"),
+        (None, ("team-ops",), (ENG, OPS), "team-ops"),
+        (None, ("team-sales", "team-ops"), (ENG, OPS), "team-ops"),
+        (None, ("0oa-xaa-public-app",), (ENG,), "team-eng"),
+        (None, ("0oa-xaa-public-app",), (), None),
+    ],
+)
+def test_select_team_prefers_the_header_then_the_assertion_then_the_only_team(
+    team_header, claim_teams, teams, expected
+):
+    assert select_team(team_header, claim_teams, teams) == expected
+
+
+class _Reader:
+    def __init__(self, user_id=None, email=None, team_ids=(), allowed_domain=None):
+        self.user_id, self.email, self.team_ids, self.allowed_domain = user_id, email, team_ids, allowed_domain
+
+    def is_allowed_domain(self, user_email):
+        return self.allowed_domain is None or user_email.split("@")[-1] == self.allowed_domain
+
+    def get_user_id(self, token, default_value):
+        return self.user_id or default_value
+
+    def get_user_email(self, token, default_value):
+        return self.email or default_value
+
+    def get_all_jwt_team_ids(self, token):
+        return list(self.team_ids)
+
+
+async def _known_user(user_id: str, user_email: str | None) -> str | None:
+    return user_id if user_id in {"okta-user-1", "u-mapped"} else None
+
+
+async def _two_teams(user_id: str) -> tuple[ConsentTeam, ...]:
+    return (ENG, OPS)
+
+
+async def _teams_unreadable(user_id: str) -> ReloadUserFailure:
+    return "unavailable"
+
+
+def _teams_failing(failure: ReloadUserFailure) -> LookupTeams:
+    async def lookup_teams(user_id: str) -> tuple[ConsentTeam, ...] | ReloadUserFailure:
+        return failure
+
+    return lookup_teams
+
+
+@pytest.mark.asyncio
+async def test_the_subject_resolver_binds_the_claims_to_a_known_user_and_their_asserted_team():
+    """The user comes from the JWT auth user mapping, else ``sub``, and must exist. The team the
+    assertion asserts settles a multi-team user, the header still wins, and unreadable teams are a
+    retryable refusal rather than a credential for the wrong team."""
+    asserted = subject_resolver(_Reader(team_ids=("team-ops",)), _known_user, _two_teams)
+    assert await asserted(_claims(), None) == SubjectIdentity(user_id="okta-user-1", team_id="team-ops")
+    assert await asserted(_claims(), "team-eng") == SubjectIdentity(user_id="okta-user-1", team_id="team-eng")
+    mapped = subject_resolver(_Reader(user_id="u-mapped", email="m@example.com"), _known_user, _two_teams)
+    assert await mapped(_claims(), "engineering") == SubjectIdentity(user_id="u-mapped", team_id="team-eng")
+    unknown = subject_resolver(_Reader(), _known_user, _two_teams)
+    assert await unknown(_claims(sub="nobody"), None) is None
+    unreadable = await subject_resolver(_Reader(), _known_user, _teams_unreadable)(_claims(), None)
+    assert isinstance(unreadable, SubjectTokenRefusal)
+    assert unreadable.error == "temporarily_unavailable"
+
+
+@pytest.mark.parametrize("failure", ["no_active_key", "unresolvable"])
+@pytest.mark.asyncio
+async def test_a_blocked_or_unmapped_user_is_a_bad_grant_not_an_outage_to_retry(failure):
+    """A deactivated user, or one the resolver cannot map, can retry forever and never succeed, so
+    the refusal is invalid_grant. Only a database the gateway could not reach is retryable."""
+    refused = await subject_resolver(_Reader(), _known_user, _teams_failing(failure))(_claims(), None)
+    assert isinstance(refused, SubjectTokenRefusal)
+    assert refused.error == "invalid_grant"
+    assert "retry" not in refused.description
+    outage = await subject_resolver(_Reader(), _known_user, _teams_failing("faulted"))(_claims(), None)
+    assert isinstance(outage, SubjectTokenRefusal)
+    assert outage.error == "temporarily_unavailable"
+
+
+def test_the_assertion_team_claims_ignore_team_id_default():
+    """``team_id_default`` is how bearer JWT auth picks a team for a request, not a claim the
+    assertion made, so a user outside that team must still get their only team or no team."""
+    handler = JWTHandler()
+    handler.litellm_jwtauth = LiteLLM_JWTAuth(team_id_default="default-team")
+    claim_teams = tuple(_claim_reader(handler).get_all_jwt_team_ids(token={"iss": ISSUER, "sub": "u1"}))
+    assert claim_teams == ()
+    assert select_team(None, claim_teams, (ENG,)) == "team-eng"
+    assert select_team(None, claim_teams, ()) is None
+
+
+@pytest.mark.parametrize(
+    "team_header, claim_teams, teams, error, mention",
+    [
+        ("team-sales", (), (ENG, OPS), "invalid_request", TEAM_HEADER),
+        ("engineering", (), (), "invalid_request", TEAM_HEADER),
+        (None, (), (ENG, OPS), "invalid_request", TEAM_HEADER),
+        (None, ("team-eng", "team-ops"), (ENG, OPS), "invalid_request", TEAM_HEADER),
+        (None, ("0oa-xaa-public-app",), (ENG, OPS), "invalid_request", TEAM_HEADER),
+    ],
+)
+def test_select_team_refuses_a_team_the_user_is_not_on_or_an_unnamed_choice(
+    team_header, claim_teams, teams, error, mention
+):
+    refused = select_team(team_header, claim_teams, teams)
+    assert isinstance(refused, SubjectTokenRefusal)
+    assert refused.error == error
+    assert mention in refused.description
+
+
+@pytest.mark.parametrize(
+    "authorization, expected",
+    [
+        (None, None),
+        ("Bearer abc", None),
+        ("Basic not-base64!", None),
+        (_basic("0oa-confidential", "s3cret"), "0oa-confidential"),
+        ("basic " + b64encode(b"0oa%20x:s3cret").decode(), "0oa x"),
+        ("Basic " + b64encode(b"0oa+x:s3cret").decode(), "0oa x"),
+        ("Basic " + b64encode(b"no-separator").decode(), None),
+    ],
+)
+def test_basic_client_id_reads_the_app_from_the_authorization_header(authorization, expected):
+    assert basic_client_id(authorization) == expected
+
+
+MCP_ROUTE_GROUPS = ("mcp_inference_routes",)
+LLM_ROUTE_GROUPS = ("llm_api_routes_without_mcp",)
+
+
+@pytest.mark.parametrize(
+    "claim, scope, allowed_routes",
+    [
+        (None, None, None),
+        ("", None, None),
+        ("litellm:mcp", "litellm:mcp", MCP_ROUTE_GROUPS),
+        ("litellm:llm", "litellm:llm", LLM_ROUTE_GROUPS),
+        ("litellm:mcp litellm:llm", "litellm:mcp litellm:llm", MCP_ROUTE_GROUPS + LLM_ROUTE_GROUPS),
+        ("litellm:llm  litellm:mcp litellm:llm", "litellm:mcp litellm:llm", MCP_ROUTE_GROUPS + LLM_ROUTE_GROUPS),
+    ],
+)
+def test_the_scope_claim_buys_exactly_the_route_groups_it_names(claim, scope, allowed_routes):
+    """``litellm:mcp`` is the MCP gateway's data-plane routes, ``litellm:llm`` the LLM API routes
+    without their MCP members, both together are both, and no claim is the full credential. The
+    scope echoed back is canonical: deduplicated, in vocabulary order, so it is exactly what is
+    enforced. Every group named must be one the route check resolves."""
+    granted = granted_scope(claim, mcp_resource=False)
+    assert (granted.scope, granted.allowed_routes) == (scope, allowed_routes)
+    if allowed_routes is not None:
+        assert set(allowed_routes) <= set(LiteLLMRoutes._member_names_)
+        mcp_members = set(LiteLLMRoutes.mcp_inference_routes.value)
+        llm_members = set().union(*(LiteLLMRoutes[group].value for group in LLM_ROUTE_GROUPS))
+        assert "/chat/completions" in llm_members and "/mcp" not in llm_members
+        assert "/mcp" in mcp_members and "/chat/completions" not in mcp_members
+
+
+@pytest.mark.parametrize("claim", ["openid", "litellm:mcp openid", "litellm:admin", 7, ["litellm:mcp"]])
+@pytest.mark.asyncio
+async def test_a_scope_the_gateway_does_not_know_is_refused_as_invalid_scope_before_any_lookup(claim):
+    refusal = granted_scope(claim, mcp_resource=False)
+    assert isinstance(refusal, SubjectTokenRefusal)
+    assert refusal.error == "invalid_scope"
+    assert "litellm:mcp" in refusal.description and "litellm:llm" in refusal.description
+    resolver = _Resolver()
+    refused = await _identity(_redemption(_assertion()), _Verifier(result=_claims(scope=claim)), resolver)
+    assert refused == refusal
+    assert resolver.calls == ()
+
+
+@pytest.mark.asyncio
+async def test_a_linked_sso_account_resolves_by_its_provider_subject_without_an_email_claim():
+    """An SSO login stores the provider subject as ``sso_user_id`` on a user whose ``user_id`` is
+    something else, so the lookup must offer the subject as both, with no email to fall back on."""
+    from litellm.models.user import LiteLLM_UserTable
+
+    async def get_user(*, user_id, user_email, sso_user_id):
+        if sso_user_id == "00u-okta-subject" and user_email is None:
+            return LiteLLM_UserTable(user_id="local-user-7", user_email=None)
+        return None
+
+    lookup = proxy_user_lookup(get_user)
+    assert await lookup("00u-okta-subject", None) == "local-user-7"
+    assert await lookup("nobody", None) is None
+
+
+@pytest.mark.parametrize("email", ["eve@evil.example", None])
+@pytest.mark.asyncio
+async def test_the_allowed_email_domain_gates_the_assertions_subject_like_bearer_jwt_auth(email):
+    """With ``user_allowed_email_domain`` set, bearer JWT auth refuses an identity whose email is
+    outside the domain or missing. An assertion for an existing user gets the same refusal before
+    any lookup, as invalid_grant, and a matching email still resolves."""
+    refused = await subject_resolver(_Reader(email=email, allowed_domain="corp.example"), _known_user, _two_teams)(
+        _claims(), "team-eng"
+    )
+    assert isinstance(refused, SubjectTokenRefusal)
+    assert refused.error == "invalid_grant"
+    allowed = subject_resolver(
+        _Reader(email="ann@corp.example", allowed_domain="corp.example"), _known_user, _two_teams
+    )
+    assert await allowed(_claims(), "team-eng") == SubjectIdentity(user_id="okta-user-1", team_id="team-eng")
+
+
+@pytest.mark.parametrize("claim", [None, "", "litellm:mcp", "litellm:mcp litellm:mcp"])
+def test_an_assertion_for_the_mcp_resource_is_ceilinged_to_the_mcp_routes(claim):
+    """``aud = {base}/mcp`` means the identity provider named the MCP resource, so no scope or
+    ``litellm:mcp`` both mint an MCP-only credential and echo ``litellm:mcp``."""
+    granted = granted_scope(claim, mcp_resource=True)
+    assert granted == GrantedScope(scope="litellm:mcp", allowed_routes=("mcp_inference_routes",))
+
+
+@pytest.mark.parametrize("claim", ["litellm:llm", "litellm:mcp litellm:llm"])
+def test_llm_routes_cannot_be_granted_under_the_mcp_resource_audience(claim):
+    refusal = granted_scope(claim, mcp_resource=True)
+    assert isinstance(refusal, SubjectTokenRefusal)
+    assert refusal.error == "invalid_scope"
+    assert "/mcp audience" in refusal.description and "bare origin" in refusal.description
+
+
+@pytest.mark.parametrize(
+    "aud, expected",
+    [
+        (AUDIENCES[0], True),
+        (AUDIENCES[1], False),
+        ([AUDIENCES[0]], True),
+        ([AUDIENCES[0], AUDIENCES[1]], False),
+        ("https://other.example", False),
+        (None, False),
+    ],
+)
+def test_the_mcp_resource_audience_is_the_mcp_path_without_the_bare_origin(aud, expected):
+    assert names_mcp_resource(aud, GATEWAY) is expected
+    assert names_mcp_resource(aud, None) is False
+
+
+@pytest.mark.asyncio
+async def test_redeeming_for_the_mcp_resource_narrows_the_identity_and_refuses_llm_scope():
+    """End to end through identity_from_id_jag: the same verified claims, with ``aud`` the MCP
+    resource, come out ceilinged, and asking for LLM routes under that audience is a scope error."""
+    narrowed = await _identity(_redemption(_assertion(aud=AUDIENCES[0])), _Verifier(), _Resolver())
+    assert isinstance(narrowed, AssertionIdentity)
+    assert (narrowed.scope, narrowed.allowed_routes) == ("litellm:mcp", ("mcp_inference_routes",))
+    refused = await _identity(_redemption(_assertion(aud=AUDIENCES[0], scope="litellm:llm")), _Verifier(), _Resolver())
+    assert isinstance(refused, SubjectTokenRefusal)
+    assert refused.error == "invalid_scope"
+    unscoped = jwt.encode(
+        {key: value for key, value in _claims(aud=AUDIENCES[1]).items() if key != "scope"},
+        "unused-by-the-fake-verifier-but-long-enough-for-hs256",
+        algorithm="HS256",
+        headers={"typ": ID_JAG_TYP},
+    )
+    full = await _identity(_redemption(unscoped), _Verifier(), _Resolver())
+    assert isinstance(full, AssertionIdentity)
+    assert (full.scope, full.allowed_routes) == (None, None)
+    scoped = await _identity(_redemption(_assertion(aud=AUDIENCES[1], scope="litellm:llm")), _Verifier(), _Resolver())
+    assert isinstance(scoped, AssertionIdentity)
+    assert scoped.scope == "litellm:llm"
diff --git a/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py b/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py
index 536c1eb0b44..40901d1dd96 100644
--- a/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py
+++ b/tests/unit/proxy/_experimental/mcp_server/test_mcp_server_manager.py
@@ -1641,9 +1641,10 @@ class TestMCPServerManager:
         assert server.oauth2_flow is None
 
     @pytest.mark.asyncio
-    async def test_load_servers_from_config_warns_for_id_jag_with_google_sso(self, monkeypatch, caplog):
+    async def test_load_servers_from_config_is_silent_for_id_jag_with_saml_sso(self, monkeypatch, caplog):
+        """A SAML login retains the signed assertion as the saml2 subject token, so SAML is not a gap."""
         self._clear_sso_env(monkeypatch)
-        monkeypatch.setenv("GOOGLE_CLIENT_ID", "google-cid")
+        monkeypatch.setenv("SAML_IDP_METADATA_URL", "https://idp.example.com/metadata")
         manager = MCPServerManager()
         with (
             patch.object(manager, "_descovery_metadata", new=AsyncMock(return_value=None)),
@@ -1652,10 +1653,25 @@ class TestMCPServerManager:
         ):
             await manager.load_servers_from_config(self._id_jag_config())
 
-        warnings = [message for message in caplog.messages if "oauth2_id_jag" in message]
-        assert len(warnings) == 1
-        assert "idjag_server" in warnings[0]
-        assert "GENERIC_CLIENT_ID" in warnings[0]
+        assert [message for message in caplog.messages if "oauth2_id_jag" in message] == []
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize("client_id_env", ["GOOGLE_CLIENT_ID", "MICROSOFT_CLIENT_ID", "GENERIC_CLIENT_ID"])
+    async def test_load_servers_from_config_is_silent_for_id_jag_under_oidc_logins(
+        self, monkeypatch, caplog, client_id_env
+    ):
+        """Every OIDC login captures the IdP id_token an id_jag server spends, so none of them is a gap."""
+        self._clear_sso_env(monkeypatch)
+        monkeypatch.setenv(client_id_env, "cid")
+        manager = MCPServerManager()
+        with (
+            patch.object(manager, "_descovery_metadata", new=AsyncMock(return_value=None)),
+            patch.object(manager, "hydrate_config_servers_dcr_clients", new=AsyncMock()),
+            caplog.at_level(logging.WARNING, logger="LiteLLM"),
+        ):
+            await manager.load_servers_from_config(self._id_jag_config())
+
+        assert not any("oauth2_id_jag" in message for message in caplog.messages)
 
     @pytest.mark.asyncio
     async def test_load_servers_from_config_does_not_warn_for_id_jag_without_sso(self, monkeypatch, caplog):
diff --git a/tests/unit/proxy/_experimental/mcp_server/test_proxy_api_credentials.py b/tests/unit/proxy/_experimental/mcp_server/test_proxy_api_credentials.py
index 8484dfdde72..f39aec82c3e 100644
--- a/tests/unit/proxy/_experimental/mcp_server/test_proxy_api_credentials.py
+++ b/tests/unit/proxy/_experimental/mcp_server/test_proxy_api_credentials.py
@@ -1,15 +1,21 @@
 """Tests for minting the ``lite login`` credential from a consented native-client grant."""
 
-from unittest.mock import ANY, AsyncMock, MagicMock
+from unittest.mock import ANY, AsyncMock, MagicMock, patch
 
 import pytest
+from fastapi import HTTPException
 
 from litellm.constants import CLI_JWT_EXPIRATION_HOURS
 from litellm.models.user import LiteLLM_UserTable
 from litellm.proxy._experimental.mcp_server.gateway_dcr_flow import ConsentTeam, MintedProxyCredential
-from litellm.proxy._experimental.mcp_server.proxy_api_credentials import lookup_consent_teams, mint_proxy_credential
+from litellm.proxy._experimental.mcp_server.proxy_api_credentials import (
+    lookup_consent_teams,
+    lookup_consent_teams_from_database,
+    mint_proxy_credential,
+)
 from litellm.proxy._types import LitellmUserRoles
 from litellm.proxy.auth.auth_checks import ExperimentalUIJWTToken
+from litellm.proxy.auth.route_checks import RouteChecks
 from litellm.proxy.common_utils.user_api_key_cache import UserApiKeyCache
 from litellm.proxy.management_endpoints.ui_sso import CliSsoTeamDetail
 
@@ -235,3 +241,82 @@ async def test_lookup_consent_teams_passes_user_lookup_failures_through(failure,
 async def test_lookup_consent_teams_reports_unavailable_when_details_cannot_load(load_user, fetch_teams):
     fetch_teams.return_value = None
     assert await lookup_consent_teams("u1") == "unavailable"
+
+
+def _route_status(minted: MintedProxyCredential, route: str, method: str | None = None) -> int:
+    request = None if method is None else MagicMock(method=method)
+    try:
+        RouteChecks.is_virtual_key_allowed_to_call_route(route=route, valid_token=_decoded(minted), request=request)
+    except HTTPException as refused:
+        return refused.status_code
+    return 200
+
+
+@pytest.mark.parametrize(
+    "allowed_routes, chat_completions, mcp",
+    [
+        (None, True, True),
+        (("mcp_inference_routes",), False, True),
+        (("llm_api_routes_without_mcp",), True, False),
+        (("mcp_inference_routes", "llm_api_routes_without_mcp"), True, True),
+    ],
+    ids=["full credential", "mcp only", "llm only", "both"],
+)
+@pytest.mark.asyncio
+async def test_mint_narrows_the_credential_to_the_allowed_routes_the_route_check_enforces(
+    load_user, fetch_teams, allowed_routes, chat_completions, mcp
+):
+    """The allowed_routes a grant's scope resolved to ride inside the credential, so the same route
+    check a virtual key goes through on every request refuses /chat/completions for an MCP-only
+    credential and /mcp for an LLM-only one, and a credential minted without them is unchanged."""
+    minted = await mint_proxy_credential("u1", "team-a", allowed_routes=allowed_routes)
+    assert isinstance(minted, MintedProxyCredential)
+    assert _decoded(minted).allowed_routes == list(allowed_routes or ())
+    chat_status, mcp_status = (200 if chat_completions else 403), (200 if mcp else 403)
+    assert _route_status(minted, "/chat/completions") == chat_status
+    assert _route_status(minted, "/v1/chat/completions") == chat_status
+    assert _route_status(minted, "/mcp") == mcp_status
+    assert _route_status(minted, "/mcp/tools/call") == mcp_status
+
+
+@pytest.mark.asyncio
+async def test_lookup_consent_teams_from_database_reads_the_row_the_minter_will_recheck(load_user, fetch_teams):
+    """A grant consumed once a team is picked must pick it from the same membership the minter re-reads,
+    or a stale cache would burn the assertion on a request the caller could have fixed."""
+    teams = await lookup_consent_teams_from_database("u1")
+    load_user.assert_awaited_once_with("u1", source="database")
+    assert teams == (ConsentTeam(team_id="team-a", team_alias="Team A"), ConsentTeam(team_id="team-b"))
+
+
+@pytest.mark.parametrize(
+    "allowed_routes, registered_pass_through, auto_router_session, mcp_server_listing, agent_registry",
+    [
+        (("llm_api_routes",), 200, 200, 200, 200),
+        (("llm_api_routes_without_mcp",), 200, 200, 403, 403),
+        (("mcp_inference_routes",), 403, 403, 403, 403),
+    ],
+    ids=["llm_api_routes key", "llm only", "mcp only"],
+)
+@pytest.mark.asyncio
+async def test_an_llm_only_credential_keeps_the_llm_api_carve_outs_except_mcp_discovery(
+    load_user,
+    fetch_teams,
+    allowed_routes,
+    registered_pass_through,
+    auto_router_session,
+    mcp_server_listing,
+    agent_registry,
+):
+    """Operator-registered pass-through endpoints and the auto-router session read are LLM API
+    surface that only the ``llm_api_routes`` group used to reach, so an LLM-only credential keeps
+    them, while the MCP server listing that group also carves out stays MCP surface."""
+    minted = await mint_proxy_credential("u1", "team-a", allowed_routes=allowed_routes)
+    assert isinstance(minted, MintedProxyCredential)
+    with patch(
+        "litellm.proxy.pass_through_endpoints.pass_through_endpoints.InitPassThroughEndpointHelpers.is_registered_pass_through_route",
+        side_effect=lambda route: route.startswith("/my-llm-endpoint"),
+    ):
+        assert _route_status(minted, "/my-llm-endpoint/v1/chat", "POST") == registered_pass_through
+    assert _route_status(minted, "/auto_router/session", "GET") == auto_router_session
+    assert _route_status(minted, "/v1/mcp/server", "GET") == mcp_server_listing
+    assert _route_status(minted, "/v1/agents", "GET") == agent_registry
diff --git a/tests/unit/proxy/_experimental/mcp_server/test_subscriptions.py b/tests/unit/proxy/_experimental/mcp_server/test_subscriptions.py
index a5d42e58b99..a97ab04c506 100644
--- a/tests/unit/proxy/_experimental/mcp_server/test_subscriptions.py
+++ b/tests/unit/proxy/_experimental/mcp_server/test_subscriptions.py
@@ -1,4 +1,5 @@
 import asyncio
+from types import SimpleNamespace
 from typing import Final
 from unittest.mock import AsyncMock, Mock
 
@@ -19,6 +20,21 @@ from litellm.types.mcp import MCPTransport
 from litellm.types.mcp_server.mcp_server_manager import MCPServer
 
 
+def allow_one_request(monkeypatch: pytest.MonkeyPatch, user_id: str, server_id: str) -> None:
+    from litellm.proxy import proxy_server
+    from litellm.proxy.common_utils.proxy_rate_limit_error import ProxyRateLimitError
+
+    windows: Final = {(user_id, server_id): asyncio.Semaphore(1)}
+
+    async def enforce(user: UserAPIKeyAuth | None, server: MCPServer) -> None:
+        window: Final = windows[(user.user_id if user is not None else None, server.server_id)]
+        if window.locked():
+            raise ProxyRateLimitError(detail=f"{server_id} RPM exceeded")
+        await window.acquire()
+
+    monkeypatch.setattr(proxy_server, "proxy_logging_obj", SimpleNamespace(enforce_mcp_server_rate_limits=enforce))
+
+
 def context(session: ServerSession, revision: str = "2026-07-28") -> ServerRequestContext:
     return ServerRequestContext(
         session=session,
@@ -356,3 +372,117 @@ async def test_proxy_route_rejects_legacy_resource_subscription_before_setup(met
             await getattr(server, method)(context(Mock(spec=ServerSession)), params)
     finally:
         server._mcp_proxy_mode.reset(token)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("client_requests", "tools_list_admitted"),
+    [((), True), (("subscriptions/listen",), False), (("resources/subscribe",), False)],
+)
+async def test_only_client_initiated_listeners_consume_server_rate_limit(
+    monkeypatch: pytest.MonkeyPatch, client_requests: tuple[str, ...], tools_list_admitted: bool
+) -> None:
+    from litellm.proxy._experimental.mcp_server import operations
+
+    allow_one_request(monkeypatch, "alice", "upstream")
+    opened: Final = asyncio.Queue[None]()
+
+    async def hold_upstream(*_: object, **__: object) -> None:
+        opened.put_nowait(None)
+        await asyncio.Event().wait()
+
+    client: Final = Mock(spec=MCPClient)
+    client.run_with_session = AsyncMock(side_effect=hold_upstream)
+    server: Final = MCPServer(server_id="upstream", name="upstream", url="http://localhost/mcp", transport="http")
+    target: Final = subscriptions.SubscriptionTarget(server, client, "synthetic-fingerprint")
+
+    async def resolve(_: OperationContext) -> tuple[subscriptions.SubscriptionTarget, ...]:
+        return (target,)
+
+    service: Final = subscriptions.GatewaySubscriptions(resolve_targets=resolve)
+    caller: Final = OperationContext(_caller=UserAPIKeyAuth(user_id="alice"))
+    authorize: Final = AsyncMock(return_value=caller)
+    session: Final = Mock(spec=ServerSession)
+    session.client_params = Mock()
+    legacy: Final = context(session, "2025-11-25")
+    requests: Final = {
+        "subscriptions/listen": lambda: service.listen(
+            context(Mock(spec=ServerSession)),
+            SubscriptionsListenRequestParams(notifications=SubscriptionFilter(tools_list_changed=True)),
+            authorize,
+            "alice",
+        ),
+        "resources/subscribe": lambda: service.legacy_resource(legacy, "test://value", subscribe=True),
+    }
+    authorization: Final = subscriptions.SubscriptionAuthorization(caller, authorize, lambda *_: "alice")
+    starts: Final = (lambda: service.legacy_session(legacy, authorization), *(requests[r] for r in client_requests))
+    tasks: Final = tuple(asyncio.create_task(start()) for start in starts)
+    try:
+        for _ in tasks:
+            await asyncio.wait_for(opened.get(), 1)
+        rejection: Final = await operations._mcp_server_rate_limit_rejection(server, caller.user_api_key_auth)
+        assert (rejection is None) is tools_list_admitted
+    finally:
+        for task in tasks:
+            task.cancel()
+        await asyncio.gather(*tasks, return_exceptions=True)
+
+
+@pytest.mark.asyncio
+async def test_legacy_listener_catalog_refreshes_do_not_consume_server_rate_limit(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    from mcp.types import ListToolsResult, ServerCapabilities, Tool, ToolsCapability
+
+    from litellm.proxy import proxy_server
+    from litellm.proxy._experimental.mcp_server import catalog, operations
+    from litellm.proxy._experimental.mcp_server.faults.list_outcomes import ServerListOk
+
+    server: Final = MCPServer(server_id="list-changed", name="list-changed", transport=MCPTransport.http)
+    caller: Final = UserAPIKeyAuth(api_key="list-changed-key", user_id="alice")
+    allow_one_request(monkeypatch, "alice", "list-changed")
+    listed: Final = asyncio.Queue[None]()
+
+    async def fetch_tools(_: MCPServer, **__: object) -> tuple[ListToolsResult, ServerListOk]:
+        listed.put_nowait(None)
+        return ListToolsResult(tools=[Tool(name="add", inputSchema={"type": "object"})]), ServerListOk(tool_count=1)
+
+    monkeypatch.setenv("LITELLM_SALT_KEY", "list-changed-test-key")
+    monkeypatch.setattr(proxy_server, "prisma_client", None)
+    monkeypatch.setattr(operations.global_mcp_server_manager, "registry", {server.server_id: server})
+    monkeypatch.setattr(operations, "_get_allowed_mcp_servers", AsyncMock(return_value=[server]))
+    monkeypatch.setattr(catalog, "get_filtered_server_tools", fetch_tools)
+
+    upstream: Final = Mock()
+    upstream.server_capabilities = ServerCapabilities(tools=ToolsCapability(list_changed=True))
+    upstream.protocol_version = "2025-11-25"
+    upstream.send_ping = AsyncMock()
+
+    async def run_with_session(connected, **_: object) -> None:
+        await connected(upstream)
+
+    client: Final = Mock(spec=MCPClient)
+    client.run_with_session = AsyncMock(side_effect=run_with_session)
+    target: Final = subscriptions.SubscriptionTarget(server, client, "synthetic-fingerprint")
+
+    async def resolve(_: OperationContext) -> tuple[subscriptions.SubscriptionTarget, ...]:
+        return (target,)
+
+    initial: Final = operations.prepare_context(user_api_key_auth=caller, mcp_servers=[server.server_id])
+    authorize: Final = AsyncMock(return_value=initial)
+    session: Final = Mock(spec=ServerSession)
+    session.client_params = Mock()
+    service: Final = subscriptions.GatewaySubscriptions(resolve_targets=resolve)
+    listener: Final = asyncio.create_task(
+        service.legacy_session(
+            context(session, "2025-11-25"),
+            subscriptions.SubscriptionAuthorization(initial, authorize, lambda *_: "alice"),
+        )
+    )
+    try:
+        for _ in range(2):
+            await asyncio.wait_for(listed.get(), 5)
+        assert await operations._mcp_server_rate_limit_rejection(server, caller) is None
+    finally:
+        listener.cancel()
+        await asyncio.gather(listener, return_exceptions=True)
diff --git a/tests/unit/proxy/anthropic_endpoints/test_endpoints.py b/tests/unit/proxy/anthropic_endpoints/test_endpoints.py
index e4129ebbc39..c7bb05e5d30 100644
--- a/tests/unit/proxy/anthropic_endpoints/test_endpoints.py
+++ b/tests/unit/proxy/anthropic_endpoints/test_endpoints.py
@@ -5,13 +5,16 @@ Test for anthropic_endpoints/endpoints.py, focusing on handling dictionary objec
 import json
 import logging
 import unittest
+from typing import Final
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 from fastapi.testclient import TestClient
 
+from litellm import Router
 from litellm._logging import verbose_proxy_logger
 from litellm.proxy.common_request_processing import ProxyBaseLLMRequestProcessing
+from litellm.types.utils import TokenCountResponse
 
 
 class TestAnthropicEndpoints(unittest.TestCase):
@@ -467,6 +470,151 @@ class TestErrorLogCarriesCallId:
         assert call_id in record.getMessage()
 
 
+def _claude_router() -> Router:
+    return Router(
+        model_list=[
+            {
+                "model_name": "claude-sonnet",
+                "litellm_params": {"model": "anthropic/claude-sonnet-5-5", "api_key": "sk-test"},
+            }
+        ]
+    )
+
+
+_MALFORMED_TOOL_ENTRY: Final = [{"name": "get_weather", "input_schema": "object"}]
+_SEVEN_TOKENS: Final = TokenCountResponse(
+    total_tokens=7, request_model="claude-sonnet", model_used="claude-sonnet", tokenizer_type="test"
+)
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("model", "tools"),
+    [
+        ("claude-sonnet", 5),
+        ("claude-sonnet", ""),
+        ("claude-sonnet", ["get_weather"]),
+        ("claude-sonnet", _MALFORMED_TOOL_ENTRY),
+        ("team-public-name", 5),
+    ],
+    ids=["int", "empty_string", "list_of_strings", "input_schema_string", "unnamed_model_int"],
+)
+async def test_count_tokens_answers_400_for_malformed_tools_without_counting(model: str, tools: object) -> None:
+    import litellm.proxy.anthropic_endpoints.endpoints as ep
+    import litellm.proxy.proxy_server as proxy_server
+    from litellm.proxy._types import UserAPIKeyAuth
+
+    request: Final = MagicMock()
+    request.headers = {}
+    counter: Final = AsyncMock()
+    body: Final = {"model": model, "messages": [{"role": "user", "content": "hi"}], "tools": tools}
+
+    with (
+        patch.object(ep, "read_request_body", new=AsyncMock(return_value=body)),  # test-quality-ok: endpoint reads the body via a module function; no injection seam
+        patch.object(proxy_server, "count_request_tokens", new=counter),  # test-quality-ok: module global imported at call time; the test asserts it is never reached
+        patch.object(proxy_server, "llm_router", new=_claude_router()),  # test-quality-ok: module global imported at call time; no injection seam on this route
+    ):
+        response: Final = await ep.count_tokens(request=request, user_api_key_dict=UserAPIKeyAuth())
+
+    assert response.status_code == 400
+    assert json.loads(response.body)["error"]["type"] == "invalid_request_error"
+    counter.assert_not_awaited()
+
+
+@pytest.mark.asyncio
+async def test_count_tokens_counts_malformed_tool_entries_for_a_model_the_router_cannot_name() -> None:
+    import litellm.proxy.anthropic_endpoints.endpoints as ep
+    import litellm.proxy.proxy_server as proxy_server
+    from litellm.proxy._types import UserAPIKeyAuth
+
+    request: Final = MagicMock()
+    request.headers = {}
+    counter: Final = AsyncMock(return_value=_SEVEN_TOKENS)
+    body: Final = {"model": "team-public-name", "messages": [{"role": "user", "content": "hi"}], "tools": _MALFORMED_TOOL_ENTRY}
+
+    with (
+        patch.object(ep, "read_request_body", new=AsyncMock(return_value=body)),  # test-quality-ok: endpoint reads the body via a module function; no injection seam
+        patch.object(proxy_server, "count_request_tokens", new=counter),  # test-quality-ok: module global imported at call time; the test asserts what it receives
+        patch.object(proxy_server, "llm_router", new=_claude_router()),  # test-quality-ok: module global imported at call time; no injection seam on this route
+    ):
+        response: Final = await ep.count_tokens(request=request, user_api_key_dict=UserAPIKeyAuth())
+
+    assert response == {"input_tokens": 7}
+    assert counter.await_args.kwargs["request"].tools == _MALFORMED_TOOL_ENTRY
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    ("dropping", "headers"),
+    [
+        ({"drop_params": True}, {}),
+        ({"additional_drop_params": ["tools"]}, {}),
+        ({}, {"user-agent": "claude-cli/2.1.0 (external, cli)"}),
+    ],
+    ids=["drop_params", "additional_drop_params", "claude_code_user_agent"],
+)
+async def test_count_tokens_drops_malformed_tools_when_drop_params_is_set(
+    dropping: dict[str, object], headers: dict[str, str]
+) -> None:
+    import litellm.proxy.anthropic_endpoints.endpoints as ep
+    import litellm.proxy.proxy_server as proxy_server
+    from litellm.proxy._types import UserAPIKeyAuth
+
+    request: Final = MagicMock()
+    request.headers = headers
+    counter: Final = AsyncMock(return_value=_SEVEN_TOKENS)
+    messages: Final = [{"role": "user", "content": "hi"}]
+    body: Final = {"model": "claude-sonnet", "messages": messages, "tools": 5, **dropping}
+
+    with (
+        patch.object(ep, "read_request_body", new=AsyncMock(return_value=body)),  # test-quality-ok: endpoint reads the body via a module function; no injection seam
+        patch.object(proxy_server, "count_request_tokens", new=counter),  # test-quality-ok: module global imported at call time; the test asserts what it receives
+    ):
+        response: Final = await ep.count_tokens(request=request, user_api_key_dict=UserAPIKeyAuth())
+
+    assert response == {"input_tokens": 7}
+    counted: Final = counter.await_args.kwargs["request"]
+    assert counted.tools is None
+    assert counted.messages == messages
+
+
+@pytest.mark.asyncio
+async def test_count_tokens_drops_malformed_tools_the_counted_deployment_drops_even_with_fallbacks() -> None:
+    import litellm.proxy.anthropic_endpoints.endpoints as ep
+    import litellm.proxy.proxy_server as proxy_server
+    from litellm import Router
+    from litellm.proxy._types import UserAPIKeyAuth
+
+    router: Final = Router(
+        model_list=[
+            {
+                "model_name": "claude-sonnet",
+                "litellm_params": {
+                    "model": "anthropic/claude-sonnet-5-5",
+                    "api_key": "sk-test",
+                    "additional_drop_params": ["tools"],
+                },
+            },
+            {"model_name": "backup", "litellm_params": {"model": "anthropic/claude-haiku-5-5", "api_key": "sk-test"}},
+        ],
+        fallbacks=[{"claude-sonnet": ["backup"]}],
+    )
+    request: Final = MagicMock()
+    request.headers = {}
+    counter: Final = AsyncMock(return_value=_SEVEN_TOKENS)
+    body: Final = {"model": "claude-sonnet", "messages": [{"role": "user", "content": "hi"}], "tools": 5}
+
+    with (
+        patch.object(ep, "read_request_body", new=AsyncMock(return_value=body)),  # test-quality-ok: endpoint reads the body via a module function; no injection seam
+        patch.object(proxy_server, "count_request_tokens", new=counter),  # test-quality-ok: module global imported at call time; the test asserts what it receives
+        patch.object(proxy_server, "llm_router", new=router),  # test-quality-ok: module global imported at call time; no injection seam on this route
+    ):
+        response: Final = await ep.count_tokens(request=request, user_api_key_dict=UserAPIKeyAuth())
+
+    assert response == {"input_tokens": 7}
+    assert counter.await_args.kwargs["request"].tools is None
+
+
 class TestEventLoggingBatchEndpoint:
     """Test the stubbed event logging batch endpoint"""
 
diff --git a/tests/unit/proxy/auth/test_auth_utils.py b/tests/unit/proxy/auth/test_auth_utils.py
index c224cd08663..7de249bfb6e 100644
--- a/tests/unit/proxy/auth/test_auth_utils.py
+++ b/tests/unit/proxy/auth/test_auth_utils.py
@@ -35,7 +35,7 @@ from litellm.proxy.auth.auth_utils import (
     is_request_body_safe,
 )
 from litellm.router import Router
-from litellm.types.utils import oauth_token_exchange_litellm_params
+from litellm.types.utils import oauth_token_exchange_litellm_params, server_owned_wif_litellm_params
 from litellm.types.workload_identity import ANTHROPIC_WIF_KWARGS_KEYS, OPENAI_WIF_KWARGS_KEYS
 
 
@@ -163,13 +163,45 @@ def test_every_server_owned_identity_param_is_refused_from_a_request_body(param:
         )
 
 
+def _client_router_config(placement: str, litellm_params: dict[str, str]) -> dict[str, object]:
+    if placement == "model_list":
+        return {"model_list": [{"model_name": "gpt-5.4-nano", "litellm_params": litellm_params}]}
+    return {"default_litellm_params": litellm_params}
+
+
+@pytest.mark.parametrize("param", server_owned_wif_litellm_params)
+@pytest.mark.parametrize("placement", ["model_list", "default_litellm_params"])
+def test_every_server_owned_auth_param_is_refused_from_a_client_router_config(param: str, placement: str):
+    user_config: Final = _client_router_config(placement, {"model": "openai/gpt-5.4-nano", param: "attacker-chosen"})
+    with pytest.raises(
+        ValueError,
+        match="server-owned workload identity federation or OAuth token exchange parameter",
+    ):
+        is_request_body_safe(
+            request_body={"model": "gpt-5.4-nano", "user_config": user_config},
+            general_settings={"allow_client_side_credentials": True},
+            llm_router=None,
+            model="gpt-5.4-nano",
+        )
+
+
 @pytest.mark.parametrize(
     "body",
     [
         {"model": "claude-sonnet-5", "litellm_credential_name": "admin-wif"},
         {"model": "claude-sonnet-5", "litellm_params": {"litellm_credential_name": "admin-wif"}},
+        {
+            "model": "claude-sonnet-5",
+            "user_config": _client_router_config(
+                "model_list", {"model": "anthropic/claude-sonnet-5", "litellm_credential_name": "admin-wif"}
+            ),
+        },
+        {
+            "model": "claude-sonnet-5",
+            "user_config": _client_router_config("default_litellm_params", {"litellm_credential_name": "admin-wif"}),
+        },
     ],
-    ids=["top_level", "nested_litellm_params"],
+    ids=["top_level", "nested_litellm_params", "client_router_model_list", "client_router_defaults"],
 )
 def test_a_request_body_cannot_pick_a_federated_identity_by_credential_name(monkeypatch, body: dict):
     """Naming a federated credential moves the token exchange onto that credential's federation rule
diff --git a/tests/unit/proxy/auth/test_handle_jwt.py b/tests/unit/proxy/auth/test_handle_jwt.py
index 69eb01cabcd..e4a3935a58d 100644
--- a/tests/unit/proxy/auth/test_handle_jwt.py
+++ b/tests/unit/proxy/auth/test_handle_jwt.py
@@ -13,6 +13,7 @@ from litellm.caching.dual_cache import DualCache
 from litellm.proxy._types import (
     DEFAULT_JWKS_STALE_TTL,
     JWTLiteLLMRoleMap,
+    JWTIssuerConfig,
     LiteLLMRoutes,
     LiteLLM_JWTAuth,
     LiteLLM_ModelTable,
@@ -29,9 +30,11 @@ from litellm.proxy._types import (
 from litellm.proxy.agent_endpoints.agent_registry import AgentRegistry
 from litellm.proxy.auth.auth_checks import TeamNotFoundError
 from litellm.proxy.auth.handle_jwt import (
+    ID_JAG_TYP,
     JWKS_FETCH_ATTEMPTS,
     STALE_CACHE_KEY_PREFIX,
     STALE_WRITTEN_AT_CACHE_KEY_PREFIX,
+    AssertionRejection,
     HeaderTeam,
     JWKSUnreachableError,
     JWTAuthManager,
@@ -8303,3 +8306,198 @@ def test_team_passthrough_route_denial_names_the_matched_deny_entry(
 
     assert exc_info.value.status_code == 403
     assert expected_detail in str(exc_info.value.detail)
+
+
+ASSERTION_ISSUER = "https://idp.example.com/oauth2/default"
+ASSERTION_JWKS_URL = f"{ASSERTION_ISSUER}/v1/keys"
+GATEWAY_AUDIENCES = ("https://gateway.example.com/mcp", "https://gateway.example.com")
+ID_JAG_CLAIMS = ("iss", "sub", "aud", "exp", "iat", "jti", "client_id")
+
+
+def _assertion_signer():
+    import json
+
+    import jwt as pyjwt
+    from cryptography.hazmat.primitives.asymmetric import rsa
+
+    private_key: Final = rsa.generate_private_key(public_exponent=65537, key_size=2048)
+    jwk: Final = {**json.loads(pyjwt.algorithms.RSAAlgorithm.to_jwk(private_key.public_key())), "kid": "k1"}
+
+    def sign(claims: Mapping[str, object], typ: str = ID_JAG_TYP) -> str:
+        return pyjwt.encode(dict(claims), private_key, algorithm="RS256", headers={"kid": "k1", "typ": typ})
+
+    return jwk, sign
+
+
+def _id_jag_claims(**overrides):
+    now: Final = int(time.time())
+    return {
+        "iss": ASSERTION_ISSUER,
+        "sub": "okta-user-1",
+        "aud": GATEWAY_AUDIENCES[0],
+        "exp": now + 300,
+        "iat": now - 5,
+        "jti": "jti-1",
+        "client_id": "0oa-requesting-app",
+        **overrides,
+    }
+
+
+def _assertion_handler(jwk, litellm_jwtauth, jwks_url=ASSERTION_JWKS_URL):
+    """A handler whose JWKS for the issuer is already cached, so no HTTP is needed."""
+    handler: Final = JWTHandler()
+    cache: Final = DualCache()
+    cache.set_cache(f"litellm_jwt_auth_keys_{jwks_url}", [jwk])
+    handler.update_environment(prisma_client=None, user_api_key_cache=cache, litellm_jwtauth=litellm_jwtauth)
+    return handler
+
+
+@pytest.mark.asyncio
+async def test_decode_trusted_assertion_verifies_against_the_configured_issuer_with_the_callers_audience():
+    """The assertion is checked with the issuer's JWKS and claim mappings, but for the audience the
+    caller names (the gateway's own issuer values), not the API audience the issuer entry carries,
+    since an ID-JAG is addressed to the authorization server, never to the API."""
+    jwk, sign = _assertion_signer()
+    handler = _assertion_handler(
+        jwk,
+        LiteLLM_JWTAuth(
+            issuers=[
+                JWTIssuerConfig(
+                    issuer=ASSERTION_ISSUER,
+                    jwks_url=ASSERTION_JWKS_URL,
+                    audience="api://litellm",
+                    user_id_jwt_field="sub",
+                )
+            ]
+        ),
+    )
+    claims = _id_jag_claims()
+    verified = await handler.decode_trusted_assertion(sign(claims), GATEWAY_AUDIENCES, ID_JAG_CLAIMS)
+    assert isinstance(verified, dict)
+    assert {key: verified[key] for key in claims} == claims
+    assert handler.get_user_id(token=verified, default_value=None) == "okta-user-1"
+    second = await handler.decode_trusted_assertion(
+        sign(_id_jag_claims(aud=GATEWAY_AUDIENCES[1])), GATEWAY_AUDIENCES, ID_JAG_CLAIMS
+    )
+    assert isinstance(second, dict)
+
+
+@pytest.mark.asyncio
+async def test_decode_trusted_assertion_falls_back_to_the_env_scoped_issuer(monkeypatch):
+    jwk, sign = _assertion_signer()
+    monkeypatch.setenv("JWT_ISSUER", ASSERTION_ISSUER)
+    monkeypatch.setenv("JWT_PUBLIC_KEY_URL", ASSERTION_JWKS_URL)
+    handler = _assertion_handler(jwk, LiteLLM_JWTAuth())
+    verified = await handler.decode_trusted_assertion(sign(_id_jag_claims()), GATEWAY_AUDIENCES, ID_JAG_CLAIMS)
+    assert isinstance(verified, dict)
+    assert verified["jti"] == "jti-1"
+    monkeypatch.setenv("JWT_ISSUER", "https://someone-else.example.com")
+    foreign = await handler.decode_trusted_assertion(sign(_id_jag_claims()), GATEWAY_AUDIENCES, ID_JAG_CLAIMS)
+    assert isinstance(foreign, AssertionRejection)
+    assert "trusts" in foreign.reason
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "fault, reason",
+    [
+        ({"aud": "api://litellm"}, "udience"),
+        ({"jti": None}, "jti"),
+        ({"client_id": None}, "client_id"),
+        ({"exp": -10}, "xpired"),
+        ({"iat": 600}, "iat"),
+        ({"iss": "https://untrusted.example.com"}, "trusts"),
+    ],
+)
+async def test_decode_trusted_assertion_rejects_a_claim_outside_the_profile(fault: dict[str, object], reason: str):
+    """The claims are built inside the test, relative to the clock the verifier reads, so a slow
+    collection cannot turn an intended claim fault into an unrelated expiry (``None`` drops a claim,
+    an int on ``exp`` or ``iat`` is an offset from now)."""
+    now: Final = int(time.time())
+    offsets: Final = {k: now + v for k, v in fault.items() if k in ("exp", "iat") and isinstance(v, int)}
+    claims: Final = {k: v for k, v in _id_jag_claims(**offsets).items() if fault.get(k, k) is not None}
+    claims.update({k: v for k, v in fault.items() if v is not None and k not in offsets})
+    jwk, sign = _assertion_signer()
+    handler = _assertion_handler(
+        jwk,
+        LiteLLM_JWTAuth(issuers=[JWTIssuerConfig(issuer=ASSERTION_ISSUER, jwks_url=ASSERTION_JWKS_URL, audience="x")]),
+    )
+    rejected = await handler.decode_trusted_assertion(sign(claims), GATEWAY_AUDIENCES, ID_JAG_CLAIMS)
+    assert isinstance(rejected, AssertionRejection)
+    assert reason in rejected.reason
+
+
+@pytest.mark.asyncio
+async def test_decode_trusted_assertion_rejects_a_forged_signature_and_garbage(monkeypatch):
+    jwk, _ = _assertion_signer()
+    _, forge = _assertion_signer()
+    handler = _assertion_handler(
+        jwk,
+        LiteLLM_JWTAuth(issuers=[JWTIssuerConfig(issuer=ASSERTION_ISSUER, jwks_url=ASSERTION_JWKS_URL, audience="x")]),
+    )
+    forged = await handler.decode_trusted_assertion(forge(_id_jag_claims()), GATEWAY_AUDIENCES, ID_JAG_CLAIMS)
+    assert isinstance(forged, AssertionRejection)
+    assert "verification" in forged.reason
+    garbage = await handler.decode_trusted_assertion("not.a.jwt", GATEWAY_AUDIENCES, ID_JAG_CLAIMS)
+    assert isinstance(garbage, AssertionRejection)
+    monkeypatch.delenv("JWT_ISSUER", raising=False)
+    unconfigured = await _assertion_handler(jwk, LiteLLM_JWTAuth()).decode_trusted_assertion(
+        forge(_id_jag_claims()), GATEWAY_AUDIENCES, ID_JAG_CLAIMS
+    )
+    assert isinstance(unconfigured, AssertionRejection)
+    assert "trusts" in unconfigured.reason
+
+
+@pytest.mark.asyncio
+async def test_decode_trusted_assertion_reports_an_unreachable_jwks_as_an_outage_not_a_bad_assertion():
+    jwk, sign = _assertion_signer()
+    handler = _assertion_handler(
+        jwk,
+        LiteLLM_JWTAuth(issuers=[JWTIssuerConfig(issuer=ASSERTION_ISSUER, jwks_url=ASSERTION_JWKS_URL, audience="x")]),
+        jwks_url="https://a-different-cached-url.example.com/keys",
+    )
+    with patch.object(handler, "_fetch_jwks_keys", new_callable=AsyncMock, side_effect=JWKSUnreachableError("down")):
+        with pytest.raises(ProxyException) as outage:
+            await handler.decode_trusted_assertion(sign(_id_jag_claims()), GATEWAY_AUDIENCES, ID_JAG_CLAIMS)
+    assert outage.value.code == "503"
+
+
+@pytest.mark.asyncio
+async def test_auth_jwt_never_accepts_an_id_jag_as_a_bearer_token():
+    """An assertion typed oauth-id-jag+jwt is a grant for the token endpoint, so bearer auth
+    refuses it before any key lookup, even where it would otherwise verify."""
+    jwk, sign = _assertion_signer()
+    handler = _assertion_handler(
+        jwk,
+        LiteLLM_JWTAuth(
+            issuers=[
+                JWTIssuerConfig(issuer=ASSERTION_ISSUER, jwks_url=ASSERTION_JWKS_URL, audience=GATEWAY_AUDIENCES[0])
+            ]
+        ),
+    )
+    accepted = await handler.auth_jwt(sign(_id_jag_claims(), typ="JWT"))
+    assert accepted["jti"] == "jti-1"
+    with pytest.raises(Exception, match="token endpoint"):
+        await handler.auth_jwt(sign(_id_jag_claims()))
+@pytest.mark.asyncio
+@pytest.mark.parametrize("verdict", [True, False])
+async def test_decode_trusted_assertion_runs_the_configured_custom_validate_on_the_verified_claims(verdict):
+    """The operator's ``custom_validate`` gates every JWT the proxy admits, so an assertion redeemed
+    at the token endpoint goes through it too, after signature and claim verification."""
+    jwk, sign = _assertion_signer()
+    seen: Final = []
+    handler = _assertion_handler(
+        jwk,
+        LiteLLM_JWTAuth(
+            issuers=[JWTIssuerConfig(issuer=ASSERTION_ISSUER, jwks_url=ASSERTION_JWKS_URL, audience="api://litellm")]
+        ),
+    )
+    handler.litellm_jwtauth.custom_validate = lambda claims: seen.append(dict(claims)) or verdict
+    claims = _id_jag_claims()
+    verified = await handler.decode_trusted_assertion(sign(claims), GATEWAY_AUDIENCES, ID_JAG_CLAIMS)
+    assert [{key: call[key] for key in claims} for call in seen] == [claims]
+    if verdict:
+        assert isinstance(verified, dict)
+    else:
+        assert isinstance(verified, AssertionRejection)
+        assert "custom_validate" in verified.reason
diff --git a/tests/unit/proxy/auth/test_model_checks.py b/tests/unit/proxy/auth/test_model_checks.py
index 9f9a6687210..660cc93874d 100644
--- a/tests/unit/proxy/auth/test_model_checks.py
+++ b/tests/unit/proxy/auth/test_model_checks.py
@@ -932,6 +932,26 @@ def test_add_known_models_refreshes_models_by_provider_for_wildcard_expansion():
     assert fake_model not in litellm.models_by_provider["vertex_ai"]
 
 
+def test_wildcard_lists_a_model_once_when_registered_both_bare_and_provider_prefixed():
+    import litellm
+    from litellm.proxy.auth.model_checks import get_known_models_from_wildcard
+
+    bare: Final = "gpt-dedupe-regression"
+    entry: Final = {"litellm_provider": "openai", "mode": "chat"}
+    try:
+        litellm.register_model({bare: entry, f"openai/{bare}": entry}, persist_across_reloads=False)
+
+        listed: Final = get_known_models_from_wildcard("openai/*")
+
+        assert listed.count(f"openai/{bare}") == 1
+    finally:
+        litellm.model_cost.pop(bare, None)
+        litellm.model_cost.pop(f"openai/{bare}", None)
+        litellm.open_ai_chat_completion_models.discard(bare)
+        litellm.open_ai_chat_completion_models.discard(f"openai/{bare}")
+        litellm.add_known_models(model_cost_map={})
+
+
 def test_get_complete_model_list_drops_no_default_models_sentinel():
     from litellm.proxy.auth.model_checks import get_complete_model_list
 
diff --git a/tests/unit/proxy/batches_endpoints/test_endpoints.py b/tests/unit/proxy/batches_endpoints/test_endpoints.py
index aab2074e49f..15a254dd7a1 100644
--- a/tests/unit/proxy/batches_endpoints/test_endpoints.py
+++ b/tests/unit/proxy/batches_endpoints/test_endpoints.py
@@ -35,6 +35,7 @@ import logging
 from contextlib import ExitStack
 from dataclasses import dataclass
 from datetime import datetime, timedelta, timezone
+from pathlib import Path
 from typing import Any, Dict, Optional
 from unittest.mock import AsyncMock, MagicMock, patch
 
@@ -521,6 +522,29 @@ async def test_create__fallback_explicit_provider_bypasses_not_found_gate(harnes
     assert harness.acreate_kwargs()["custom_llm_provider"] == "anthropic"
 
 
+@pytest.mark.asyncio
+async def test_create__fallback_workload_identity_alone_forwards(
+    harness: Harness, no_openai_creds: None, monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+):
+    token_file = tmp_path / "subject_token.jwt"
+    token_file.write_text("subject-token-from-file")
+    monkeypatch.setenv("OPENAI_IDENTITY_PROVIDER_ID", "idp_test123")
+    monkeypatch.setenv("OPENAI_SERVICE_ACCOUNT_ID", "user-test456")
+    monkeypatch.setenv("OPENAI_IDENTITY_TOKEN_FILE", str(token_file))
+    set_body(
+        harness,
+        {
+            "input_file_id": "file-plain",
+            "endpoint": "/v1/chat/completions",
+            "completion_window": "24h",
+        },
+    )
+
+    await call_create(harness)
+
+    assert harness.acreate_kwargs()["custom_llm_provider"] == "openai"
+
+
 @pytest.mark.asyncio
 async def test_create__fallback_env_key_alone_forwards(harness, monkeypatch):
     monkeypatch.setattr(litellm, "api_key", None)
diff --git a/tests/unit/proxy/db/db_transaction_queue/test_spend_update_queue.py b/tests/unit/proxy/db/db_transaction_queue/test_spend_update_queue.py
index 43f1a820885..9a4b02ba3ba 100644
--- a/tests/unit/proxy/db/db_transaction_queue/test_spend_update_queue.py
+++ b/tests/unit/proxy/db/db_transaction_queue/test_spend_update_queue.py
@@ -1,12 +1,81 @@
 import asyncio
 import json
+from typing import Final
 
 import pytest
 from fastapi.testclient import TestClient
+from prometheus_client import REGISTRY
 
+import litellm
 from litellm.constants import MAX_SIZE_IN_MEMORY_QUEUE
 from litellm.proxy._types import Litellm_EntityType, SpendUpdateQueueItem
 from litellm.proxy.db.db_transaction_queue.spend_update_queue import SpendUpdateQueue
+from litellm.types.services import ServiceTypes
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("aggregation_threshold", (2, 3))
+async def test_spend_queue_gauge_tracks_enqueue_aggregation_and_drain(
+    monkeypatch: pytest.MonkeyPatch, aggregation_threshold: int
+) -> None:
+    monkeypatch.setattr(litellm, "service_callback", ["prometheus_system"])
+    queue: Final = SpendUpdateQueue()
+    queue.MAX_SIZE_IN_MEMORY_QUEUE = aggregation_threshold
+    response_cost: Final = 0.5
+    update: Final = SpendUpdateQueueItem(
+        entity_type=Litellm_EntityType.USER, entity_id="queue-user", response_cost=response_cost
+    )
+
+    await queue.add_update(update)
+    await asyncio.sleep(0)
+    assert REGISTRY.get_sample_value(
+        "litellm_in_memory_spend_update_queue_size",
+        {"in_memory_spend_update_queue": str(ServiceTypes.IN_MEMORY_SPEND_UPDATE_QUEUE)},
+    ) == queue.update_queue.qsize() == 1
+
+    await queue.add_update(update)
+    await asyncio.sleep(0)
+    assert REGISTRY.get_sample_value(
+        "litellm_in_memory_spend_update_queue_size",
+        {"in_memory_spend_update_queue": str(ServiceTypes.IN_MEMORY_SPEND_UPDATE_QUEUE)},
+    ) == queue.update_queue.qsize() == (1 if aggregation_threshold == 2 else 2)
+
+    await queue.aggregate_queue_updates()
+    await asyncio.sleep(0)
+    assert REGISTRY.get_sample_value(
+        "litellm_in_memory_spend_update_queue_size",
+        {"in_memory_spend_update_queue": str(ServiceTypes.IN_MEMORY_SPEND_UPDATE_QUEUE)},
+    ) == queue.update_queue.qsize() == 1
+
+    transactions: Final = await queue.flush_and_get_aggregated_db_spend_update_transactions()
+    await asyncio.sleep(0)
+    assert transactions["user_list_transactions"] == {"queue-user": 2 * response_cost}
+    assert REGISTRY.get_sample_value(
+        "litellm_in_memory_spend_update_queue_size",
+        {"in_memory_spend_update_queue": str(ServiceTypes.IN_MEMORY_SPEND_UPDATE_QUEUE)},
+    ) == queue.update_queue.qsize() == 0
+
+
+@pytest.mark.asyncio
+async def test_spend_queue_gauge_tracks_partial_flush(monkeypatch: pytest.MonkeyPatch) -> None:
+    import litellm.proxy.db.db_transaction_queue.base_update_queue as base_queue_module
+
+    monkeypatch.setattr(litellm, "service_callback", ["prometheus_system"])
+    monkeypatch.setattr(base_queue_module, "MAX_IN_MEMORY_QUEUE_FLUSH_COUNT", 1)
+    queue: Final = SpendUpdateQueue()
+    update: Final = SpendUpdateQueueItem(
+        entity_type=Litellm_EntityType.USER, entity_id="queue-user", response_cost=0.5
+    )
+    await queue.add_update(update)
+    await queue.add_update(update)
+
+    transactions: Final = await queue.flush_and_get_aggregated_db_spend_update_transactions()
+    await asyncio.sleep(0)
+    assert transactions["user_list_transactions"] == {"queue-user": update["response_cost"]}
+    assert REGISTRY.get_sample_value(
+        "litellm_in_memory_spend_update_queue_size",
+        {"in_memory_spend_update_queue": str(ServiceTypes.IN_MEMORY_SPEND_UPDATE_QUEUE)},
+    ) == queue.update_queue.qsize() == 1
 
 
 
diff --git a/tests/unit/proxy/guardrails/guardrail_hooks/openai/test_moderations.py b/tests/unit/proxy/guardrails/guardrail_hooks/openai/test_moderations.py
index 2c91569de69..930309d62ed 100644
--- a/tests/unit/proxy/guardrails/guardrail_hooks/openai/test_moderations.py
+++ b/tests/unit/proxy/guardrails/guardrail_hooks/openai/test_moderations.py
@@ -5,6 +5,7 @@ Test OpenAI Moderation Guardrail
 
 import json
 import os
+from pathlib import Path
 from typing import Final
 
 
@@ -12,13 +13,22 @@ from unittest.mock import MagicMock, patch
 
 import httpx
 import pytest
+import respx
 
+import litellm
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
+from litellm.llms.openai.workload_identity import _workload_identity_auth
 from litellm.proxy._types import UserAPIKeyAuth
 from litellm.proxy.common_utils.callback_utils import get_logging_caching_headers
+from litellm.proxy.guardrails.guardrail_hooks.openai import (
+    initialize_guardrail as initialize_openai_moderation_guardrail,
+)
 from litellm.proxy.guardrails.guardrail_hooks.openai.moderations import (
     OpenAIModerationGuardrail,
 )
+from litellm.proxy.guardrails.guardrail_registry import IN_MEMORY_GUARDRAIL_HANDLER, InMemoryGuardrailHandler
+from litellm.proxy.guardrails.init_guardrails import init_guardrails_v2
+from litellm.types.guardrails import Guardrail, LitellmParams, SupportedGuardrailIntegrations
 from litellm.types.llms.openai import OpenAIModerationResponse, OpenAIModerationResult
 
 
@@ -1089,3 +1099,153 @@ async def test_openai_moderation_responses_api_input_field():
             input_type="request",
         )
     assert "Violated OpenAI moderation policy" in str(chat_error.value)
+
+
+class _ModerationsEndpointThatRecordsTheAuthorization:
+    authorization: str | None = None
+
+    def __call__(self, request: httpx.Request) -> httpx.Response:
+        self.authorization = request.headers.get("Authorization")
+        return httpx.Response(
+            200,
+            json={
+                "id": "modr-federated",
+                "model": "omni-moderation-latest",
+                "results": [
+                    {"flagged": False, "categories": {}, "category_scores": {}, "category_applied_input_types": {}}
+                ],
+            },
+        )
+
+
+@pytest.mark.asyncio
+@respx.mock
+async def test_openai_moderation_sends_the_federated_bearer_when_only_workload_identity_is_set(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    token_file: Final = tmp_path / "subject_token.jwt"
+    token_file.write_text("subject-token")
+    for name in ("OPENAI_API_KEY", "OPENAI_BASE_URL", "OPENAI_API_BASE"):
+        monkeypatch.delenv(name, raising=False)
+    for attribute in ("api_key", "openai_key", "api_base"):
+        monkeypatch.setattr(litellm, attribute, None)
+    monkeypatch.setenv("OPENAI_IDENTITY_PROVIDER_ID", "idp_guardrail")
+    monkeypatch.setenv("OPENAI_SERVICE_ACCOUNT_ID", "user-guardrail")
+    monkeypatch.setenv("OPENAI_IDENTITY_TOKEN_FILE", str(token_file))
+    _workload_identity_auth.cache_clear()
+    respx.post("https://auth.openai.com/oauth/token").mock(
+        return_value=httpx.Response(200, json={"access_token": "guardrail-bearer", "expires_in": 3600})
+    )
+    endpoint: Final = _ModerationsEndpointThatRecordsTheAuthorization()
+    http_client: Final = AsyncHTTPHandler()
+    http_client.client = httpx.AsyncClient(transport=httpx.MockTransport(endpoint))
+
+    guardrail: Final = OpenAIModerationGuardrail(guardrail_name="openai-mod")
+    guardrail.async_handler = http_client
+    response: Final = await guardrail.async_make_request("hello")
+
+    assert response.id == "modr-federated"
+    assert endpoint.authorization == "Bearer guardrail-bearer"
+
+
+@pytest.mark.asyncio
+@respx.mock
+async def test_openai_moderation_federates_with_the_identity_in_its_own_guardrail_config(
+    monkeypatch: pytest.MonkeyPatch, tmp_path: Path
+) -> None:
+    token_file: Final = tmp_path / "subject_token.jwt"
+    token_file.write_text("subject-token")
+    for name in (
+        "OPENAI_API_KEY",
+        "OPENAI_BASE_URL",
+        "OPENAI_API_BASE",
+        "OPENAI_IDENTITY_PROVIDER_ID",
+        "OPENAI_SERVICE_ACCOUNT_ID",
+        "OPENAI_IDENTITY_TOKEN_FILE",
+    ):
+        monkeypatch.delenv(name, raising=False)
+    for attribute in ("api_key", "openai_key", "api_base"):
+        monkeypatch.setattr(litellm, attribute, None)
+    monkeypatch.setenv("GUARDRAIL_IDENTITY_PROVIDER_ID", "idp_guardrail_config")
+    _workload_identity_auth.cache_clear()
+    exchange: Final = respx.post("https://auth.openai.com/oauth/token").mock(
+        return_value=httpx.Response(200, json={"access_token": "guardrail-config-bearer", "expires_in": 3600})
+    )
+    endpoint: Final = _ModerationsEndpointThatRecordsTheAuthorization()
+    http_client: Final = AsyncHTTPHandler()
+    http_client.client = httpx.AsyncClient(transport=httpx.MockTransport(endpoint))
+
+    guardrail_config: Final = LitellmParams(
+        guardrail=SupportedGuardrailIntegrations.OPENAI_MODERATION,
+        mode="pre_call",
+        openai_identity_provider_id="os.environ/GUARDRAIL_IDENTITY_PROVIDER_ID",
+        openai_service_account_id="user-guardrail-config",
+        openai_identity_token_file=str(token_file),
+    )
+    monkeypatch.setattr(litellm, "callbacks", [])
+    guardrail: Final = initialize_openai_moderation_guardrail(
+        litellm_params=guardrail_config,
+        guardrail=Guardrail(guardrail_name="openai-mod", litellm_params=guardrail_config),
+    )
+    guardrail.async_handler = http_client
+    await guardrail.async_make_request("hello")
+
+    exchange_body: Final = json.loads(exchange.calls.last.request.content)
+    assert exchange_body["identity_provider_id"] == "idp_guardrail_config"
+    assert exchange_body["service_account_id"] == "user-guardrail-config"
+    assert endpoint.authorization == "Bearer guardrail-config-bearer"
+
+
+@pytest.fixture
+def no_ambient_openai_credentials(monkeypatch: pytest.MonkeyPatch) -> None:
+    for name in (
+        "OPENAI_API_KEY",
+        "OPENAI_BASE_URL",
+        "OPENAI_API_BASE",
+        "OPENAI_IDENTITY_PROVIDER_ID",
+        "OPENAI_SERVICE_ACCOUNT_ID",
+        "OPENAI_IDENTITY_TOKEN_FILE",
+    ):
+        monkeypatch.delenv(name, raising=False)
+    for attribute in ("api_key", "openai_key", "api_base"):
+        monkeypatch.setattr(litellm, attribute, None)
+    monkeypatch.setattr(litellm, "callbacks", [])
+
+
+PARTIAL_IDENTITY_MODERATION: Final = {
+    "guardrail": SupportedGuardrailIntegrations.OPENAI_MODERATION.value,
+    "mode": "pre_call",
+    "openai_identity_provider_id": "idp_without_the_rest",
+}
+
+
+@pytest.mark.usefixtures("no_ambient_openai_credentials")
+def test_openai_moderation_with_a_partial_identity_is_a_configuration_error_naming_the_gap() -> None:
+    with pytest.raises(ValueError, match="openai_service_account_id, openai_identity_token_file"):
+        InMemoryGuardrailHandler().initialize_guardrail(
+            guardrail={"guardrail_name": "partial-identity-mod", "litellm_params": PARTIAL_IDENTITY_MODERATION},
+            source="db",
+        )
+
+
+@pytest.mark.usefixtures("no_ambient_openai_credentials")
+def test_proxy_boot_skips_an_openai_moderation_with_a_partial_identity() -> None:
+    IN_MEMORY_GUARDRAIL_HANDLER.IN_MEMORY_GUARDRAILS.clear()
+    IN_MEMORY_GUARDRAIL_HANDLER.guardrail_id_to_custom_guardrail.clear()
+
+    init_guardrails_v2(
+        all_guardrails=[
+            {"guardrail_name": "partial-identity-mod", "litellm_params": PARTIAL_IDENTITY_MODERATION},
+            {
+                "guardrail_name": "keyed-mod",
+                "litellm_params": {
+                    "guardrail": SupportedGuardrailIntegrations.OPENAI_MODERATION.value,
+                    "mode": "pre_call",
+                    "api_key": "sk-moderation",
+                },
+            },
+        ]
+    )
+
+    booted: Final = IN_MEMORY_GUARDRAIL_HANDLER.IN_MEMORY_GUARDRAILS.values()
+    assert {guardrail["guardrail_name"] for guardrail in booted} == {"keyed-mod"}
diff --git a/tests/unit/proxy/guardrails/guardrail_hooks/test_generic_guardrail_api.py b/tests/unit/proxy/guardrails/guardrail_hooks/test_generic_guardrail_api.py
index 19eb3c71a5b..f50da1bff64 100644
--- a/tests/unit/proxy/guardrails/guardrail_hooks/test_generic_guardrail_api.py
+++ b/tests/unit/proxy/guardrails/guardrail_hooks/test_generic_guardrail_api.py
@@ -5,6 +5,8 @@ This test file tests the Generic Guardrail API implementation,
 specifically focusing on metadata extraction and passing.
 """
 
+import json
+import logging
 import os
 from typing import Final
 from unittest.mock import AsyncMock, MagicMock, patch
@@ -16,6 +18,7 @@ import litellm
 from litellm import ModelResponse
 from litellm._version import version as litellm_version
 from litellm.exceptions import GuardrailRaisedException, Timeout
+from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler, MaskedHTTPStatusError
 from litellm.proxy._types import UserAPIKeyAuth
 from litellm.proxy.guardrails.guardrail_hooks.generic_guardrail_api import (
     GenericGuardrailAPI,
@@ -38,6 +41,38 @@ def generic_guardrail():
     )
 
 
+@pytest.fixture
+def raw_rows_guardrail():
+    return GenericGuardrailAPI(
+        api_base="https://api.test.guardrail.com",
+        headers={"Authorization": "Bearer test-key"},
+        guardrail_name="test-generic-guardrail-raw-rows",
+        event_hook="pre_call",
+        default_on=True,
+        forward_messages_as_sent=True,
+    )
+
+
+async def _structured_messages_sent(guardrail: GenericGuardrailAPI, rows: list[dict]) -> list:
+    sent_bodies: Final[list[bytes]] = []  # mutable-ok: records every body the guardrail endpoint received
+
+    async def answer(request: httpx.Request) -> httpx.Response:
+        sent_bodies.append(request.content)
+        return httpx.Response(200, json={"action": "NONE"}, request=request)
+
+    endpoint: Final = AsyncHTTPHandler(transport=httpx.MockTransport(answer))
+    try:
+        with patch.object(guardrail, "async_handler", endpoint):
+            await guardrail.apply_guardrail(
+                inputs={"texts": ["Look up 123-45-6789 for me."], "structured_messages": rows},
+                request_data={},
+                input_type="request",
+            )
+    finally:
+        await endpoint.close()
+    return [json.loads(body)["structured_messages"] for body in sent_bodies]
+
+
 @pytest.fixture
 def mock_user_api_key_dict():
     """Create a mock UserAPIKeyAuth object"""
@@ -638,6 +673,157 @@ class TestStructuredMessagesInResponse:
         assert returned_rows[1] is tool_call_row
         assert returned_rows[2] == {"role": "tool", "tool_call_id": "call_1", "content": '{"ssn": "[REDACTED]"}'}
 
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        ("row", "openai_row"),
+        [
+            (
+                {"role": "user", "content": "Look up 123-45-6789 for me.", "name": "pat"},
+                {"role": "user", "content": "Look up 123-45-6789 for me."},
+            ),
+            (
+                {
+                    "role": "assistant",
+                    "content": None,
+                    "tool_calls": [
+                        {
+                            "id": "call_1",
+                            "type": "function",
+                            "function": {"name": "lookup", "arguments": "{}"},
+                            "index": 0,
+                        }
+                    ],
+                },
+                {
+                    "role": "assistant",
+                    "content": None,
+                    "tool_calls": [
+                        {"id": "call_1", "type": "function", "function": {"name": "lookup", "arguments": "{}"}}
+                    ],
+                },
+            ),
+            (
+                {
+                    "role": "user",
+                    "content": [
+                        {"type": "image", "source": {"type": "base64", "media_type": "image/png", "data": "AAA="}}
+                    ],
+                },
+                {"role": "user", "content": []},
+            ),
+        ],
+        ids=["extra_key", "tool_call_index", "image_block"],
+    )
+    async def test_rows_reach_the_guardrail_as_openai_chat_rows_by_default(
+        self, generic_guardrail: GenericGuardrailAPI, row, openai_row
+    ):
+        assert await _structured_messages_sent(generic_guardrail, [row]) == [[openai_row]]
+
+    @pytest.mark.asyncio
+    async def test_a_returned_row_that_differs_from_the_shown_row_is_written_back_by_default(
+        self, generic_guardrail, mock_request_data_input
+    ):
+        sent_row = {"role": "user", "content": "my ssn is 123-45-6789", "name": "pat"}
+
+        def answer_with_the_row_as_the_client_sent_it(url, json, headers, **_kwargs):
+            answer = MagicMock()
+            answer.json.return_value = {
+                "action": "GUARDRAIL_INTERVENED",
+                "texts": ["my ssn is [SSN]"],
+                "structured_messages": [sent_row],
+            }
+            answer.raise_for_status = MagicMock()
+            return answer
+
+        with patch.object(
+            generic_guardrail.async_handler, "post", side_effect=answer_with_the_row_as_the_client_sent_it
+        ):
+            guardrailed_inputs = await generic_guardrail.apply_guardrail(
+                inputs={"texts": ["my ssn is 123-45-6789"], "structured_messages": [sent_row]},
+                request_data=mock_request_data_input,
+                input_type="request",
+            )
+
+        assert guardrailed_inputs["structured_messages"] == [sent_row]
+
+    @pytest.mark.asyncio
+    async def test_rows_echoed_back_with_one_rewrite_write_back_the_rewrite_only(
+        self, raw_rows_guardrail, mock_request_data_input
+    ):
+        tool_call_row = {
+            "role": "assistant",
+            "content": None,
+            "tool_calls": [
+                {"id": "call_1", "type": "function", "function": {"name": "lookup", "arguments": "{}"}, "index": 0}
+            ],
+        }
+        original_rows = [
+            {"role": "user", "content": "Look up 123-45-6789 for me.", "name": "pat"},
+            tool_call_row,
+            {"role": "tool", "tool_call_id": "call_1", "content": '{"ssn": "123-45-6789"}'},
+        ]
+
+        def echo_with_tool_output_redacted(url, json, headers, **_kwargs):
+            shown_rows = json["structured_messages"]
+            answer = MagicMock()
+            answer.json.return_value = {
+                "action": "GUARDRAIL_INTERVENED",
+                "texts": ["Look up 123-45-6789 for me."],
+                "structured_messages": [
+                    shown_rows[0],
+                    shown_rows[1],
+                    {**shown_rows[2], "content": '{"ssn": "[REDACTED]"}'},
+                ],
+            }
+            answer.raise_for_status = MagicMock()
+            return answer
+
+        with patch.object(raw_rows_guardrail.async_handler, "post", side_effect=echo_with_tool_output_redacted):
+            guardrailed_inputs = await raw_rows_guardrail.apply_guardrail(
+                inputs={"texts": ["Look up 123-45-6789 for me."], "structured_messages": original_rows},
+                request_data=mock_request_data_input,
+                input_type="request",
+            )
+
+        returned_rows = guardrailed_inputs["structured_messages"]
+        assert returned_rows[0] == original_rows[0]
+        assert returned_rows[1] == tool_call_row
+        assert returned_rows[2] == {"role": "tool", "tool_call_id": "call_1", "content": '{"ssn": "[REDACTED]"}'}
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        "row",
+        [
+            {"role": "user", "content": "Look up 123-45-6789 for me.", "name": "pat"},
+            {
+                "role": "assistant",
+                "content": None,
+                "tool_calls": [
+                    {"id": "call_1", "type": "function", "function": {"name": "lookup", "arguments": "{}"}, "index": 0}
+                ],
+            },
+            {"role": "user", "content": [{"type": "tool_result", "tool_use_id": "call_1", "content": "123-45-6789"}]},
+            {"role": "assistant", "content": [{"type": "tool_use", "id": "call_1", "name": "lookup", "input": {}}]},
+            {
+                "role": "user",
+                "content": [{"type": "image", "source": {"type": "base64", "media_type": "image/png", "data": "AAA="}}],
+            },
+            {
+                "role": "user",
+                "content": [
+                    {"type": "document", "source": {"type": "text", "media_type": "text/plain", "data": "ssn"}}
+                ],
+            },
+        ],
+        ids=["extra_key", "tool_call_index", "tool_result_block", "tool_use_block", "image_block", "document_block"],
+    )
+    async def test_rows_reach_the_guardrail_verbatim_when_forwarded_as_sent(
+        self, raw_rows_guardrail: GenericGuardrailAPI, row
+    ):
+        """Rows are the provider's own shape, so the guardrail must see every key and
+        content block as sent, not a copy filtered through the chat completion types."""
+        assert await _structured_messages_sent(raw_rows_guardrail, [row]) == [[row]]
+
     @pytest.mark.asyncio
     async def test_rows_all_echoed_back_as_shown_leave_the_rewrite_to_texts(
         self, generic_guardrail, mock_request_data_input
@@ -672,6 +858,126 @@ class TestStructuredMessagesInResponse:
         assert "structured_messages" not in guardrailed_inputs
         assert guardrailed_inputs["texts"] == ["Never repeat an SSN.", "Look up [REDACTED] for me."]
 
+    @pytest.mark.asyncio
+    async def test_rows_echoed_without_the_keys_the_server_does_not_know_leave_the_rewrite_to_texts(
+        self, raw_rows_guardrail, mock_request_data_input
+    ):
+        """A server that parses rows with its own message types echoes them back without
+        the keys those types lack, and its texts redaction must still reach the LLM."""
+        original_rows = [
+            {
+                "role": "assistant",
+                "content": None,
+                "tool_calls": [
+                    {"id": "call_1", "type": "function", "function": {"name": "lookup", "arguments": "{}"}, "index": 0}
+                ],
+                "refusal": None,
+                "annotations": [],
+            },
+            {"role": "tool", "tool_call_id": "call_1", "content": "found"},
+            {"role": "user", "content": "my ssn is 123-45-6789"},
+        ]
+
+        def echo_known_keys_and_redact_texts(url, json, headers, **_kwargs):
+            rows = json["structured_messages"]
+            answer = MagicMock()
+            answer.json.return_value = {
+                "action": "GUARDRAIL_INTERVENED",
+                "texts": [text.replace("123-45-6789", "[SSN]") for text in json["texts"]],
+                "structured_messages": [
+                    {
+                        "role": "assistant",
+                        "content": None,
+                        "refusal": None,
+                        "tool_calls": [
+                            {key: value for key, value in rows[0]["tool_calls"][0].items() if key != "index"}
+                        ],
+                    },
+                    rows[1],
+                    rows[2],
+                ],
+            }
+            answer.raise_for_status = MagicMock()
+            return answer
+
+        with patch.object(raw_rows_guardrail.async_handler, "post", side_effect=echo_known_keys_and_redact_texts):
+            guardrailed_inputs = await raw_rows_guardrail.apply_guardrail(
+                inputs={"texts": ["found", "my ssn is 123-45-6789"], "structured_messages": original_rows},
+                request_data=mock_request_data_input,
+                input_type="request",
+            )
+
+        assert "structured_messages" not in guardrailed_inputs
+        assert guardrailed_inputs["texts"] == ["found", "my ssn is [SSN]"]
+
+    @pytest.mark.asyncio
+    async def test_a_row_rewrite_echoes_the_other_rows_back_as_their_original_rows(
+        self, raw_rows_guardrail, mock_request_data_input
+    ):
+        assistant_row = {
+            "role": "assistant",
+            "content": "Looking it up.",
+            "annotations": [{"type": "url_citation", "url_citation": {"url": "https://example.com"}}],
+        }
+        original_rows = [assistant_row, {"role": "user", "content": "my ssn is 123-45-6789"}]
+        redacted_row = {"role": "user", "content": "my ssn is [SSN]"}
+
+        def redact_one_row(url, json, headers, **_kwargs):
+            answer = MagicMock()
+            answer.json.return_value = {
+                "action": "GUARDRAIL_INTERVENED",
+                "structured_messages": [{"role": "assistant", "content": "Looking it up."}, redacted_row],
+            }
+            answer.raise_for_status = MagicMock()
+            return answer
+
+        with patch.object(raw_rows_guardrail.async_handler, "post", side_effect=redact_one_row):
+            guardrailed_inputs = await raw_rows_guardrail.apply_guardrail(
+                inputs={"texts": ["my ssn is 123-45-6789"], "structured_messages": original_rows},
+                request_data=mock_request_data_input,
+                input_type="request",
+            )
+
+        assert guardrailed_inputs["structured_messages"] == [assistant_row, redacted_row]
+
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        "returned_row",
+        [
+            {"role": "assistant", "content": None},
+            {
+                "role": "assistant",
+                "content": None,
+                "tool_calls": [{"id": "call_1", "type": "function", "function": {"name": "lookup", "arguments": "{}"}}],
+                "annotations": [],
+                "refusal": "blocked",
+            },
+        ],
+        ids=["drops_a_declared_key", "changes_a_value"],
+    )
+    async def test_a_row_that_loses_a_declared_key_or_changes_a_value_is_a_rewrite(
+        self, raw_rows_guardrail, mock_request_data_input, returned_row
+    ):
+        original_row = {
+            "role": "assistant",
+            "content": None,
+            "tool_calls": [{"id": "call_1", "type": "function", "function": {"name": "lookup", "arguments": "{}"}}],
+            "annotations": [],
+            "refusal": None,
+        }
+        answer = MagicMock()
+        answer.json.return_value = {"action": "GUARDRAIL_INTERVENED", "structured_messages": [returned_row]}
+        answer.raise_for_status = MagicMock()
+
+        with patch.object(raw_rows_guardrail.async_handler, "post", return_value=answer):
+            guardrailed_inputs = await raw_rows_guardrail.apply_guardrail(
+                inputs={"texts": [], "structured_messages": [original_row]},
+                request_data=mock_request_data_input,
+                input_type="request",
+            )
+
+        assert guardrailed_inputs["structured_messages"] == [returned_row]
+
     @pytest.mark.asyncio
     @pytest.mark.parametrize(
         "structured_messages",
@@ -1253,6 +1559,40 @@ class TestGenericGuardrailAPIStreamingConfig:
         )
         assert guardrail.streaming_transform_mode == "incremental_diff"
 
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        ("configured", "forwards_as_sent"),
+        [
+            pytest.param({}, False, id="unset"),
+            pytest.param({"forward_messages_as_sent": ""}, False, id="blank"),
+            pytest.param({"forward_messages_as_sent": False}, False, id="false"),
+            pytest.param({"forward_messages_as_sent": "true"}, True, id="string-true"),
+            pytest.param({"forward_messages_as_sent": True}, True, id="true"),
+        ],
+    )
+    async def test_forward_messages_as_sent_config_decides_which_rows_reach_the_guardrail(
+        self, configured, forwards_as_sent
+    ):
+        from litellm.proxy.guardrails.guardrail_hooks.generic_guardrail_api import (
+            initialize_guardrail,
+        )
+        from litellm.types.guardrails import LitellmParams
+
+        litellm_params = LitellmParams.model_validate(
+            {
+                "guardrail": "generic_guardrail_api",
+                "mode": "pre_call",
+                "api_base": "https://api.test.guardrail.com",
+                **configured,
+            }
+        )
+        with patch("litellm.logging_callback_manager.add_litellm_callback"):
+            guardrail = initialize_guardrail(litellm_params, {"guardrail_name": "test-forward-as-sent"})
+
+        row = {"role": "user", "content": "hi", "name": "pat"}
+        expected_row = row if forwards_as_sent else {"role": "user", "content": "hi"}
+        assert await _structured_messages_sent(guardrail, [row]) == [[expected_row]]
+
     def test_initialize_guardrail_forwards_streaming_flags(self):
         from litellm.proxy.guardrails.guardrail_hooks.generic_guardrail_api import (
             initialize_guardrail,
@@ -1945,6 +2285,34 @@ class TestToolSupport:
 
         assert forwarded_tools == tools
 
+    @pytest.mark.asyncio
+    async def test_provider_native_tools_without_a_type_reach_the_guardrail_and_come_back_unchanged(
+        self, generic_guardrail
+    ):
+        """Gemini tools are declared as function_declarations, googleSearch and the
+        like with no type key, so they must be scanned, and a server that echoes
+        them back must not write a type key into the request to the provider."""
+        tools = [
+            {"function_declarations": [{"name": "get_weather", "parameters": {"type": "object", "properties": {}}}]},
+            {"googleSearch": {}},
+        ]
+
+        def echo_tools(url, json, headers, **_kwargs):
+            answer = MagicMock()
+            answer.json.return_value = {"action": "NONE", "texts": ["hi"], "tools": json["tools"]}
+            answer.raise_for_status = MagicMock()
+            return answer
+
+        with patch.object(generic_guardrail.async_handler, "post", side_effect=echo_tools) as mock_post:
+            guardrailed_inputs = await generic_guardrail.apply_guardrail(
+                inputs={"texts": ["hi"], "tools": tools},
+                request_data={},
+                input_type="request",
+            )
+
+        assert mock_post.call_args.kwargs["json"]["tools"] == tools
+        assert guardrailed_inputs["tools"] == tools
+
 
 class TestFailOnError:
     """Test fail_on_error: complete fail-open on any guardrail error"""
@@ -2032,6 +2400,59 @@ class TestFailOnError:
 
         assert result == {"texts": ["model output"]}
 
+    @pytest.mark.asyncio
+    @pytest.mark.parametrize(
+        ("error", "error_type", "pre_pr_text"),
+        [
+            (
+                Timeout(message="guardrail took too long", model="gpt-5", llm_provider="openai"),
+                "Timeout",
+                "Proceeding without guardrail. guardrail_name=",
+            ),
+            (
+                httpx.ConnectError("connection refused", request=MagicMock()),
+                "ConnectError",
+                "Proceeding without guardrail. guardrail_name=",
+            ),
+            (
+                MaskedHTTPStatusError(
+                    httpx.HTTPStatusError(
+                        "bad gateway",
+                        request=httpx.Request("POST", "http://guardrail.invalid/scan"),
+                        response=httpx.Response(502, request=httpx.Request("POST", "http://guardrail.invalid/scan")),
+                    )
+                ),
+                "HTTPStatusError",
+                "Proceeding without guardrail. http_status_code=502 guardrail_name=",
+            ),
+        ],
+        ids=["timeout", "connect_error", "http_status"],
+    )
+    async def test_fail_open_log_line_names_the_error_type(
+        self, fail_open_guardrail, caplog: pytest.LogCaptureFixture, error, error_type, pre_pr_text
+    ):
+        """An operator grepping the fail-open line must be able to tell a timeout
+        from a refused connection from an upstream status without the traceback."""
+        from litellm._logging import verbose_proxy_logger
+
+        verbose_proxy_logger.addHandler(caplog.handler)
+        try:
+            with patch.object(fail_open_guardrail.async_handler, "post", side_effect=error):
+                await fail_open_guardrail.apply_guardrail(
+                    inputs={"texts": ["hi"]},
+                    request_data={},
+                    input_type="request",
+                )
+        finally:
+            verbose_proxy_logger.removeHandler(caplog.handler)
+
+        fail_open_lines: Final = [
+            record.getMessage() for record in caplog.records if record.levelno == logging.CRITICAL
+        ]
+        assert fail_open_lines
+        assert all(f"error_type={error_type}" in line.split() for line in fail_open_lines)
+        assert all(pre_pr_text in line for line in fail_open_lines)
+
     @pytest.mark.asyncio
     async def test_response_path_valid_block_still_blocks(self, fail_open_guardrail):
         """On the response path too, a valid BLOCKED decision raises despite fail_on_error=False."""
diff --git a/tests/unit/proxy/guardrails/test_guardrail_endpoints.py b/tests/unit/proxy/guardrails/test_guardrail_endpoints.py
index 908a49946bb..2e968ec04f5 100644
--- a/tests/unit/proxy/guardrails/test_guardrail_endpoints.py
+++ b/tests/unit/proxy/guardrails/test_guardrail_endpoints.py
@@ -953,6 +953,17 @@ async def test_provider_specific_params_includes_embedding_toggle():
         assert field["default_value"] is False
 
 
+@pytest.mark.asyncio
+async def test_provider_specific_params_offers_forward_messages_as_sent_off_by_default():
+    from litellm.proxy.guardrails.guardrail_endpoints import get_provider_specific_params
+
+    provider_params = await get_provider_specific_params()
+
+    field = provider_params["generic_guardrail_api"]["optional_params"]["fields"]["forward_messages_as_sent"]
+    assert field["type"] == "boolean"
+    assert field["default_value"] is False
+
+
 @pytest.mark.asyncio
 async def test_provider_specific_params_exposes_bedrock_streaming_flags():
     from litellm.proxy.guardrails.guardrail_endpoints import get_provider_specific_params
diff --git a/tests/unit/proxy/hooks/test_prompt_cache_observer.py b/tests/unit/proxy/hooks/test_prompt_cache_observer.py
index 3354aa457b7..ea89bb8d4a2 100644
--- a/tests/unit/proxy/hooks/test_prompt_cache_observer.py
+++ b/tests/unit/proxy/hooks/test_prompt_cache_observer.py
@@ -201,6 +201,10 @@ class RecordingObserver(PromptCacheObserver):
         await super().async_log_success_event(kwargs, response_obj, start_time, end_time)
         self.finished.set()
 
+    async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time):
+        await super().async_log_failure_event(kwargs, response_obj, start_time, end_time)
+        self.finished.set()
+
 
 def native_response():
     return {
diff --git a/tests/unit/proxy/management_endpoints/test_id_jag_assertion_capture.py b/tests/unit/proxy/management_endpoints/test_id_jag_assertion_capture.py
index ff4fbbfb695..97c36fd5792 100644
--- a/tests/unit/proxy/management_endpoints/test_id_jag_assertion_capture.py
+++ b/tests/unit/proxy/management_endpoints/test_id_jag_assertion_capture.py
@@ -49,8 +49,8 @@ class TestActiveSSOProviderMirrorsTheCallback:
         assert active_sso_provider() is ActiveSSOProvider.none
 
     def test_google_outranks_a_co_configured_generic_client(self, monkeypatch):
-        """The callback tests GOOGLE_CLIENT_ID first, so the generic arm never runs here and
-        no assertion is captured; reporting generic would clear a gap that is still open."""
+        """The callback tests GOOGLE_CLIENT_ID first, so the generic arm never runs here and the
+        assertion the refresher later renews was minted by the Google client, not the generic one."""
         monkeypatch.setenv("GOOGLE_CLIENT_ID", "google-cid")
         monkeypatch.setenv("GENERIC_CLIENT_ID", "generic-cid")
         assert active_sso_provider() is ActiveSSOProvider.google
@@ -67,51 +67,41 @@ class TestActiveSSOProviderMirrorsTheCallback:
 
 
 class TestIdJagAssertionCaptureGap:
-    def test_generic_oidc_has_no_gap(self, monkeypatch):
-        monkeypatch.setenv("GENERIC_CLIENT_ID", "generic-cid")
+    @pytest.mark.parametrize("env_var", ["GOOGLE_CLIENT_ID", "MICROSOFT_CLIENT_ID", "GENERIC_CLIENT_ID"])
+    def test_every_oidc_login_captures_so_has_no_gap(self, monkeypatch, env_var):
+        """Google, Microsoft and generic OIDC all read the id_token off the token response, so a
+        deployment on any of them must not be told to switch providers."""
+        monkeypatch.setenv(env_var, "configured")
         assert id_jag_assertion_capture_gap() is None
 
-    @pytest.mark.parametrize(
-        "env_var, provider_label",
-        [
-            ("GOOGLE_CLIENT_ID", "google"),
-            ("MICROSOFT_CLIENT_ID", "microsoft"),
-            ("SAML_IDP_METADATA_URL", "saml"),
-        ],
-    )
-    def test_non_capturing_provider_is_named_with_the_remedy(self, monkeypatch, env_var, provider_label):
-        monkeypatch.setenv(env_var, "configured")
-        gap = id_jag_assertion_capture_gap()
-        assert gap is not None
-        assert provider_label in gap
-        assert "GENERIC_CLIENT_ID" in gap
+    def test_saml_has_no_gap(self, monkeypatch: pytest.MonkeyPatch):
+        """The SAML callback retains the signed assertion as the saml2 subject token, so a SAML
+        deployment is a capturing one and must not be told to switch to an OIDC provider."""
+        monkeypatch.setenv("SAML_IDP_METADATA_URL", "https://idp.example.com/metadata")
+        assert id_jag_assertion_capture_gap() is None
 
     def test_no_sso_configured_reports_a_gap(self):
         gap = id_jag_assertion_capture_gap()
         assert gap is not None
         assert "no SSO provider is configured" in gap
 
-    def test_google_beside_generic_still_reports_a_gap(self, monkeypatch):
-        """The precedence trap in operator terms: adding a generic client id without removing
-        GOOGLE_CLIENT_ID does not fix the deployment, so the gap must not clear."""
-        monkeypatch.setenv("GOOGLE_CLIENT_ID", "google-cid")
-        monkeypatch.setenv("GENERIC_CLIENT_ID", "generic-cid")
-        gap = id_jag_assertion_capture_gap()
-        assert gap is not None
-        assert "google" in gap
+    def test_saml_beside_an_oidc_client_has_no_gap(self, monkeypatch):
+        """The callback dispatches to the OIDC client before SAML, so that is the login that runs
+        and it captures; reporting SAML's gap would tell the operator to fix a path nobody takes."""
+        monkeypatch.setenv("MICROSOFT_CLIENT_ID", "ms-cid")
+        monkeypatch.setenv("SAML_IDP_METADATA_URL", "https://idp.example.com/metadata")
+        assert id_jag_assertion_capture_gap() is None
 
 
 class TestIdJagAssertionCaptureGapAtStartup:
     def test_no_provider_at_startup_is_not_yet_a_gap(self):
         assert id_jag_assertion_capture_gap_at_startup() is None
 
-    def test_google_provider_at_startup_reports_the_capture_gap(self, monkeypatch):
-        monkeypatch.setenv("GOOGLE_CLIENT_ID", "google-cid")
-        startup_gap = id_jag_assertion_capture_gap_at_startup()
-        callback_gap = id_jag_assertion_capture_gap()
-        assert startup_gap is not None
-        assert startup_gap == callback_gap
-
-    def test_generic_provider_at_startup_has_no_gap(self, monkeypatch):
-        monkeypatch.setenv("GENERIC_CLIENT_ID", "generic-cid")
+    def test_saml_at_startup_has_no_gap(self, monkeypatch: pytest.MonkeyPatch):
+        monkeypatch.setenv("SAML_IDP_METADATA_URL", "https://idp.example.com/metadata")
+        assert id_jag_assertion_capture_gap_at_startup() is None
+
+    @pytest.mark.parametrize("env_var", ["GOOGLE_CLIENT_ID", "MICROSOFT_CLIENT_ID", "GENERIC_CLIENT_ID"])
+    def test_an_oidc_provider_at_startup_has_no_gap(self, monkeypatch, env_var):
+        monkeypatch.setenv(env_var, "configured")
         assert id_jag_assertion_capture_gap_at_startup() is None
diff --git a/tests/unit/proxy/management_endpoints/test_mcp_management_endpoints.py b/tests/unit/proxy/management_endpoints/test_mcp_management_endpoints.py
index 47aea89843f..0d59c655835 100644
--- a/tests/unit/proxy/management_endpoints/test_mcp_management_endpoints.py
+++ b/tests/unit/proxy/management_endpoints/test_mcp_management_endpoints.py
@@ -4458,9 +4458,9 @@ class TestAddMCPServerAtomicity:
 
 class TestIdJagRegistrationWarnsAboutTheSSOGap:
     """An `oauth2_id_jag` server only ever works when the login path captures an IdP identity
-    assertion, and only the generic OIDC arm does. Registering one under Google or Microsoft
-    succeeds and then fails for every user on every call, so the mismatch has to be said at
-    registration time, while the admin is still looking at the configuration."""
+    assertion, and only the OIDC logins (Google, Microsoft, generic) do. Registering one under SAML
+    or with no SSO succeeds and then fails for every user on every call, so the mismatch has to be
+    said at registration time, while the admin is still looking at the configuration."""
 
     @staticmethod
     def _clear_sso_env(monkeypatch):
@@ -4530,9 +4530,6 @@ class TestIdJagRegistrationWarnsAboutTheSSOGap:
     @pytest.mark.parametrize(
         "provider_env, expected_fragment",
         [
-            ({"GOOGLE_CLIENT_ID": "cid"}, "google"),
-            ({"MICROSOFT_CLIENT_ID": "cid"}, "microsoft"),
-            ({"SAML_IDP_METADATA_URL": "https://idp.example.com/metadata"}, "saml"),
             ({}, "no SSO provider is configured"),
         ],
     )
@@ -4546,8 +4543,9 @@ class TestIdJagRegistrationWarnsAboutTheSSOGap:
         assert "ema-1" in str(warnings[0])
 
     @pytest.mark.asyncio
-    async def test_create_is_silent_under_generic_oidc(self, monkeypatch, caplog):
-        await self._run_create(monkeypatch, {"GENERIC_CLIENT_ID": "cid"}, MCPAuth.oauth2_id_jag, caplog)
+    @pytest.mark.parametrize("client_id_env", ["GOOGLE_CLIENT_ID", "MICROSOFT_CLIENT_ID", "GENERIC_CLIENT_ID"])
+    async def test_create_is_silent_under_oidc_logins(self, monkeypatch, caplog, client_id_env):
+        await self._run_create(monkeypatch, {client_id_env: "cid"}, MCPAuth.oauth2_id_jag, caplog)
         assert self._id_jag_warnings(caplog) == []
 
     @pytest.mark.asyncio
@@ -4565,7 +4563,8 @@ class TestIdJagRegistrationWarnsAboutTheSSOGap:
         )
 
         self._clear_sso_env(monkeypatch)
-        monkeypatch.setenv("GOOGLE_CLIENT_ID", "cid")
+        for var in ("MICROSOFT_CLIENT_ID", "GOOGLE_CLIENT_ID", "GENERIC_CLIENT_ID", "SAML_IDP_METADATA_URL"):
+            monkeypatch.delenv(var, raising=False)
 
         mock_manager = MagicMock()
         mock_manager.update_server = AsyncMock()
@@ -4602,7 +4601,7 @@ class TestIdJagRegistrationWarnsAboutTheSSOGap:
 
         warnings = self._id_jag_warnings(caplog)
         assert len(warnings) == 1
-        assert "google" in str(warnings[0])
+        assert "no SSO provider is configured" in str(warnings[0])
 
 
 class TestHealthCheckServers:
diff --git a/tests/unit/proxy/management_endpoints/test_model_management_endpoints.py b/tests/unit/proxy/management_endpoints/test_model_management_endpoints.py
index beffe454b8d..ad75344afba 100644
--- a/tests/unit/proxy/management_endpoints/test_model_management_endpoints.py
+++ b/tests/unit/proxy/management_endpoints/test_model_management_endpoints.py
@@ -3758,6 +3758,43 @@ class TestUpdateDBModelClearPricing:
         assert "cache_creation_input_token_cost" not in params
         assert "cache_creation_input_token_cost" not in info
 
+    def test_clear_cache_write_1h_cost_removes_from_both_blobs(self):
+        """The dashboard clears the 1 hour cache-write tier with an explicit null, which only
+        takes effect for fields in SPECIAL_MODEL_INFO_PARAMS."""
+        from litellm.proxy.management_endpoints.model_management_endpoints import (
+            update_db_model,
+        )
+        from litellm.types.router import (
+            Deployment,
+            LiteLLM_Params,
+            ModelInfo,
+            updateLiteLLMParams,
+        )
+
+        db_model = Deployment(
+            model_name="anthropic/*",
+            litellm_params=LiteLLM_Params(
+                model="anthropic/*",
+                cache_creation_input_token_cost=0.00000375,
+                cache_creation_input_token_cost_above_1hr=0.000006,
+            ),
+            model_info=ModelInfo(id="dep-cache-write-1h-0"),
+        )
+
+        result = update_db_model(
+            db_model=db_model,
+            updated_patch=updateDeployment(
+                litellm_params=updateLiteLLMParams(cache_creation_input_token_cost_above_1hr=None)
+            ),
+        )
+
+        params = json.loads(result["litellm_params"])
+        info = json.loads(result["model_info"])
+        assert "cache_creation_input_token_cost_above_1hr" not in params
+        assert "cache_creation_input_token_cost_above_1hr" not in info
+        assert params["cache_creation_input_token_cost"] == 0.00000375
+        assert info["cache_creation_input_token_cost"] == 0.00000375
+
     def test_clear_cache_read_preserves_other_pricing(self):
         """Clearing cache_read must not touch input/output cost overrides."""
         from litellm.proxy.management_endpoints.model_management_endpoints import (
diff --git a/tests/unit/proxy/management_endpoints/test_saml_sso.py b/tests/unit/proxy/management_endpoints/test_saml_sso.py
index 01f8fc929a3..181c5e65dae 100644
--- a/tests/unit/proxy/management_endpoints/test_saml_sso.py
+++ b/tests/unit/proxy/management_endpoints/test_saml_sso.py
@@ -9,15 +9,17 @@ makes a test fail.
 
 import base64
 import datetime
+import logging
+import re
 import time
 from http.cookies import SimpleCookie
 
 import pytest
 from fastapi import HTTPException, Request
 
-pytest.importorskip(
-    "onelogin", reason="python3-saml (saml extra) is required for SAML SSO tests"
-)
+pytest.importorskip("onelogin", reason="python3-saml (saml extra) is required for SAML SSO tests")
+
+from typing import cast
 
 from cryptography import x509
 from cryptography.hazmat.primitives import hashes, serialization
@@ -26,11 +28,10 @@ from cryptography.x509.oid import NameOID
 from onelogin.saml2.utils import OneLogin_Saml2_Utils
 from starlette.datastructures import URL
 
-from typing import cast
-
 from litellm.caching.dual_cache import DualCache
 from litellm.caching.in_memory_cache import InMemoryCache
 from litellm.caching.redis_cache import RedisCache
+from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import SSOIdentityAssertion
 from litellm.proxy._types import LitellmUserRoles
 from litellm.proxy.management_endpoints.sso.saml_sso import (
     _SAML_AUTHN_REQUEST_CACHE_PREFIX,
@@ -40,15 +41,17 @@ from litellm.proxy.management_endpoints.sso.saml_sso import (
     _SAML_REPLAY_GUARD_MAX_TTL_SECONDS,
     SAMLAuthHandler,
 )
+from litellm.proxy.management_endpoints.types import CustomOpenID
 
 
-def _shared_cache(store=None):
+def _shared_cache(store: InMemoryCache | None = None) -> DualCache:
     """A DualCache whose replay guard is backed by a shared, atomic store.
 
     An InMemoryCache instance stands in for Redis; passing the same instance to
     two DualCaches simulates two workers sharing one atomic backend."""
     return DualCache(redis_cache=cast(RedisCache, store or InMemoryCache()))
 
+
 IDP_ENTITY = "https://idp.example.com/metadata"
 SP_ENTITY = "https://proxy.example.com/sso/saml/metadata"
 ACS = "https://proxy.example.com/sso/saml/callback"
@@ -56,7 +59,7 @@ SSO_URL = "https://idp.example.com/sso"
 PROXY_BASE_URL = "https://proxy.example.com"
 
 
-def _make_idp_keypair():
+def _make_idp_keypair() -> tuple[str, str]:
     key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
     name = x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, "idp.example.com")])
     cert = (
@@ -79,9 +82,7 @@ def _make_idp_keypair():
 
 
 def _idp_metadata_xml(cert_pem):
-    cert_body = "".join(
-        line for line in cert_pem.splitlines() if "CERTIFICATE" not in line
-    )
+    cert_body = "".join(line for line in cert_pem.splitlines() if "CERTIFICATE" not in line)
     return (
         '<?xml version="1.0"?>'
         f'<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="{IDP_ENTITY}">'
@@ -101,17 +102,17 @@ def _saml_time(delta_seconds):
 
 
 def _build_signed_response(
-    key_pem,
-    cert_pem,
+    key_pem: str,
+    cert_pem: str,
     *,
-    in_response_to=None,
-    response_level_in_response_to=True,
-    email="alice@example.com",
-    attributes=None,
-    not_before_delta=-60,
-    not_on_or_after_delta=300,
-    sign=True,
-):
+    in_response_to: str | None = None,
+    response_level_in_response_to: bool = True,
+    email: str = "alice@example.com",
+    attributes: dict[str, list[str]] | None = None,
+    not_before_delta: int = -60,
+    not_on_or_after_delta: int = 300,
+    sign: bool = True,
+) -> str:
     if attributes is None:
         attributes = {
             "email": [email],
@@ -157,9 +158,7 @@ def _build_signed_response(
 
     if sign:
         signed = OneLogin_Saml2_Utils.add_sign(assertion, key_pem, cert_pem)
-        assertion = (signed.decode() if isinstance(signed, bytes) else signed).replace(
-            '<?xml version="1.0"?>', ""
-        )
+        assertion = (signed.decode() if isinstance(signed, bytes) else signed).replace('<?xml version="1.0"?>', "")
 
     return (
         '<?xml version="1.0"?>'
@@ -174,11 +173,11 @@ def _build_signed_response(
     )
 
 
-def _b64(xml):
+def _b64(xml: str) -> str:
     return base64.b64encode(xml.encode()).decode()
 
 
-def _fake_request(cookies=None):
+def _fake_request(cookies: dict[str, str] | None = None):
     return type(
         "Req",
         (),
@@ -190,14 +189,18 @@ def _fake_request(cookies=None):
     )()
 
 
+async def _acs_login(
+    b64: str, cache: DualCache, cookies: dict[str, str] | None = None
+) -> tuple[CustomOpenID, SSOIdentityAssertion | None]:
+    return await SAMLAuthHandler.handle_acs(_fake_request(cookies), cache, {"SAMLResponse": b64})
+
+
 async def _acs(b64, cache, cookies=None):
-    return await SAMLAuthHandler.handle_acs(
-        _fake_request(cookies), cache, {"SAMLResponse": b64}
-    )
+    return (await _acs_login(b64, cache, cookies))[0]
 
 
 @pytest.fixture
-def saml_env(monkeypatch):
+def saml_env(monkeypatch: pytest.MonkeyPatch) -> tuple[str, str]:
     key_pem, cert_pem = _make_idp_keypair()
     monkeypatch.setenv("SAML_IDP_METADATA_XML", _idp_metadata_xml(cert_pem))
     monkeypatch.setenv("SAML_SP_ENTITY_ID", SP_ENTITY)
@@ -214,7 +217,7 @@ def saml_env(monkeypatch):
 
 
 @pytest.fixture
-def saml_env_idp_initiated(saml_env, monkeypatch):
+def saml_env_idp_initiated(saml_env: tuple[str, str], monkeypatch: pytest.MonkeyPatch) -> tuple[str, str]:
     monkeypatch.setenv("SAML_ALLOW_UNSOLICITED", "true")
     return saml_env
 
@@ -234,6 +237,89 @@ async def test_valid_idp_initiated_login_maps_assertion_to_user(saml_env_idp_ini
     assert result.provider == "saml"
 
 
+@pytest.mark.asyncio
+async def test_valid_login_retains_the_signed_assertion_as_a_saml2_subject_token(
+    saml_env_idp_initiated: tuple[str, str],
+):
+    """The retained material is the inner <saml:Assertion>, still carrying a verifiable signature, with
+    the assertion's own NotOnOrAfter as its expiry and no refresh token, since SAML has none."""
+    key_pem, cert_pem = saml_env_idp_initiated
+    resp = _build_signed_response(key_pem, cert_pem, not_on_or_after_delta=300)
+
+    user, assertion = await _acs_login(_b64(resp), _shared_cache())
+
+    assert assertion is not None
+    assert assertion.subject_token_type == "urn:ietf:params:oauth:token-type:saml2"
+    assert assertion.refresh_token is None
+    assert assertion.issuer == IDP_ENTITY
+    retained = _retained_bytes(assertion.id_token.get_secret_value())
+    assert retained.startswith(b"<saml:Assertion")
+    assert b"<samlp:Response" not in retained
+    assert _signature_valid(retained, cert_pem)
+    assert assertion.expires_at == datetime.datetime.strptime(
+        _conditions_not_on_or_after(resp), "%Y-%m-%dT%H:%M:%SZ"
+    ).replace(tzinfo=datetime.timezone.utc)
+
+
+def _conditions_not_on_or_after(response_xml: str) -> str:
+    match = re.search(r'<saml:Conditions[^>]*NotOnOrAfter="([^"]+)"', response_xml)
+    assert match is not None
+    return match.group(1)
+
+
+def _signature_valid(xml: bytes, cert_pem: str) -> bool:
+    return bool(OneLogin_Saml2_Utils.validate_sign(xml, cert_pem, raise_exceptions=True, xpath="//ds:Signature"))
+
+
+def _retained_bytes(encoded: str) -> bytes:
+    assert set(encoded) <= set("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_"), encoded[:40]
+    return base64.urlsafe_b64decode(encoded + "=" * (-len(encoded) % 4))
+
+
+@pytest.mark.asyncio
+async def test_retained_assertion_keeps_non_ascii_subject_bytes_verbatim(saml_env_idp_initiated: tuple[str, str]):
+    key_pem, cert_pem = saml_env_idp_initiated
+    resp = _build_signed_response(key_pem, cert_pem, email="zo\u00eb@example.com")
+
+    user, assertion = await _acs_login(_b64(resp), _shared_cache())
+
+    assert assertion is not None
+    retained = _retained_bytes(assertion.id_token.get_secret_value())
+    assert "zo\u00eb@example.com".encode() in retained
+    assert b"&#" not in retained
+    assert _signature_valid(retained, cert_pem)
+
+
+class _UnparseableResponseAuth:
+    def get_last_response_xml(self) -> bytes:
+        return b"<samlp:Response><saml:Assertion"
+
+    def get_last_assertion_not_on_or_after(self) -> int | None:
+        return None
+
+
+def test_assertion_retention_failure_does_not_fail_the_validated_login(caplog: pytest.LogCaptureFixture):
+    """Retention is optional egress material, so a response the retention step cannot parse logs and yields
+    no assertion instead of turning an IdP-validated login into a 500."""
+    with caplog.at_level(logging.WARNING):
+        retained = SAMLAuthHandler._retained_assertion(_UnparseableResponseAuth())
+
+    assert retained is None
+    assert "could not be retained for oauth2_id_jag" in caplog.text
+
+
+@pytest.mark.asyncio
+async def test_retained_assertion_is_the_one_the_user_was_mapped_from(saml_env_idp_initiated: tuple[str, str]):
+    key_pem, cert_pem = saml_env_idp_initiated
+    resp = _build_signed_response(key_pem, cert_pem, email="bob@example.com")
+
+    user, assertion = await _acs_login(_b64(resp), _shared_cache())
+
+    assert user.email == "bob@example.com"
+    assert assertion is not None
+    assert b"bob@example.com" in _retained_bytes(assertion.id_token.get_secret_value())
+
+
 @pytest.mark.asyncio
 async def test_tampered_assertion_is_rejected(saml_env):
     key_pem, cert_pem = saml_env
@@ -269,9 +355,7 @@ async def test_signature_from_untrusted_key_is_rejected(saml_env):
 @pytest.mark.asyncio
 async def test_expired_assertion_is_rejected(saml_env):
     key_pem, cert_pem = saml_env
-    resp = _build_signed_response(
-        key_pem, cert_pem, not_before_delta=-7200, not_on_or_after_delta=-3600
-    )
+    resp = _build_signed_response(key_pem, cert_pem, not_before_delta=-7200, not_on_or_after_delta=-3600)
 
     with pytest.raises(HTTPException) as exc:
         await _acs(_b64(resp), DualCache())
@@ -293,9 +377,7 @@ async def test_sp_initiated_known_request_succeeds_once_then_replay_rejected(sam
     key_pem, cert_pem = saml_env
     cache = DualCache()
     request_id = "_authn_req_known"
-    cache.set_cache(
-        key=f"{_SAML_AUTHN_REQUEST_CACHE_PREFIX}:{request_id}", value="1", ttl=600
-    )
+    cache.set_cache(key=f"{_SAML_AUTHN_REQUEST_CACHE_PREFIX}:{request_id}", value="1", ttl=600)
     resp = _build_signed_response(key_pem, cert_pem, in_response_to=request_id)
     cookies = {_SAML_AUTHN_STATE_COOKIE: request_id}
 
@@ -312,9 +394,7 @@ async def test_sp_initiated_response_not_bound_to_browser_is_rejected(saml_env):
     key_pem, cert_pem = saml_env
     cache = DualCache()
     request_id = "_authn_req_known"
-    cache.set_cache(
-        key=f"{_SAML_AUTHN_REQUEST_CACHE_PREFIX}:{request_id}", value="1", ttl=600
-    )
+    cache.set_cache(key=f"{_SAML_AUTHN_REQUEST_CACHE_PREFIX}:{request_id}", value="1", ttl=600)
     resp = _build_signed_response(key_pem, cert_pem, in_response_to=request_id)
 
     with pytest.raises(HTTPException) as exc:
@@ -322,9 +402,7 @@ async def test_sp_initiated_response_not_bound_to_browser_is_rejected(saml_env):
     assert exc.value.status_code == 401
 
     with pytest.raises(HTTPException) as exc:
-        await _acs(
-            _b64(resp), cache, cookies={_SAML_AUTHN_STATE_COOKIE: "_attacker_request"}
-        )
+        await _acs(_b64(resp), cache, cookies={_SAML_AUTHN_STATE_COOKIE: "_attacker_request"})
     assert exc.value.status_code == 401
 
 
@@ -338,9 +416,7 @@ async def test_subjectconfirmation_only_in_response_to_without_cookie_is_rejecte
     key_pem, cert_pem = saml_env_idp_initiated
     cache = DualCache()
     request_id = "_authn_req_known"
-    cache.set_cache(
-        key=f"{_SAML_AUTHN_REQUEST_CACHE_PREFIX}:{request_id}", value="1", ttl=600
-    )
+    cache.set_cache(key=f"{_SAML_AUTHN_REQUEST_CACHE_PREFIX}:{request_id}", value="1", ttl=600)
     resp = _build_signed_response(
         key_pem,
         cert_pem,
@@ -358,9 +434,7 @@ async def test_subjectconfirmation_only_in_response_to_with_cookie_succeeds(saml
     key_pem, cert_pem = saml_env
     cache = DualCache()
     request_id = "_authn_req_known"
-    cache.set_cache(
-        key=f"{_SAML_AUTHN_REQUEST_CACHE_PREFIX}:{request_id}", value="1", ttl=600
-    )
+    cache.set_cache(key=f"{_SAML_AUTHN_REQUEST_CACHE_PREFIX}:{request_id}", value="1", ttl=600)
     resp = _build_signed_response(
         key_pem,
         cert_pem,
@@ -368,9 +442,7 @@ async def test_subjectconfirmation_only_in_response_to_with_cookie_succeeds(saml
         response_level_in_response_to=False,
     )
 
-    result = await _acs(
-        _b64(resp), cache, cookies={_SAML_AUTHN_STATE_COOKIE: request_id}
-    )
+    result = await _acs(_b64(resp), cache, cookies={_SAML_AUTHN_STATE_COOKIE: request_id})
     assert result.email == "alice@example.com"
 
 
@@ -415,9 +487,7 @@ async def test_assertion_without_id_is_rejected(saml_env_idp_initiated):
             return None
 
     with pytest.raises(HTTPException) as exc:
-        await SAMLAuthHandler._enforce_response_binding(
-            _AuthNoAssertionId(), _shared_cache(), None
-        )
+        await SAMLAuthHandler._enforce_response_binding(_AuthNoAssertionId(), _shared_cache(), None)
     assert exc.value.status_code == 401
     assert "ID" in exc.value.detail
 
@@ -450,9 +520,7 @@ async def test_invalid_email_in_assertion_is_rejected_cleanly(saml_env_idp_initi
 
 
 @pytest.mark.asyncio
-async def test_email_less_assertion_rejected_when_domain_restriction_configured(
-    saml_env_idp_initiated, monkeypatch
-):
+async def test_email_less_assertion_rejected_when_domain_restriction_configured(saml_env_idp_initiated, monkeypatch):
     key_pem, cert_pem = saml_env_idp_initiated
     monkeypatch.setenv("ALLOWED_EMAIL_DOMAINS", "example.com")
     resp = _build_signed_response(
@@ -558,11 +626,7 @@ async def test_build_login_redirect_targets_idp_and_caches_request_id(saml_env):
     location = redirect.headers["location"]
     assert location.startswith(SSO_URL)
     assert "SAMLRequest=" in location
-    cached = [
-        k
-        for k in cache.in_memory_cache.cache_dict
-        if k.startswith(_SAML_AUTHN_REQUEST_CACHE_PREFIX)
-    ]
+    cached = [k for k in cache.in_memory_cache.cache_dict if k.startswith(_SAML_AUTHN_REQUEST_CACHE_PREFIX)]
     assert len(cached) == 1
 
     request_id = cached[0].split(":", 1)[1]
@@ -761,9 +825,7 @@ class TestSAMLAuthnCookieSecureFlag:
             {"use_x_forwarded_for": True, "mcp_trusted_proxy_ranges": ["10.0.0.0/8"]},
         )
         cache = DualCache()
-        request = _fake_request_with_scheme(
-            "http", headers={"X-Forwarded-Proto": "https"}, client_host="10.0.0.5"
-        )
+        request = _fake_request_with_scheme("http", headers={"X-Forwarded-Proto": "https"}, client_host="10.0.0.5")
         redirect = await SAMLAuthHandler.build_login_redirect(request, cache)
         cookie = redirect.headers["set-cookie"]
         assert "Secure" in cookie
@@ -773,9 +835,32 @@ class TestSAMLAuthnCookieSecureFlag:
         monkeypatch.delenv("PROXY_BASE_URL", raising=False)
         monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {})
         cache = DualCache()
-        request = _fake_request_with_scheme(
-            "http", headers={"X-Forwarded-Proto": "https"}, client_host="203.0.113.5"
-        )
+        request = _fake_request_with_scheme("http", headers={"X-Forwarded-Proto": "https"}, client_host="203.0.113.5")
         redirect = await SAMLAuthHandler.build_login_redirect(request, cache)
         cookie = redirect.headers["set-cookie"]
         assert "Secure" not in cookie
+
+
+def test_an_encrypted_assertion_is_not_retained_and_the_login_log_says_why(caplog: pytest.LogCaptureFixture):
+    """An IdP that encrypts its assertion still signs the user in, but the ID-JAG arm has nothing to
+    present. The login log has to name that, otherwise every later 412 looks like a bug re-login cannot fix."""
+
+    class _Encrypted:
+        def get_last_response_xml(self) -> bytes:
+            return (
+                b'<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" '
+                b'xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">'
+                b'<saml:EncryptedAssertion><xenc:EncryptedData xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"/>'
+                b"</saml:EncryptedAssertion></samlp:Response>"
+            )
+
+        def get_last_assertion_not_on_or_after(self) -> int | None:
+            return None
+
+    with caplog.at_level(logging.WARNING, logger="litellm.proxy"):
+        retained = SAMLAuthHandler._retained_assertion(_Encrypted())  # pyright: ignore[reportArgumentType]  # stub auth  # pyright: ignore[reportPrivateUsage]  # the retention seam under test
+
+    assert retained is None
+    assert any(
+        "1 saml:EncryptedAssertion" in r.getMessage() and "oauth2_id_jag" in r.getMessage() for r in caplog.records
+    )
diff --git a/tests/unit/proxy/management_endpoints/test_ui_sso.py b/tests/unit/proxy/management_endpoints/test_ui_sso.py
index f69c069cfea..873182a5145 100644
--- a/tests/unit/proxy/management_endpoints/test_ui_sso.py
+++ b/tests/unit/proxy/management_endpoints/test_ui_sso.py
@@ -2,7 +2,7 @@ import asyncio
 import json
 import logging
 import os
-from collections.abc import Awaitable, Callable, Mapping
+from collections.abc import Awaitable, Callable, Mapping, Sequence
 from contextlib import ExitStack, asynccontextmanager
 from types import SimpleNamespace
 from typing import Final
@@ -10,13 +10,14 @@ from unittest.mock import AsyncMock, MagicMock, patch
 
 import httpx
 import pytest
+from pydantic import SecretStr
 import respx
 from fastapi import HTTPException, Request
 
 import litellm
 from litellm._uuid import uuid
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
-from litellm.proxy._types import LiteLLM_UserTable, NewUserResponse
+from litellm.proxy._types import LiteLLM_UserTable, NewUserResponse, ProxyException
 from litellm.proxy.auth.handle_jwt import JWTHandler
 from litellm.proxy.management_endpoints.sso import CustomMicrosoftSSO
 from litellm.proxy.management_endpoints.types import CustomOpenID
@@ -25,9 +26,11 @@ from litellm.proxy.management_endpoints.ui_sso import (
     MicrosoftSSOHandler,
     SSOAuthenticationHandler,
     _complete_cli_sso_callback_session,
+    _insert_sso_user_or_find_concurrent_insert,
     _setup_team_mappings,
     _sync_user_role_from_jwt_role_map,
     cli_sso_callback,
+    insert_sso_user,
     normalize_email,
     process_sso_jwt_access_token,
     sso_lookup_user_ids,
@@ -243,17 +246,24 @@ def test_get_microsoft_callback_response(stubbed_graph_api):
         "surname": "User",
     }
 
+    id_token = _ema_id_token(sub="msft123")
+
+    async def fake_verify(self, *args, **kwargs):
+        self._id_token = id_token
+        self._refresh_token = "msft-refresh-token"
+        return mock_response
+
     with patch.dict(
         os.environ,
         {"MICROSOFT_CLIENT_SECRET": "mock_secret", "MICROSOFT_TENANT": "mock_tenant"},
     ):
-        mock_verify = AsyncMock(return_value=mock_response)
-        with patch(
+        with patch(  # test-quality-ok: stubs the upstream Microsoft IdP boundary, where the token response is read
             "fastapi_sso.sso.microsoft.MicrosoftSSO.verify_and_process",
-            new=mock_verify,
+            autospec=True,
+            side_effect=fake_verify,
         ):
             # Act
-            result = asyncio.run(
+            result, sso_assertion = asyncio.run(
                 MicrosoftSSOHandler.get_microsoft_callback_response(
                     request=mock_request,
                     microsoft_client_id="mock_client_id",
@@ -269,6 +279,11 @@ def test_get_microsoft_callback_response(stubbed_graph_api):
     assert result.id == "msft123"
     assert result.first_name == "Microsoft"
     assert result.last_name == "User"
+    assert sso_assertion is not None
+    assert sso_assertion.id_token.get_secret_value() == id_token
+    assert sso_assertion.refresh_token is not None
+    assert sso_assertion.refresh_token.get_secret_value() == "msft-refresh-token"
+    assert sso_assertion.issuer == "https://idp.example.com"
 
 
 GRAPH_ERROR_BODIES: Final = (
@@ -317,7 +332,7 @@ def test_get_microsoft_callback_response_signs_in_a_profile_with_an_empty_error_
             "fastapi_sso.sso.microsoft.MicrosoftSSO.verify_and_process",
             new=AsyncMock(return_value={**profile, "error": empty_error}),
         ):
-            result = asyncio.run(
+            result, _ = asyncio.run(
                 MicrosoftSSOHandler.get_microsoft_callback_response(
                     request=mock_request,
                     microsoft_client_id="mock_client_id",
@@ -342,7 +357,7 @@ def test_get_microsoft_callback_response_raw_sso_response_keeps_the_graph_error(
             "fastapi_sso.sso.microsoft.MicrosoftSSO.verify_and_process",
             new=AsyncMock(return_value=dict(graph_error)),
         ):
-            result = asyncio.run(
+            result, _ = asyncio.run(
                 MicrosoftSSOHandler.get_microsoft_callback_response(
                     request=mock_request,
                     microsoft_client_id="mock_client_id",
@@ -376,7 +391,7 @@ def test_get_microsoft_callback_response_raw_sso_response(stubbed_graph_api):
             new=mock_verify,
         ):
             # Act
-            result = asyncio.run(
+            result, _ = asyncio.run(
                 MicrosoftSSOHandler.get_microsoft_callback_response(
                     request=mock_request,
                     microsoft_client_id="mock_client_id",
@@ -405,13 +420,19 @@ def test_get_google_callback_response():
         "family_name": "User",
     }
 
+    id_token = _ema_id_token(sub="google123")
+
+    async def fake_verify(self, *args, **kwargs):
+        self._id_token = id_token
+        self._refresh_token = None
+        return mock_response
+
     with patch.dict(os.environ, {"GOOGLE_CLIENT_SECRET": "mock_secret"}):
-        mock_verify = AsyncMock(return_value=mock_response)
-        with patch(
-            "fastapi_sso.sso.google.GoogleSSO.verify_and_process", new=mock_verify
+        with patch(  # test-quality-ok: stubs the upstream Google IdP boundary, where the token response is read
+            "fastapi_sso.sso.google.GoogleSSO.verify_and_process", autospec=True, side_effect=fake_verify
         ):
             # Act
-            result = asyncio.run(
+            result, sso_assertion = asyncio.run(
                 GoogleSSOHandler.get_google_callback_response(
                     request=mock_request,
                     google_client_id="mock_client_id",
@@ -426,6 +447,9 @@ def test_get_google_callback_response():
     assert result.get("sub") == "google123"
     assert result.get("given_name") == "Google"
     assert result.get("family_name") == "User"
+    assert sso_assertion is not None
+    assert sso_assertion.id_token.get_secret_value() == id_token
+    assert sso_assertion.refresh_token is None
 
 
 @pytest.mark.asyncio
@@ -1403,6 +1427,82 @@ async def test_upsert_sso_user_no_role_in_sso_response():
     assert "user_role" not in call_args.kwargs["data"]
 
 
+class _UserTable:
+    def __init__(self, *rows: LiteLLM_UserTable) -> None:
+        self.rows: dict[str, LiteLLM_UserTable] = {row.user_id: row for row in rows}
+
+    async def find_first(self, where: dict[str, dict[str, str]]) -> LiteLLM_UserTable | None:
+        ((field, condition),) = where.items()
+
+        def matches(stored: object) -> bool:
+            if condition.get("mode") == "insensitive":
+                return str(stored).lower() == condition["equals"].lower()
+            return stored == condition["equals"]
+
+        return next((row for row in self.rows.values() if matches(getattr(row, field))), None)
+
+    async def find_unique(self, where: dict[str, str]) -> LiteLLM_UserTable | None:
+        return self.rows.get(where["user_id"])
+
+
+def _users_db(table: _UserTable) -> SimpleNamespace:
+    database: Final = SimpleNamespace(litellm_usertable=table)
+    return SimpleNamespace(db=database, writer_db=database)
+
+
+async def _first_sign_in(table: _UserTable, **join: object) -> NewUserResponse | LiteLLM_UserTable:
+    prisma: Final = _users_db(table)
+    with patch("litellm.proxy.proxy_server.prisma_client", prisma):
+        return await _insert_sso_user_or_find_concurrent_insert(
+            insert=insert_sso_user(
+                result_openid=CustomOpenID(id="sso-subject", email="person@example.com", team_ids=[]),
+                user_defined_values={
+                    "user_id": "sso-subject",
+                    "user_email": "person@example.com",
+                    "user_role": None,
+                    "max_budget": None,
+                    "budget_duration": None,
+                    "models": [],
+                },
+            ),
+            user_id="sso-subject",
+            prisma_client=prisma,
+            **join,
+        )
+
+
+@pytest.mark.asyncio
+async def test_first_sign_in_signs_in_to_the_account_a_concurrent_first_sign_in_created():
+    winner: Final = LiteLLM_UserTable(user_id="sso-subject", user_email="person@example.com", user_role="internal_user")
+
+    signed_in: Final = await _first_sign_in(_UserTable(winner))
+
+    assert signed_in == winner
+
+
+@pytest.mark.asyncio
+async def test_first_sign_in_does_not_sign_in_to_another_account_holding_the_email():
+    other: Final = LiteLLM_UserTable(user_id="someone-else", user_email="Person@example.com", user_role="proxy_admin")
+
+    with pytest.raises(ProxyException, match=r"User with email Person@example\.com already exists"):
+        await _first_sign_in(_UserTable(other))
+
+
+@pytest.mark.asyncio
+async def test_first_sign_in_joins_default_teams_the_concurrent_first_sign_in_has_not_joined_yet(monkeypatch):
+    monkeypatch.setattr(litellm, "default_internal_user_params", {"teams": ["team-joined", "team-pending"]})
+    table: Final = _UserTable(
+        LiteLLM_UserTable(user_id="sso-subject", user_email="person@example.com", teams=["team-joined"])
+    )
+
+    async def join(user: LiteLLM_UserTable, teams: Sequence[object], prisma_client: object) -> None:
+        table.rows[user.user_id] = user.model_copy(update={"teams": [*user.teams, *map(str, teams)]})
+
+    signed_in: Final = await _first_sign_in(table, join_default_teams=join)
+
+    assert signed_in.teams == ["team-joined", "team-pending"]
+
+
 def test_get_user_email_and_id_extracts_microsoft_role():
     """
     Test that _get_user_email_and_id_from_result extracts user_role from Microsoft SSO.
@@ -4018,7 +4118,13 @@ class TestCLIKeyRegenerationFlow:
         cli_state = f"{LITELLM_CLI_SESSION_TOKEN_PREFIX}:cli-new-session-key-456"
 
         # Mock the CLI callback and required proxy server components
+        from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+            assertion_from_sso_login,
+        )
+
         mock_result = {"user_id": "test-user", "email": "test@example.com"}
+        google_assertion = assertion_from_sso_login(_ema_id_token(sub="test-user"), None)
+        assert google_assertion is not None
 
         with (
             patch(
@@ -4032,7 +4138,7 @@ class TestCLIKeyRegenerationFlow:
             patch.dict(os.environ, {"GOOGLE_CLIENT_ID": "test-google-id"}, clear=True),
             patch(
                 "litellm.proxy.management_endpoints.ui_sso.GoogleSSOHandler.get_google_callback_response",
-                return_value=mock_result,
+                return_value=(mock_result, google_assertion),
             ),
         ):
             mock_cli_callback.return_value = MagicMock()
@@ -4046,7 +4152,7 @@ class TestCLIKeyRegenerationFlow:
                 prefill_user_code=None,
                 result=mock_result,
                 received_response=None,
-                sso_assertion=None,
+                sso_assertion=google_assertion,
             )
 
     @pytest.mark.asyncio
@@ -4074,7 +4180,7 @@ class TestCLIKeyRegenerationFlow:
             patch.dict(os.environ, {"GOOGLE_CLIENT_ID": "test-google-id"}, clear=True),
             patch(
                 "litellm.proxy.management_endpoints.ui_sso.GoogleSSOHandler.get_google_callback_response",
-                return_value=mock_result,
+                return_value=(mock_result, None),
             ),
         ):
             mock_cli_callback.return_value = MagicMock()
@@ -8836,7 +8942,7 @@ async def test_debug_sso_callback_handles_missing_raw_response():
     )
 
     async def fake_microsoft_callback(**kwargs):
-        return parsed_openid
+        return parsed_openid, None
 
     with (
         patch.dict(
@@ -8886,7 +8992,7 @@ async def _render_debug_page(provider_env, id_jag_registered, force_inert=False)
         return parsed, {"sub": "user_123"}, {"scope": "openid"}, None
 
     async def fake_google(**kwargs):
-        return parsed
+        return parsed, None
 
     stack = [
         patch.dict(os.environ, {**provider_env, "ENABLE_SSO_DEBUG": "true"}, clear=False),
@@ -8925,14 +9031,14 @@ async def _render_debug_page(provider_env, id_jag_registered, force_inert=False)
 
 
 @pytest.mark.asyncio
-async def test_debug_page_logs_the_capture_gap_but_never_renders_it(caplog):
+async def test_debug_page_logs_no_capture_gap_for_a_google_login(caplog):
+    """Google reads the id_token off its token response like generic OIDC does, so the debug page
+    under GOOGLE_CLIENT_ID with an oauth2_id_jag server registered has no gap to log and nothing
+    to render about it."""
     with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
         body = await _render_debug_page({"GOOGLE_CLIENT_ID": _GOOGLE_DEBUG_CLIENT_ID}, id_jag_registered=True)
 
-    warnings = _id_jag_gap_warnings(caplog)
-    assert len(warnings) == 1
-    assert "google" in warnings[0]
-    assert "GENERIC_CLIENT_ID" in warnings[0]
+    assert _id_jag_gap_warnings(caplog) == []
     assert "id_jag" not in body
     assert "GENERIC_CLIENT_ID" not in body
 
@@ -8977,7 +9083,8 @@ async def test_debug_page_survives_a_store_outage(monkeypatch, caplog):
     not the page."""
     from litellm.proxy.management_endpoints.ui_sso import warn_if_id_jag_capture_gap
 
-    monkeypatch.setenv("GOOGLE_CLIENT_ID", _GOOGLE_DEBUG_CLIENT_ID)
+    for var in ("MICROSOFT_CLIENT_ID", "GOOGLE_CLIENT_ID", "GENERIC_CLIENT_ID", "SAML_IDP_METADATA_URL"):
+        monkeypatch.delenv(var, raising=False)
     retention_check = AsyncMock(side_effect=Exception("db down"))
     with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
         assert await warn_if_id_jag_capture_gap(retention_enabled=retention_check) is None
@@ -9103,7 +9210,7 @@ async def test_saml_callback_enforces_free_sso_user_limit_after_validation():
 
     async def _fake_handle_acs(**kwargs):
         call_order.append("validate")
-        return CustomOpenID(
+        return (CustomOpenID(
             id="dana@litellm.ai",
             email="dana@litellm.ai",
             first_name=None,
@@ -9113,7 +9220,7 @@ async def test_saml_callback_enforces_free_sso_user_limit_after_validation():
             provider="saml",
             team_ids=[],
             user_role=None,
-        )
+        ), None)
 
     async def _fake_count_billable_users():
         call_order.append("count")
@@ -9635,6 +9742,233 @@ async def test_redirect_from_openid_persists_assertion_under_canonical_user_id()
     assert response is not None
 
 
+@pytest.mark.asyncio
+async def test_redirect_from_openid_persists_the_login_exchanged_assertion():
+    """A server with ``id_jag_subject_source: refresh_token`` needs the refresh token the login
+    assertion was exchanged for, so the funnel persists what the login-time exchange returns, not
+    the raw capture."""
+    from litellm.proxy._experimental.mcp_server.outbound_credentials.sso_assertion_store import (
+        assertion_from_sso_login,
+    )
+
+    assertion = assertion_from_sso_login(_ema_id_token(), "rt_1")
+    assert assertion is not None
+    mock_request = MagicMock(spec=Request)
+    mock_request.scope = {}
+    mock_request.base_url = "http://localhost:4000/"
+    mock_request.cookies = {}
+
+    retain_mock = AsyncMock()
+    exchanged = assertion.model_copy(update={"exchanged_refresh_token": SecretStr("rt-from-login")})
+    exchange_mock = AsyncMock(return_value=exchanged)
+    with (
+        patch("litellm.proxy.utils.get_prisma_client_or_throw", return_value=MagicMock()),
+        patch("litellm.proxy.proxy_server.master_key", "sk-master"),
+        patch("litellm.proxy.proxy_server.general_settings", {}),
+        patch("litellm.proxy.proxy_server.premium_user", False),
+        patch("litellm.proxy.proxy_server.user_custom_sso", None),
+        patch("litellm.proxy.proxy_server.proxy_logging_obj", MagicMock()),
+        patch("litellm.proxy.proxy_server.redis_usage_cache", None),
+        patch("litellm.proxy.proxy_server.user_api_key_cache", MagicMock()),
+        patch(
+            "litellm.proxy.proxy_server.generate_key_helper_fn",
+            AsyncMock(
+                return_value={"token": "sk-ui-key", "user_id": "canonical-user-id"}
+            ),
+        ),
+        patch(
+            "litellm.proxy.management_endpoints.ui_sso.get_user_info_from_db",
+            AsyncMock(return_value=None),
+        ),
+        patch(
+            "litellm.proxy.management_endpoints.ui_sso.check_and_update_if_proxy_admin_id",
+            AsyncMock(return_value="internal_user"),
+        ),
+        patch(
+            "litellm.proxy.management_endpoints.ui_sso.retain_sso_identity_assertion_for_ema",
+            retain_mock,
+        ),
+        patch(
+            "litellm.proxy.management_endpoints.ui_sso.exchange_login_assertion_if_configured",
+            exchange_mock,
+        ),
+    ):
+        response = await SSOAuthenticationHandler.get_redirect_response_from_openid(
+            result=CustomOpenID(
+                id="raw-idp-subject",
+                email="u@example.com",
+                first_name="U",
+                last_name="Ser",
+                display_name="U Ser",
+                provider="generic",
+                team_ids=[],
+                user_role=None,
+            ),
+            request=mock_request,
+            received_response=None,
+            generic_client_id="cid",
+            ui_access_mode=None,
+            access_token_payload=None,
+            jwt_handler=None,
+            sso_assertion=assertion,
+        )
+    exchange_mock.assert_awaited_once_with(assertion)
+    retain_mock.assert_awaited_once()
+    assert retain_mock.await_args.kwargs["assertion"] is exchanged
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "provider_env, sso_class, payload, needs_graph",
+    [
+        (
+            {"MICROSOFT_CLIENT_ID": "ms-cid", "MICROSOFT_CLIENT_SECRET": "ms-secret", "MICROSOFT_TENANT": "tenant"},
+            "fastapi_sso.sso.microsoft.MicrosoftSSO",
+            {"mail": "u@example.com", "displayName": "U Ser", "id": "idp-subject"},
+            True,
+        ),
+        (
+            {"GOOGLE_CLIENT_ID": "google-cid", "GOOGLE_CLIENT_SECRET": "google-secret"},
+            "fastapi_sso.sso.google.GoogleSSO",
+            {"email": "u@example.com", "name": "U Ser", "sub": "idp-subject"},
+            False,
+        ),
+    ],
+)
+async def test_ui_login_through_microsoft_or_google_hands_its_assertion_to_the_redirect(
+    request, provider_env, sso_class, payload, needs_graph
+):
+    """The UI funnel used to capture an assertion only on the generic branch, so an ``oauth2_id_jag``
+    server had nothing to spend for a deployment signing in through Entra or Google. The real
+    Microsoft and Google handlers run here, only the IdP token exchange is stubbed, so the id_token
+    and refresh token the IdP returned must reach the redirect that persists them."""
+    from litellm.proxy.management_endpoints.ui_sso import SSOAuthenticationHandler, auth_callback
+
+    if needs_graph:
+        request.getfixturevalue("stubbed_graph_api")
+    id_token = _ema_id_token(sub="idp-subject")
+
+    async def fake_verify(self, *args, **kwargs):
+        self._id_token = id_token
+        self._refresh_token = "idp-refresh"
+        return payload
+
+    mock_request = MagicMock(spec=Request)
+    mock_request.query_params = {"code": "auth-code"}
+    mock_request.cookies = {}
+    mock_request.scope = {}
+    mock_request.base_url = "http://localhost:4000/"
+    redirect_mock = AsyncMock(return_value=MagicMock())
+
+    with (
+        patch.dict(os.environ, provider_env, clear=True),
+        patch("litellm.proxy.proxy_server.prisma_client", MagicMock()),
+        patch("litellm.proxy.proxy_server.master_key", "sk-master"),
+        patch("litellm.proxy.proxy_server.general_settings", {}),
+        patch("litellm.proxy.proxy_server.jwt_handler", MagicMock()),
+        patch("litellm.proxy.proxy_server.user_api_key_cache", MagicMock()),
+        patch(  # test-quality-ok: stubs the upstream IdP token exchange, where the token response is read
+            f"{sso_class}.verify_and_process", autospec=True, side_effect=fake_verify
+        ),
+        patch.object(  # test-quality-ok: the DB and key-mint boundary after the login, asserted on its inputs
+            SSOAuthenticationHandler, "get_redirect_response_from_openid", redirect_mock
+        ),
+    ):
+        await auth_callback(request=mock_request, state=None)
+
+    redirect_mock.assert_awaited_once()
+    assert redirect_mock.await_args.kwargs["result"] is not None
+    sso_assertion = redirect_mock.await_args.kwargs["sso_assertion"]
+    assert sso_assertion is not None
+    assert sso_assertion.id_token.get_secret_value() == id_token
+    assert sso_assertion.refresh_token is not None
+    assert sso_assertion.refresh_token.get_secret_value() == "idp-refresh"
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "retention_enabled, expected_params",
+    [
+        (AsyncMock(return_value=True), {"access_type": "offline", "prompt": "consent"}),
+        (AsyncMock(return_value=False), None),
+        (AsyncMock(side_effect=RuntimeError("store down")), None),
+    ],
+)
+async def test_google_login_asks_for_a_refresh_token_only_while_an_id_jag_server_exists(
+    retention_enabled, expected_params
+):
+    """Google issues a refresh token only when the authorization request carries ``access_type=offline``,
+    and the refresher cannot renew a Google assertion without one. The login asks only while an
+    ``oauth2_id_jag`` server exists, and a store outage must not fail the login or add the consent."""
+    from fastapi.responses import RedirectResponse
+
+    from litellm.proxy.management_endpoints.ui_sso import SSOAuthenticationHandler
+
+    seen: dict[str, object] = {}
+
+    async def fake_redirect(self, *, redirect_uri=None, params=None, state=None):
+        seen["params"] = params
+        return RedirectResponse(url="https://accounts.google.com/o/oauth2/v2/auth")
+
+    with (
+        patch.dict(os.environ, {"GOOGLE_CLIENT_SECRET": "google-secret"}),
+        patch(  # test-quality-ok: stubs the upstream Google authorization boundary, where the request leaves
+            "fastapi_sso.sso.google.GoogleSSO.get_login_redirect", autospec=True, side_effect=fake_redirect
+        ),
+    ):
+        response = await SSOAuthenticationHandler.get_sso_login_redirect(
+            redirect_url="http://localhost:4000/sso/callback",
+            google_client_id="google-cid",
+            retention_enabled=retention_enabled,
+        )
+
+    assert response is not None
+    assert seen["params"] == expected_params
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "retention_enabled, asks_offline_access",
+    [
+        (AsyncMock(return_value=True), True),
+        (AsyncMock(return_value=False), False),
+        (AsyncMock(side_effect=RuntimeError("store down")), False),
+    ],
+)
+async def test_microsoft_login_asks_for_offline_access_only_while_an_id_jag_server_exists(
+    retention_enabled, asks_offline_access
+):
+    """Entra issues a refresh token only when ``offline_access`` is in the requested scope, and the
+    refresher cannot renew an Entra assertion without one. The default sign-in scopes stay in place so
+    the login keeps resolving the same profile."""
+    from fastapi.responses import RedirectResponse
+    from fastapi_sso.sso.microsoft import MicrosoftSSO
+
+    from litellm.proxy.management_endpoints.ui_sso import SSOAuthenticationHandler
+
+    seen: dict[str, object] = {}
+
+    async def fake_redirect(self, *, redirect_uri=None, params=None, state=None):
+        seen["scope"] = list(self._scope)
+        return RedirectResponse(url="https://login.microsoftonline.com/tenant/oauth2/v2.0/authorize")
+
+    with (
+        patch.dict(os.environ, {"MICROSOFT_CLIENT_SECRET": "ms-secret", "MICROSOFT_TENANT": "tenant"}),
+        patch(  # test-quality-ok: stubs the upstream Entra authorization boundary, where the request leaves
+            "fastapi_sso.sso.microsoft.MicrosoftSSO.get_login_redirect", autospec=True, side_effect=fake_redirect
+        ),
+    ):
+        response = await SSOAuthenticationHandler.get_sso_login_redirect(
+            redirect_url="http://localhost:4000/sso/callback",
+            microsoft_client_id="ms-cid",
+            retention_enabled=retention_enabled,
+        )
+
+    assert response is not None
+    assert all(default in seen["scope"] for default in MicrosoftSSO.scope), seen["scope"]
+    assert ("offline_access" in seen["scope"]) is asks_offline_access, seen["scope"]
+
+
 @pytest.mark.asyncio
 async def test_cli_completion_persists_assertion_under_db_user_id():
     """The CLI funnel persists the captured assertion under the DB-resolved user_id."""
@@ -9710,8 +10044,6 @@ def _id_jag_gap_warnings(caplog) -> list[str]:
 @pytest.mark.parametrize(
     "provider_env, expected_fragment",
     [
-        ({"GOOGLE_CLIENT_ID": "cid"}, "google"),
-        ({"MICROSOFT_CLIENT_ID": "cid", "MICROSOFT_TENANT": "t"}, "microsoft"),
         ({}, "no SSO provider is configured"),
     ],
 )
@@ -9738,16 +10070,17 @@ async def test_uncaptured_assertion_warns_when_an_id_jag_server_is_registered(
 
 
 @pytest.mark.asyncio
-async def test_generic_provider_that_returned_no_id_token_still_warns(monkeypatch, caplog):
-    """Generic OIDC has a capture path, so there is no configuration gap to report; the login
-    still handed the id_jag arm nothing, and that must not pass silently."""
+@pytest.mark.parametrize("provider_env_var", ["GOOGLE_CLIENT_ID", "MICROSOFT_CLIENT_ID", "GENERIC_CLIENT_ID"])
+async def test_a_capturing_provider_that_returned_no_id_token_still_warns(monkeypatch, caplog, provider_env_var):
+    """Google, Microsoft and generic OIDC all have a capture path, so there is no configuration gap
+    to report; the login still handed the id_jag arm nothing, and that must not pass silently."""
     from litellm.proxy.management_endpoints.ui_sso import (
         warn_if_id_jag_assertion_uncaptured,
     )
 
-    for name in ("GOOGLE_CLIENT_ID", "MICROSOFT_CLIENT_ID", "SAML_IDP_METADATA_URL"):
+    for name in ("GOOGLE_CLIENT_ID", "MICROSOFT_CLIENT_ID", "GENERIC_CLIENT_ID", "SAML_IDP_METADATA_URL"):
         monkeypatch.delenv(name, raising=False)
-    monkeypatch.setenv("GENERIC_CLIENT_ID", "cid")
+    monkeypatch.setenv(provider_env_var, "cid")
 
     with caplog.at_level(logging.WARNING, logger="LiteLLM Proxy"):
         await warn_if_id_jag_assertion_uncaptured(None, retention_enabled=AsyncMock(return_value=True))
@@ -9875,7 +10208,7 @@ async def test_browser_funnel_reports_an_uncaptured_assertion(monkeypatch, caplo
 
     warnings = _id_jag_gap_warnings(caplog)
     assert len(warnings) == 1
-    assert "google" in str(warnings[0])
+    assert "no usable id_token" in str(warnings[0])
 
 
 @pytest.mark.asyncio
@@ -9939,7 +10272,7 @@ async def test_cli_funnel_reports_an_uncaptured_assertion(monkeypatch, caplog):
 
     warnings = _id_jag_gap_warnings(caplog)
     assert len(warnings) == 1
-    assert "microsoft" in str(warnings[0])
+    assert "no usable id_token" in str(warnings[0])
 
 
 def _cli_callback_kwargs(flow):
diff --git a/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py
index 88c5e2d2c1b..4770ecd5485 100644
--- a/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py
+++ b/tests/unit/proxy/pass_through_endpoints/llm_provider_handlers/test_anthropic_passthrough_logging_handler.py
@@ -5,11 +5,10 @@ from typing import Any, Dict, Final, List
 from unittest.mock import AsyncMock, MagicMock, Mock, patch
 
 import httpx
-import litellm
 import pytest
 from pydantic import ValidationError
 
-
+import litellm
 from litellm.integrations.custom_logger import CustomLogger
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
 from litellm.llms.anthropic.pass_through.stream_assembly import extract_sse_data
@@ -2644,6 +2643,58 @@ class TestRecordPartialUsageForFailure:
         assert "response_cost" not in logging_obj.model_call_details
 
 
+class _FailureRecorder(CustomLogger):
+    def __init__(self):
+        super().__init__()
+        self.failure_kwargs = []
+
+    async def async_log_failure_event(self, kwargs, response_obj, start_time, end_time):
+        self.failure_kwargs.append(kwargs)
+
+
+class TestLogErrorFrameAsFailure:
+    """A stream closed at the provider's `event: error` frame is one failed attempt: its failure log bills the
+    usage streamed before the frame on the attempt-scoped copy its caller hands it, and the request's shared
+    logging state stays as it was, so the attempt the router opens next logs with nothing left behind."""
+
+    @pytest.mark.asyncio
+    async def test_logs_a_failure_with_the_usage_streamed_before_the_frame_and_leaves_the_request_state_alone(self):
+        recorder = _FailureRecorder()
+        logging_obj = LiteLLMLoggingObj(
+            model="claude-sonnet-5",
+            messages=[{"role": "user", "content": "hello"}],
+            stream=True,
+            call_type="anthropic_messages",
+            start_time=datetime.now(),
+            litellm_call_id="test-error-frame-failure",
+            function_id="test-error-frame-failure",
+            dynamic_async_failure_callbacks=[recorder],
+        )
+        chunks = [
+            *TestRecordPartialUsageForFailure()._interrupted_chunks()[:1],
+            TestRecordPartialUsageForFailure._sse(
+                "error", {"type": "error", "error": {"type": "overloaded_error", "message": "Overloaded"}}
+            ),
+        ]
+
+        await AnthropicPassthroughLoggingHandler.log_error_frame_as_failure(
+            attempt_logging_obj=logging_obj.attempt_scoped_copy(),
+            request_body={"model": "claude-sonnet-5", "stream": True},
+            all_chunks=chunks,
+            error_event=("overloaded_error", "Overloaded", 529),
+        )
+
+        assert len(recorder.failure_kwargs) == 1
+        failure_payload = recorder.failure_kwargs[0]["standard_logging_object"]
+        assert failure_payload["status"] == "failure"
+        assert failure_payload["prompt_tokens"] == 52
+        assert failure_payload["response_cost"] > 0
+        assert isinstance(recorder.failure_kwargs[0]["exception"], litellm.InternalServerError)
+        assert "combined_usage_object" not in logging_obj.model_call_details
+        assert "response_cost" not in logging_obj.model_call_details
+        assert logging_obj.should_run_logging("async_failure")
+
+
 @pytest.mark.parametrize(
     ("all_chunks", "interrupted"),
     [
diff --git a/tests/unit/proxy/pass_through_endpoints/test_streaming_handler_interrupt.py b/tests/unit/proxy/pass_through_endpoints/test_streaming_handler_interrupt.py
index b278d7dea01..8ce41129aec 100644
--- a/tests/unit/proxy/pass_through_endpoints/test_streaming_handler_interrupt.py
+++ b/tests/unit/proxy/pass_through_endpoints/test_streaming_handler_interrupt.py
@@ -18,6 +18,7 @@ from litellm.proxy.pass_through_endpoints.llm_provider_handlers.tinyfish_passthr
 from litellm.integrations.custom_logger import CustomLogger
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
 from litellm.litellm_core_utils.logging_worker import GLOBAL_LOGGING_WORKER
+from litellm.llms.anthropic.pass_through.messages.streaming_iterator import aclose_superseded_attempt
 from litellm.proxy.pass_through_endpoints.streaming_handler import (
     PassThroughStreamingHandler,
 )
@@ -749,6 +750,294 @@ async def test_chunk_processor_logs_failure_not_success_on_mid_stream_exception(
     assert isinstance(recorder.failure_kwargs[0]["exception"], httpx.ReadTimeout)
 
 
+def _anthropic_message_start_frame(message_id: str = "msg_1", input_tokens: int = 52) -> bytes:
+    return _anthropic_sse(
+        "message_start",
+        {
+            "type": "message_start",
+            "message": {
+                "id": message_id,
+                "type": "message",
+                "role": "assistant",
+                "model": "claude-sonnet-5",
+                "content": [],
+                "stop_reason": None,
+                "stop_sequence": None,
+                "usage": {"input_tokens": input_tokens, "output_tokens": 1},
+            },
+        },
+    )
+
+
+def _anthropic_completed_stream_tail() -> tuple[bytes, ...]:
+    return (
+        _anthropic_sse(
+            "content_block_start",
+            {"type": "content_block_start", "index": 0, "content_block": {"type": "text", "text": ""}},
+        ),
+        _anthropic_sse(
+            "content_block_delta",
+            {"type": "content_block_delta", "index": 0, "delta": {"type": "text_delta", "text": "pong"}},
+        ),
+        _anthropic_sse("content_block_stop", {"type": "content_block_stop", "index": 0}),
+        _anthropic_sse(
+            "message_delta",
+            {"type": "message_delta", "delta": {"stop_reason": "end_turn", "stop_sequence": None}, "usage": {"output_tokens": 3}},
+        ),
+        _anthropic_sse("message_stop", {"type": "message_stop"}),
+    )
+
+
+async def _settle(recorded: list[dict[str, object]]) -> None:
+    for _ in range(300):
+        if recorded:
+            return
+        await asyncio.sleep(0.01)
+
+
+def _anthropic_overloaded_error_frame() -> bytes:
+    return _anthropic_sse("error", {"type": "error", "error": {"type": "overloaded_error", "message": "Overloaded"}})
+
+
+def _anthropic_stream_of(frames: tuple[bytes, ...]):
+    mock = MagicMock(spec=httpx.Response)
+    mock.status_code = 200
+
+    async def _aiter_bytes():
+        for frame in frames:
+            yield frame
+
+    mock.aiter_bytes = _aiter_bytes
+    return mock
+
+
+@pytest.mark.parametrize(
+    "frames, billed",
+    [
+        pytest.param(
+            (_anthropic_message_start_frame(), _anthropic_overloaded_error_frame()), True, id="error-after-message-start"
+        ),
+        pytest.param((_anthropic_overloaded_error_frame(),), False, id="error-frame-only"),
+    ],
+)
+@pytest.mark.asyncio
+async def test_chunk_processor_logs_a_provider_error_frame_as_a_failure_when_closed_at_the_frame(frames, billed):
+    """The router retries a /v1/messages stream whose provider sent `event: error` before any content by closing
+    it at the frame. That attempt never completed: it logs once as a failure carrying whatever usage the provider
+    had reported, and the request's one-shot success log stays free for the retry that shares the logging object."""
+    recorder = _EventRecorder()
+    logging_obj = LiteLLMLoggingObj(
+        model="claude-sonnet-5",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=True,
+        call_type="anthropic_messages",
+        start_time=datetime.now(),
+        litellm_call_id="test-error-frame",
+        function_id="test-error-frame",
+        dynamic_async_success_callbacks=[recorder],
+        dynamic_async_failure_callbacks=[recorder],
+    )
+    stream = PassThroughStreamingHandler.chunk_processor(
+        response=_anthropic_stream_of(frames),
+        request_body={"model": "claude-sonnet-5", "stream": True},
+        litellm_logging_obj=logging_obj,
+        endpoint_type=EndpointType.ANTHROPIC,
+        start_time=datetime.now(),
+        passthrough_success_handler_obj=MagicMock(),
+        url_route="/v1/messages",
+    )
+    received = []
+    async for chunk in stream:
+        received.append(chunk)
+        if b"event: error" in chunk:
+            break
+    await aclose_superseded_attempt(stream)
+    await _settle(recorder.failure_kwargs)
+
+    assert received == list(frames)
+    assert recorder.success_kwargs == []
+    assert logging_obj.model_call_details.get("has_dispatched_final_stream_success") is not True
+    assert "combined_usage_object" not in logging_obj.model_call_details
+    assert "response_cost" not in logging_obj.model_call_details
+    assert logging_obj.should_run_logging("async_failure")
+    assert len(recorder.failure_kwargs) == 1
+    failure_payload = recorder.failure_kwargs[0]["standard_logging_object"]
+    assert failure_payload["status"] == "failure"
+    assert isinstance(recorder.failure_kwargs[0]["exception"], litellm.InternalServerError)
+    if billed:
+        assert failure_payload["prompt_tokens"] == 52
+        assert failure_payload["response_cost"] > 0
+    else:
+        assert failure_payload["response_cost"] == 0
+
+
+@pytest.mark.asyncio
+async def test_chunk_processor_logs_a_stream_that_ended_at_the_provider_error_frame_through_the_success_route():
+    """A provider error frame that ends a stream nobody closed early is the request's final answer, and that
+    stream keeps logging the way it always has: once, through the success route, with the usage it carried."""
+    recorder = _EventRecorder()
+    logging_obj = LiteLLMLoggingObj(
+        model="claude-sonnet-5",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=True,
+        call_type="anthropic_messages",
+        start_time=datetime.now(),
+        litellm_call_id="test-final-error-frame",
+        function_id="test-final-error-frame",
+        dynamic_async_success_callbacks=[recorder],
+        dynamic_async_failure_callbacks=[recorder],
+    )
+    frames = (_anthropic_message_start_frame(), _anthropic_overloaded_error_frame())
+    received = [
+        chunk
+        async for chunk in PassThroughStreamingHandler.chunk_processor(
+            response=_anthropic_stream_of(frames),
+            request_body={"model": "claude-sonnet-5", "stream": True},
+            litellm_logging_obj=logging_obj,
+            endpoint_type=EndpointType.ANTHROPIC,
+            start_time=datetime.now(),
+            passthrough_success_handler_obj=MagicMock(),
+            url_route="/v1/messages",
+        )
+    ]
+    await _settle(recorder.success_kwargs)
+
+    assert received == list(frames)
+    assert recorder.failure_kwargs == []
+    success_payload = recorder.success_kwargs[0]["standard_logging_object"]
+    assert success_payload["status"] == "success"
+    assert success_payload["prompt_tokens"] == 52
+    assert logging_obj.model_call_details["prompt_cache_response_complete"] is False
+
+
+@pytest.mark.asyncio
+async def test_chunk_processor_bills_a_stream_the_client_closed_at_the_provider_error_frame():
+    """The Anthropic SDK raises on a provider `event: error` frame and drops the connection, so a non-retried
+    stream is closed at the frame by the client, not by a retry taking over. Its usage must still reach the
+    success route, or the tokens the provider billed never reach the key's spend."""
+    recorder = _EventRecorder()
+    logging_obj = LiteLLMLoggingObj(
+        model="claude-sonnet-5",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=True,
+        call_type="anthropic_messages",
+        start_time=datetime.now(),
+        litellm_call_id="test-client-closed-at-error-frame",
+        function_id="test-client-closed-at-error-frame",
+        dynamic_async_success_callbacks=[recorder],
+        dynamic_async_failure_callbacks=[recorder],
+    )
+    stream = PassThroughStreamingHandler.chunk_processor(
+        response=_anthropic_stream_of((_anthropic_message_start_frame(), _anthropic_overloaded_error_frame())),
+        request_body={"model": "claude-sonnet-5", "stream": True},
+        litellm_logging_obj=logging_obj,
+        endpoint_type=EndpointType.ANTHROPIC,
+        start_time=datetime.now(),
+        passthrough_success_handler_obj=MagicMock(),
+        url_route="/v1/messages",
+    )
+    async for chunk in stream:
+        if b"event: error" in chunk:
+            break
+    await stream.aclose()
+    await _settle(recorder.success_kwargs)
+
+    assert recorder.failure_kwargs == []
+    success_payload = recorder.success_kwargs[0]["standard_logging_object"]
+    assert success_payload["status"] == "success"
+    assert success_payload["prompt_tokens"] == 52
+
+
+@pytest.mark.asyncio
+async def test_superseded_attempt_failure_log_keeps_its_own_deployment_when_the_retry_rebinds_the_logging_object():
+    """The router rebinds the shared logging object to the retry's deployment right after closing the superseded
+    stream, before the logging worker runs. The failure log of the superseded attempt must still name the
+    deployment that served it, or the router's cooldown lands on the deployment serving the retry."""
+    recorder = _EventRecorder()
+    logging_obj = LiteLLMLoggingObj(
+        model="claude-sonnet-5",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=True,
+        call_type="anthropic_messages",
+        start_time=datetime.now(),
+        litellm_call_id="test-superseded-deployment",
+        function_id="test-superseded-deployment",
+        dynamic_async_failure_callbacks=[recorder],
+    )
+    logging_obj.update_environment_variables(
+        model="claude-sonnet-5", litellm_params={"model_info": {"id": "deployment-1"}}, optional_params={}
+    )
+    superseded = PassThroughStreamingHandler.chunk_processor(
+        response=_anthropic_stream_of((_anthropic_message_start_frame(), _anthropic_overloaded_error_frame())),
+        request_body={"model": "claude-sonnet-5", "stream": True},
+        litellm_logging_obj=logging_obj,
+        endpoint_type=EndpointType.ANTHROPIC,
+        start_time=datetime.now(),
+        passthrough_success_handler_obj=MagicMock(),
+        url_route="/v1/messages",
+    )
+    async for chunk in superseded:
+        if b"event: error" in chunk:
+            break
+    await aclose_superseded_attempt(superseded)
+    logging_obj.update_environment_variables(
+        model="claude-sonnet-5-retry", litellm_params={"model_info": {"id": "deployment-2"}}, optional_params={}
+    )
+    await _settle(recorder.failure_kwargs)
+
+    failure_kwargs = recorder.failure_kwargs[0]
+    assert failure_kwargs["litellm_params"]["model_info"]["id"] == "deployment-1"
+    assert failure_kwargs["model"] == "claude-sonnet-5"
+    assert logging_obj.model_call_details["litellm_params"]["model_info"]["id"] == "deployment-2"
+
+
+@pytest.mark.asyncio
+async def test_retry_success_log_carries_its_own_usage_after_a_provider_error_frame():
+    """Both attempts of a retried /v1/messages stream log through the request's one logging object. The
+    superseded attempt's failure log must not leave the usage it consumed behind, or the retry's success
+    log bills the failed attempt's tokens instead of its own."""
+    recorder = _EventRecorder()
+    logging_obj = LiteLLMLoggingObj(
+        model="claude-sonnet-5",
+        messages=[{"role": "user", "content": "hi"}],
+        stream=True,
+        call_type="anthropic_messages",
+        start_time=datetime.now(),
+        litellm_call_id="test-retry-own-usage",
+        function_id="test-retry-own-usage",
+        dynamic_async_success_callbacks=[recorder],
+        dynamic_async_failure_callbacks=[recorder],
+    )
+
+    def attempt(frames: tuple[bytes, ...]):
+        return PassThroughStreamingHandler.chunk_processor(
+            response=_anthropic_stream_of(frames),
+            request_body={"model": "claude-sonnet-5", "stream": True},
+            litellm_logging_obj=logging_obj,
+            endpoint_type=EndpointType.ANTHROPIC,
+            start_time=datetime.now(),
+            passthrough_success_handler_obj=MagicMock(),
+            url_route="/v1/messages",
+        )
+
+    superseded = attempt((_anthropic_message_start_frame("msg_a1", 52), _anthropic_overloaded_error_frame()))
+    async for chunk in superseded:
+        if b"event: error" in chunk:
+            break
+    await aclose_superseded_attempt(superseded)
+    await _settle(recorder.failure_kwargs)
+    retry = attempt((_anthropic_message_start_frame("msg_a2", 7), *_anthropic_completed_stream_tail()))
+    async for _ in retry:
+        pass
+    await _settle(recorder.success_kwargs)
+
+    failure_payload = recorder.failure_kwargs[0]["standard_logging_object"]
+    assert failure_payload["prompt_tokens"] == 52
+    success_payload = recorder.success_kwargs[0]["standard_logging_object"]
+    assert success_payload["status"] == "success"
+    assert (success_payload["prompt_tokens"], success_payload["completion_tokens"]) == (7, 3)
+
+
 def _google_sse(prompt_tokens: int, completion_tokens: int, text: str) -> bytes:
     payload = {
         "candidates": [{"content": {"parts": [{"text": text}], "role": "model"}, "index": 0}],
diff --git a/tests/unit/proxy/proxy_server/test_streaming_helpers.py b/tests/unit/proxy/proxy_server/test_streaming_helpers.py
index 09d71cb4ead..f53e1931782 100644
--- a/tests/unit/proxy/proxy_server/test_streaming_helpers.py
+++ b/tests/unit/proxy/proxy_server/test_streaming_helpers.py
@@ -2090,3 +2090,36 @@ def test_fast_serialize_simple_model_response_stream_keeps_served_service_tier()
 
     assert result is not None
     assert json.loads(result)["service_tier"] == "priority"
+
+
+@pytest.mark.asyncio
+async def test_async_data_generator_lets_other_tasks_run_during_a_stream_that_never_waits(monkeypatch):
+    """A stream whose chunks are already buffered never suspends on its own, so
+    the generator has to hand the loop back itself once it has held the loop
+    long enough: another task must get to run before the stream is over, and
+    not before the hold budget is used up."""
+    _patch_logging_flags(monkeypatch)
+    order: list[str] = []  # mutable-ok: records the interleaving of the two tasks
+    clock: list[float] = [0.0]  # mutable-ok: fake monotonic clock, advanced 20 ms per chunk
+    monkeypatch.setattr(ps.time, "monotonic", lambda: clock[0])
+
+    async def chunks():
+        for index in range(6):
+            clock[0] += 0.02
+            order.append(f"chunk{index}")
+            yield _simple_chunk(content=str(index))
+
+    async def other_task():
+        order.append("other")
+
+    other = asyncio.ensure_future(other_task())
+    async for _ in async_data_generator(
+        response=chunks(),
+        user_api_key_dict=_user_auth(),
+        request_data={"model": "gpt-4"},
+    ):
+        pass
+    await other
+
+    assert "other" in order[:-1], order
+    assert order.index("other") >= 3, order
diff --git a/tests/unit/proxy/response_api_endpoints/test_endpoints.py b/tests/unit/proxy/response_api_endpoints/test_endpoints.py
index b047c29243a..a7b955f5b84 100644
--- a/tests/unit/proxy/response_api_endpoints/test_endpoints.py
+++ b/tests/unit/proxy/response_api_endpoints/test_endpoints.py
@@ -3454,10 +3454,11 @@ class TestResponsesInputTokens:
         body: dict[str, Any],
         path: str = "/v1/responses/input_tokens",
         counter: AsyncMock | None = None,
+        llm_router: litellm.Router | None = None,
     ) -> tuple[Response, AsyncMock]:
         from litellm.proxy._types import UserAPIKeyAuth
         from litellm.proxy.auth.user_api_key_auth import user_api_key_auth
-        from litellm.proxy.response_api_endpoints.endpoints import _proxy_token_counter
+        from litellm.proxy.response_api_endpoints.endpoints import _proxy_llm_router, _proxy_token_counter
         from litellm.types.utils import TokenCountResponse
 
         token_counter_mock = (
@@ -3474,6 +3475,7 @@ class TestResponsesInputTokens:
         )
         app.dependency_overrides[user_api_key_auth] = lambda: UserAPIKeyAuth(api_key="sk-test", request_route=path)
         app.dependency_overrides[_proxy_token_counter] = lambda: token_counter_mock
+        app.dependency_overrides[_proxy_llm_router] = lambda: llm_router
         try:
             client = TestClient(app)
             response = client.post(path, json=body, headers={"Authorization": "Bearer sk-9876"})
@@ -3481,6 +3483,7 @@ class TestResponsesInputTokens:
         finally:
             app.dependency_overrides.pop(user_api_key_auth, None)
             app.dependency_overrides.pop(_proxy_token_counter, None)
+            app.dependency_overrides.pop(_proxy_llm_router, None)
 
     def test_string_input_returns_openai_input_tokens_shape(self):
         response, counter = self._post_input_tokens({"model": "gpt-4o", "input": "Hello, how are you?"})
@@ -3594,6 +3597,48 @@ class TestResponsesInputTokens:
         assert response.status_code == 400, response.text
         error = response.json()["error"]
         assert error["type"] == "invalid_request_error"
+        assert error["param"] == "tools"
+        assert error["message"].startswith("tools: ")
+        counter.assert_not_awaited()
+
+    def test_invalid_tools_are_dropped_under_drop_params(self) -> None:
+        response, counter = self._post_input_tokens(
+            {"model": "gpt-4o", "input": "hi", "tools": [5, {"type": "web_search"}], "drop_params": True}
+        )
+
+        assert response.status_code == 200, response.text
+        assert counter.await_args.kwargs["request"].tools == [{"type": "web_search"}]
+
+    def test_malformed_tools_follow_the_counted_deployment_even_when_fallbacks_are_configured(self) -> None:
+        router: Final = litellm.Router(
+            model_list=[
+                {
+                    "model_name": "gpt-5.2",
+                    "litellm_params": {"model": "openai/gpt-5.2", "api_key": "sk-test", "additional_drop_params": ["tools"]},
+                },
+                {"model_name": "backup", "litellm_params": {"model": "openai/gpt-5.4-mini", "api_key": "sk-test"}},
+            ],
+            fallbacks=[{"gpt-5.2": ["backup"]}],
+        )
+
+        response, counter = self._post_input_tokens(
+            {"model": "gpt-5.2", "input": "hi", "tools": 5}, llm_router=router
+        )
+
+        assert response.status_code == 200, response.text
+        assert counter.await_args.kwargs["request"].tools is None
+
+    def test_malformed_tools_for_a_model_outside_the_router_get_a_clean_400(self) -> None:
+        router: Final = litellm.Router(
+            model_list=[{"model_name": "gpt-5.2", "litellm_params": {"model": "openai/gpt-5.2", "api_key": "sk-test"}}]
+        )
+
+        response, counter = self._post_input_tokens(
+            {"model": "openai/gpt-5.4-mini", "input": "hi", "tools": 5}, llm_router=router
+        )
+
+        assert response.status_code == 400, response.text
+        assert response.json()["error"]["param"] == "tools"
         counter.assert_not_awaited()
 
     def test_provider_error_maps_status_code(self):
diff --git a/tests/unit/proxy/test__lazy_features.py b/tests/unit/proxy/test__lazy_features.py
index 4e0889fd93d..adc4de8c8fa 100644
--- a/tests/unit/proxy/test__lazy_features.py
+++ b/tests/unit/proxy/test__lazy_features.py
@@ -401,3 +401,25 @@ def test_without_the_flag_the_warmup_route_registers_a_feature_and_returns_its_p
         assert body.paths["/alpha/list"]["get"].tags == ("alpha",)
         assert loaded_lazy_modules(app) == {features[0].module_path}
         assert "/alpha/list" in _paths(app) and "/beta/list" not in _paths(app)
+
+
+def test_root_authorization_server_metadata_is_the_gateways_not_the_byok_connector_document(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    """Two features claim the root ``/.well-known/oauth-authorization-server``. The one a client
+    gets must be the gateway's own authorization server metadata, whose ``/token`` serves the
+    gateway's grants, not the BYOK connector form flow whose token endpoint is
+    ``/v1/mcp/oauth/token``; the connector keeps its path-appended document."""
+    monkeypatch.setenv(FLAG, "false")
+    app: Final = FastAPI()
+    attach_lazy_features(app)
+
+    with TestClient(app, base_url="https://gateway.example.com") as client:
+        root: Final = client.get("/.well-known/oauth-authorization-server")
+        connector: Final = client.get("/.well-known/oauth-authorization-server/v1/mcp/oauth")
+
+    assert root.status_code == 200
+    assert root.json()["issuer"] == "https://gateway.example.com"
+    assert root.json()["token_endpoint"] == "https://gateway.example.com/token"
+    assert connector.status_code == 200
+    assert connector.json()["token_endpoint"] == "https://gateway.example.com/v1/mcp/oauth/token"
diff --git a/tests/unit/proxy/test_tools_allowlist_enforcement.py b/tests/unit/proxy/test_tools_allowlist_enforcement.py
index e855ef47dd5..e306f7be4f8 100644
--- a/tests/unit/proxy/test_tools_allowlist_enforcement.py
+++ b/tests/unit/proxy/test_tools_allowlist_enforcement.py
@@ -145,6 +145,21 @@ class TestExtractRequestToolNames:
         data = {"tools": [{"type": "function", "function": {"name": "x"}}]}
         assert extract_request_tool_names("/v1/embeddings", data) == []
 
+    @pytest.mark.parametrize(
+        ("route", "data"),
+        [
+            ("/v1/chat/completions", {"tools": 5}),
+            ("/v1/chat/completions", {"functions": 5}),
+            ("/v1/responses", {"tools": 5}),
+            ("/v1/messages", {"tools": 5}),
+            ("/generate_content", {"tools": 5}),
+            ("/generate_content", {"tools": [{"functionDeclarations": 5}]}),
+        ],
+        ids=["chat_tools", "chat_functions", "responses", "messages", "generate_content", "function_declarations"],
+    )
+    def test_malformed_tool_lists_yield_no_names(self, route: str, data: dict[str, object]) -> None:
+        assert extract_request_tool_names(route, data) == []
+
 
 class TestCheckToolsAllowlist:
     """Test allowlist enforcement in auth (no DB in hot path)."""
diff --git a/tests/unit/proxy/utils/proxy_logging/test_post_call_failure_hook.py b/tests/unit/proxy/utils/proxy_logging/test_post_call_failure_hook.py
index 84aa1798da4..e83efa21dcc 100644
--- a/tests/unit/proxy/utils/proxy_logging/test_post_call_failure_hook.py
+++ b/tests/unit/proxy/utils/proxy_logging/test_post_call_failure_hook.py
@@ -4,6 +4,7 @@ and ``_handle_logging_proxy_only_error``."""
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Callable
 from datetime import datetime
 from types import MappingProxyType
 from typing import Final
@@ -921,6 +922,48 @@ async def test_post_call_failure_hook_falls_back_to_body_shape_without_a_route(p
     assert request_data["call_type"] == "acompletion"
 
 
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "call_type, body",
+    [
+        ("anthropic_messages", {"model": "m", "messages": [{"role": "user", "content": "hi"}]}),
+        ("aresponses", {"model": "m", "input": [{"role": "user", "content": "hi"}]}),
+        ("acompact_responses", {"model": "m", "input": [{"role": "user", "content": "hi"}]}),
+    ],
+)
+async def test_post_call_failure_hook_keeps_the_call_type_request_setup_logged(
+    proxy_logging: ProxyLogging,
+    make_user_api_key_auth: Callable[..., UserAPIKeyAuth],
+    call_type: str,
+    body: dict[str, object],
+) -> None:
+    """A request rejected after request setup already carries its endpoint's call type, so the body
+    shape must not relabel a /v1/messages rejection as a chat completion or a list-input /v1/responses
+    rejection as an embedding."""
+    from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLoggingObj
+
+    proxy_logging.alert_types = []
+    request_data: Final = {
+        **body,
+        "litellm_logging_obj": LiteLLMLoggingObj(
+            model="m",
+            messages=[{"role": "user", "content": "hi"}],
+            stream=False,
+            call_type=call_type,
+            start_time=datetime.now(),
+            litellm_call_id=f"test_keeps_{call_type}",
+            function_id=f"test_keeps_{call_type}",
+        ),
+        "metadata": {},
+    }
+    await proxy_logging.post_call_failure_hook(
+        request_data=request_data,
+        original_exception=HTTPException(status_code=400, detail="tools must be a list"),
+        user_api_key_dict=make_user_api_key_auth(request_route="/v1/messages"),
+    )
+    assert request_data["call_type"] == call_type
+
+
 @pytest.mark.asyncio
 @pytest.mark.parametrize("route", ["/v1/files", "/files/file-abc", "/v1/containers"])
 async def test_post_call_failure_hook_keeps_the_route_for_multi_operation_routes(
diff --git a/tests/unit/realtime_api/test_main.py b/tests/unit/realtime_api/test_main.py
index 41179967a7f..527d3d599b1 100644
--- a/tests/unit/realtime_api/test_main.py
+++ b/tests/unit/realtime_api/test_main.py
@@ -2,17 +2,20 @@ import asyncio
 import json
 import time
 from collections.abc import Awaitable, Callable, Mapping
+from pathlib import Path
 from types import TracebackType
 from typing import Final
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import httpx
 import pytest
+import respx
 
 import litellm
 from litellm.integrations.custom_guardrail import CustomGuardrail
 from litellm.litellm_core_utils.realtime_streaming import RealTimeStreaming
 from litellm.llms.custom_httpx.http_handler import AsyncHTTPHandler
+from litellm.llms.openai.workload_identity import _workload_identity_auth
 from litellm.models.credentials import CredentialItem
 from litellm.realtime_api import main as realtime_main
 from litellm.realtime_api.main import _with_resolved_session_model
@@ -1052,3 +1055,124 @@ async def test_voice_transcript_blocked_by_guardrail():
 
     finally:
         litellm.callbacks = []
+
+
+@pytest.fixture
+def federated_deployment(monkeypatch: pytest.MonkeyPatch, tmp_path: Path) -> dict[str, str]:
+    token_file: Final = tmp_path / "subject_token.jwt"
+    token_file.write_text("subject-token")
+    for name in (
+        "OPENAI_API_KEY",
+        "OPENAI_BASE_URL",
+        "OPENAI_API_BASE",
+        "OPENAI_IDENTITY_PROVIDER_ID",
+        "OPENAI_SERVICE_ACCOUNT_ID",
+        "OPENAI_IDENTITY_TOKEN_FILE",
+    ):
+        monkeypatch.delenv(name, raising=False)
+    for attribute in ("api_key", "openai_key", "api_base"):
+        monkeypatch.setattr(litellm, attribute, None)
+    _workload_identity_auth.cache_clear()
+    return {
+        "openai_identity_provider_id": "idp_realtime",
+        "openai_service_account_id": "user-realtime",
+        "openai_identity_token_file": str(token_file),
+    }
+
+
+def _mock_token_exchange() -> None:
+    respx.post("https://auth.openai.com/oauth/token").mock(
+        return_value=httpx.Response(200, json={"access_token": "federated-bearer", "expires_in": 3600})
+    )
+
+
+class _ConnectThatStopsAfterCapturingTheAuthorization:
+    authorization: str | None = None
+
+    def __call__(
+        self, url: str, *, additional_headers: Mapping[str, str], **kwargs: object
+    ) -> "_ConnectThatStopsAfterCapturingTheAuthorization":
+        self.authorization = additional_headers.get("Authorization")
+        return self
+
+    async def __aenter__(self) -> None:
+        raise RuntimeError("backend headers captured, nothing to bridge")
+
+    async def __aexit__(
+        self,
+        exc_type: type[BaseException] | None,
+        exc: BaseException | None,
+        tb: TracebackType | None,
+    ) -> None:
+        return None
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "live_session_start",
+    [None, {"type": "session.start", "session": {"model": "gpt-live-1"}}],
+    ids=["realtime", "live_session"],
+)
+@respx.mock
+async def test_openai_websocket_sessions_send_the_federated_bearer_for_a_keyless_deployment(
+    federated_deployment: dict[str, str], live_session_start: Mapping[str, object] | None
+) -> None:
+    _mock_token_exchange()
+    connect: Final = _ConnectThatStopsAfterCapturingTheAuthorization()
+    with patch("websockets.connect", connect):
+        await realtime_main._arealtime.__wrapped__(
+            model="gpt-realtime",
+            custom_llm_provider="openai",
+            websocket=MagicMock(close=AsyncMock()),
+            litellm_logging_obj=FakeLogging(),
+            live_session_start=live_session_start,
+            **federated_deployment,
+        )
+    assert connect.authorization == "Bearer federated-bearer"
+
+
+class _GatewayThatRecordsTheAuthorization:
+    authorization: str | None = None
+
+    def __call__(self, request: httpx.Request) -> httpx.Response:
+        self.authorization = request.headers.get("Authorization")
+        return httpx.Response(200, json={"value": "ek_test"})
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize(
+    "route",
+    [realtime_main.acreate_realtime_client_secret, realtime_main.acreate_realtime_transcription_session],
+    ids=["client_secrets", "transcription_sessions"],
+)
+@respx.mock
+async def test_openai_realtime_http_routes_send_the_federated_bearer_for_a_keyless_deployment(
+    federated_deployment: dict[str, str], route: Callable[..., Awaitable[object]]
+) -> None:
+    _mock_token_exchange()
+    gateway: Final = _GatewayThatRecordsTheAuthorization()
+    await route.__wrapped__(
+        model="gpt-realtime",
+        custom_llm_provider="openai",
+        litellm_logging_obj=FakeLogging(),
+        client=AsyncHTTPHandler(transport=httpx.MockTransport(gateway)),
+        **federated_deployment,
+    )
+    assert gateway.authorization == "Bearer federated-bearer"
+
+
+@pytest.mark.asyncio
+@respx.mock
+async def test_openai_realtime_health_check_sends_the_federated_bearer_for_a_keyless_deployment(
+    federated_deployment: dict[str, str],
+) -> None:
+    _mock_token_exchange()
+    connect: Final = _CapturingConnect()
+    with patch("websockets.connect", connect):
+        assert await realtime_main.realtime_health_check(
+            model="gpt-realtime",
+            custom_llm_provider="openai",
+            api_key=None,
+            model_params={"model": "openai/gpt-realtime", **federated_deployment},
+        )
+    assert connect.kwargs["additional_headers"] == {"Authorization": "Bearer federated-bearer"}
diff --git a/tests/unit/router_strategy/test_complexity_router.py b/tests/unit/router_strategy/test_complexity_router.py
index 253850bbd79..e11c5d6c2f3 100644
--- a/tests/unit/router_strategy/test_complexity_router.py
+++ b/tests/unit/router_strategy/test_complexity_router.py
@@ -5357,6 +5357,7 @@ class TestRouterPreRoutingSharedAliasName:
                 "api_key": "sk-marker",
                 "api_base": "https://marker.example/v1",
                 "api_version": "2024-01-01",
+                "responses_api_version": "v1",
             },
         }
         router = Router(model_list=[marker_with_connection_params, self._tier_entry()])
@@ -5372,6 +5373,7 @@ class TestRouterPreRoutingSharedAliasName:
         assert "api_base" not in request_kwargs
         assert "api_key" not in request_kwargs
         assert "api_version" not in request_kwargs
+        assert "responses_api_version" not in request_kwargs
         assert request_kwargs["drop_params"] is True
 
     @pytest.mark.asyncio
diff --git a/tests/unit/router_utils/test_router_utils_common_utils.py b/tests/unit/router_utils/test_router_utils_common_utils.py
index af8fca72252..3532870df1c 100644
--- a/tests/unit/router_utils/test_router_utils_common_utils.py
+++ b/tests/unit/router_utils/test_router_utils_common_utils.py
@@ -287,6 +287,19 @@ class TestFilterWebSearchDeployments:
         assert "deployment-2" in result_ids
         assert "deployment-3" not in result_ids
 
+    def test_web_search_in_a_tuple_filters_unsupported(self, sample_deployments: list[dict[str, object]]) -> None:
+        result: Final = filter_web_search_deployments(sample_deployments, {"tools": ({"type": "web_search"},)})
+        assert [d["model_info"]["id"] for d in result] == ["deployment-1", "deployment-2"]
+
+    @pytest.mark.parametrize("tool_type", [{}, [], None, 5], ids=["object", "list", "null", "int"])
+    def test_a_non_string_tool_type_is_no_web_search_request(
+        self, sample_deployments: list[dict[str, object]], tool_type: object
+    ) -> None:
+        result: Final = filter_web_search_deployments(
+            sample_deployments, {"tools": [{"type": tool_type}, {"type": "function"}]}
+        )
+        assert result == sample_deployments
+
     def test_web_search_preview_filters_unsupported(self, sample_deployments):
         """web_search_preview type should also trigger filtering"""
         request_kwargs = {"tools": [{"type": "web_search_preview"}]}
diff --git a/tests/unit/test_assert_ci_coverage.py b/tests/unit/test_assert_ci_coverage.py
index c0e5339c925..87c56f1a42b 100644
--- a/tests/unit/test_assert_ci_coverage.py
+++ b/tests/unit/test_assert_ci_coverage.py
@@ -9,6 +9,8 @@ the question neither covers: whether the job that globs a file then deselects it
 """
 
 import importlib.util
+import shutil
+import subprocess
 import sys
 from pathlib import Path
 from typing import Final
@@ -71,17 +73,27 @@ def test_integration_groups_require_exclusive_scheduled_circleci_owner(tmp_path:
     workflow.write_text(yaml.safe_dump({"jobs": {"tests": {"steps": [{"run": "pytest tests/integration"}]}}}))
     _, findings = coverage._integration_ownership(tmp_path)
     assert [(finding.subject, finding.detail) for finding in findings] == [
-        (test_path, "integration contract is also selected by GitHub Actions")
+        (test_path, "integration file outside GITHUB_FILES is selected by GitHub Actions")
     ]
-    github_path: Final = "tests/integration/management/test_github_contract.py"
+    github_path: Final = "tests/integration/database/image/test_github_contract.py"
+    (tmp_path / github_path).parent.mkdir(parents=True)
     (tmp_path / github_path).write_text("def test_contract(): pass\n")
     runner: Final = tmp_path / "tests/integration/run.py"
     runner.write_text(runner.read_text() + f"GITHUB_FILES: Final = frozenset({{{github_path!r}}})\n")
-    workflow.write_text(yaml.safe_dump({"jobs": {"tests": {"steps": [{"run": f"pytest {github_path}"}]}}}))
+    workflow.unlink()
+    dedicated: Final = tmp_path / ".github/workflows/image-scan.yml"
+    dedicated.write_text(yaml.safe_dump({"jobs": {"tests": {"steps": [{"run": f"pytest {github_path}"}]}}}))
     github_owned, github_findings = coverage._integration_ownership(tmp_path)
     assert github_owned == frozenset({test_path, github_path})
     assert github_findings == ()
-    workflow.write_text(yaml.safe_dump({"jobs": {}}))
+    per_pr: Final = tmp_path / ".github/workflows/test-mcp-interactions.yml"
+    per_pr.write_text(yaml.safe_dump({"jobs": {"mcp": {"steps": [{"run": f"pytest {github_path}"}]}}}))
+    _, shared_findings = coverage._integration_ownership(tmp_path)
+    assert [(finding.subject, finding.detail) for finding in shared_findings] == [
+        (github_path, "GitHub-owned integration contract runs outside a dedicated integration workflow")
+    ]
+    per_pr.unlink()
+    dedicated.write_text(yaml.safe_dump({"jobs": {}}))
     _, missing_invocation = coverage._integration_ownership(tmp_path)
     assert [(finding.subject, finding.detail) for finding in missing_invocation] == [
         (github_path, "GitHub-owned integration contract has no invoking job")
@@ -94,6 +106,72 @@ def test_integration_groups_require_exclusive_scheduled_circleci_owner(tmp_path:
     assert circle_invocation == ()
 
 
+def _write_integration_tree(root: Path, github_path: str) -> None:
+    contracts: Final = root / "tests/integration/management"
+    contracts.mkdir(parents=True)
+    (contracts / "test_contract.py").write_text("def test_contract(): pass\n")
+    (root / github_path).parent.mkdir(parents=True, exist_ok=True)
+    (root / github_path).write_text("def test_contract(): pass\n")
+    (root / "tests/integration/run.py").write_text(
+        "from types import MappingProxyType\nfrom typing import Final\n"
+        'GROUPS: Final = MappingProxyType({"management": ("management",)})\n'
+        f"GITHUB_FILES: Final = frozenset({{{github_path!r}}})\n"
+    )
+    (root / ".circleci").mkdir()
+    (root / ".circleci/config.yml").write_text(
+        yaml.safe_dump(
+            {
+                "jobs": {
+                    "integration_contracts": {
+                        "steps": [{"run": {"command": "bash .circleci/scripts/run_integration.sh management"}}]
+                    }
+                },
+                "workflows": {"integration": {"jobs": [{"integration_contracts": {"suite": "management"}}]}},
+            }
+        )
+    )
+    (root / ".github/workflows").mkdir(parents=True)
+
+
+@pytest.mark.parametrize(
+    ("github_path", "workflow_name", "exit_code"),
+    [
+        ("tests/integration/database/image/test_github_contract.py", "image-scan.yml", 0),
+        ("tests/integration/database/image/test_github_contract.py", "test-unit.yml", 1),
+        ("tests/integration/management/test_github_contract.py", "image-scan.yml", 1),
+    ],
+)
+def test_census_fails_when_a_github_owned_contract_runs_outside_its_dedicated_workflow(
+    tmp_path: Path, github_path: str, workflow_name: str, exit_code: int
+) -> None:
+    script: Final = tmp_path / ".github/scripts/assert_ci_coverage.py"
+    script.parent.mkdir(parents=True)
+    shutil.copy(_MODULE_PATH, script)
+    _write_integration_tree(tmp_path, github_path)
+    (tmp_path / ".github/workflows" / workflow_name).write_text(
+        yaml.safe_dump({"jobs": {"tests": {"steps": [{"run": f"pytest {github_path}"}]}}})
+    )
+    result: Final = subprocess.run([sys.executable, "-I", str(script)], capture_output=True, text=True, check=False)
+    assert result.returncode == exit_code, result.stdout
+    assert "Playwright" not in result.stdout
+
+
+def test_an_integration_file_outside_every_group_cannot_run_on_a_github_shard(tmp_path: Path) -> None:
+    _write_integration_tree(tmp_path, "tests/integration/database/image/test_github_contract.py")
+    ungrouped: Final = "tests/integration/ci_probe/test_ci_probe.py"
+    (tmp_path / ungrouped).parent.mkdir(parents=True)
+    (tmp_path / ungrouped).write_text("def test_probe(): pass\n")
+    _, before = coverage._integration_ownership(tmp_path)
+    (tmp_path / ".github/workflows/test-unit.yml").write_text(
+        yaml.safe_dump({"jobs": {"mcp": {"steps": [{"run": f"pytest {ungrouped}"}]}}})
+    )
+    _, after = coverage._integration_ownership(tmp_path)
+    assert [(finding.subject, finding.detail) for finding in after if finding.subject == ungrouped] == [
+        (ungrouped, "integration file outside GITHUB_FILES is selected by GitHub Actions")
+    ]
+    assert not [finding for finding in before if finding.subject == ungrouped]
+
+
 def test_circleci_postgres_suites_count_their_test_path_as_invoked() -> None:
     config: Final = {
         "workflows": {
diff --git a/tests/unit/test_cost_calculator.py b/tests/unit/test_cost_calculator.py
index cc2a1d62d52..c61ebb3737c 100644
--- a/tests/unit/test_cost_calculator.py
+++ b/tests/unit/test_cost_calculator.py
@@ -6426,6 +6426,78 @@ def test_whisper_azure():
     assert round(cost, 5) == round(expected_cost, 5)
 
 
+@pytest.mark.parametrize(
+    ("provider", "requested_model", "response_extras", "expected_seconds"),
+    [
+        ("openai", "openai/gpt-fake-transcribe", {}, 2.0),
+        ("openai", "openai/gpt-fake-transcribe", {"_audio_transcription_duration": 1.35}, 1.35),
+        ("openai", "openai/gpt-fake-transcribe", {"duration": 1.34}, 1.34),
+        ("openai", "openai/whisper-fake", {}, 0.0),
+        ("azure", "gpt-fake-transcribe", {}, 0.0),
+    ],
+    ids=[
+        "undecodable_upload_bills_provider_seconds",
+        "measured_duration_still_wins",
+        "provider_duration_still_wins",
+        "whisper_models_never_bill_provider_seconds",
+        "azure_never_bills_provider_seconds",
+    ],
+)
+def test_transcription_cost_falls_back_to_provider_billed_seconds(
+    monkeypatch: pytest.MonkeyPatch,
+    provider: str,
+    requested_model: str,
+    response_extras: Mapping[str, float],
+    expected_seconds: float,
+) -> None:
+    model: Final = requested_model.removeprefix(f"{provider}/")
+    monkeypatch.setitem(
+        litellm.model_cost,
+        model,
+        {"input_cost_per_second": 0.01, "litellm_provider": provider, "mode": "audio_transcription"},
+    )
+    transcription: Final = convert_to_model_response_object(
+        response_object={
+            "text": "What is the weather in Paris?",
+            "usage": {"type": "duration", "seconds": 2},
+            **response_extras,
+        },
+        model_response_object=TranscriptionResponse(),
+        hidden_params={"model": model, "custom_llm_provider": provider},
+        response_type="audio_transcription",
+    )
+
+    cost: Final = completion_cost(
+        completion_response=transcription, model=requested_model, call_type="atranscription"
+    )
+
+    assert cost == pytest.approx(0.01 * expected_seconds)
+
+
+def test_custom_priced_transcription_deployment_bills_provider_seconds(monkeypatch: pytest.MonkeyPatch) -> None:
+    monkeypatch.setitem(
+        litellm.model_cost,
+        "priced-deployment",
+        {"input_cost_per_second": 0.000075, "litellm_provider": "openai", "mode": "audio_transcription"},
+    )
+    transcription: Final = convert_to_model_response_object(
+        response_object={"text": "What is the weather in Paris?", "usage": {"type": "duration", "seconds": 2}},
+        model_response_object=TranscriptionResponse(),
+        hidden_params={"model": "gpt-fake-transcribe", "custom_llm_provider": "openai"},
+        response_type="audio_transcription",
+    )
+
+    cost: Final = completion_cost(
+        completion_response=transcription,
+        model="openai/gpt-fake-transcribe",
+        call_type="atranscription",
+        custom_pricing=True,
+        router_model_id="priced-deployment",
+    )
+
+    assert cost == pytest.approx(0.000075 * 2)
+
+
 def test_gpt_image_2_azure_cost_tracking():
     azure_image_generation_response: Final = {
         "created": 1758585600,
diff --git a/tests/unit/test_model_prices_schema.py b/tests/unit/test_model_prices_schema.py
index b12d3b34c8b..ea484c4a2f4 100644
--- a/tests/unit/test_model_prices_schema.py
+++ b/tests/unit/test_model_prices_schema.py
@@ -419,6 +419,24 @@ def test_azure_gpt_6_1_sol_data_zone_rows_price_requests_at_the_regional_premium
     assert total_cost(f"azure/{region}/gpt-6.1-sol") == pytest.approx(global_cost * premium)
 
 
+AZURE_GPT_6_1_SOL_ROWS: Final = (
+    "azure/gpt-6.1-sol",
+    "azure/gpt-6.1-sol-2026-09-29",
+    "azure/us/gpt-6.1-sol",
+    "azure/eu/gpt-6.1-sol",
+    "azure/apac/gpt-6.1-sol",
+    "azure_ai/gpt-6.1-sol",
+)
+
+
+@pytest.mark.parametrize("row", AZURE_GPT_6_1_SOL_ROWS)
+def test_azure_gpt_6_1_sol_rows_accept_the_same_reasoning_efforts_as_the_openai_row(prices: dict, row: str):
+    openai_efforts: Final = resolve_supported_reasoning_efforts(prices["gpt-6.1-sol"], deployment_is_mapped=True)
+    assert openai_efforts
+
+    assert resolve_supported_reasoning_efforts(prices[row], deployment_is_mapped=True) == openai_efforts
+
+
 # https://ai.google.dev/gemini-api/docs/models/deep-research-preview-04-2026
 @pytest.mark.parametrize("model", ["gemini/deep-research-preview-04-2026", "gemini/deep-research-max-preview-04-2026"])
 def test_gemini_deep_research_previews_accept_the_documented_input_window(prices: dict, model: str):
diff --git a/tests/unit/test_private_usage_aliases.py b/tests/unit/test_private_usage_aliases.py
index a5d74092d16..e73b9950594 100644
--- a/tests/unit/test_private_usage_aliases.py
+++ b/tests/unit/test_private_usage_aliases.py
@@ -4890,6 +4890,14 @@ LLMS_FORWARDER_CASES: Final = (
         "staticmethod",
         False,
     ),
+    (
+        "litellm.llms.openai.common_utils",
+        "BaseOpenAILLM",
+        "_get_sync_http_client",
+        "get_sync_http_client",
+        "staticmethod",
+        False,
+    ),
     (
         "litellm.llms.openai.openai",
         "OpenAIChatCompletion",
diff --git a/tests/unit/test_router/test_router.py b/tests/unit/test_router/test_router.py
index 6bc52ab3dfc..50a9d98385d 100644
--- a/tests/unit/test_router/test_router.py
+++ b/tests/unit/test_router/test_router.py
@@ -38,6 +38,7 @@ from litellm.integrations.custom_guardrail import CustomGuardrail
 from litellm.integrations.custom_logger import CustomLogger
 from litellm.integrations.otel.plumbing.context import set_request_root_span
 from litellm.litellm_core_utils.litellm_logging import Logging as LiteLLMLogging
+from litellm.llms.anthropic.pass_through.messages.streaming_iterator import closing_superseded_attempt
 from litellm.llms.anthropic.pass_through.messages.agentic_streaming_iterator import (
     SERVER_FULFILLED_TOOL_LEAK_ERROR_SSE_BYTES,
 )
@@ -9739,6 +9740,96 @@ def test_update_kwargs_with_deployment_merge_tools_request_overrides_tool_choice
     assert kwargs["tool_choice"] == "none"
 
 
+@pytest.mark.parametrize(
+    "deployment_params, router_defaults, request_params, expected_tools",
+    [
+        ({"drop_params": True}, {}, {}, [{"type": "web_search"}]),
+        ({}, {"drop_params": True}, {}, [{"type": "web_search"}]),
+        ({}, {}, {"additional_drop_params": ["tools"]}, [{"type": "web_search"}]),
+        ({"drop_params": True}, {}, {"drop_params": False}, 5),
+        ({}, {}, {}, 5),
+    ],
+    ids=[
+        "deployment_drop_params",
+        "router_default_drop_params",
+        "request_drops_tools",
+        "request_overrides_deployment_drop",
+        "no_drop_policy",
+    ],
+)
+def test_update_kwargs_with_deployment_keeps_deployment_tools_when_malformed_request_tools_drop(
+    deployment_params: dict[str, object],
+    router_defaults: dict[str, object],
+    request_params: dict[str, object],
+    expected_tools: object,
+) -> None:
+    router: Final = litellm.Router(
+        model_list=[
+            {
+                "model_name": "o3-deep-research",
+                "litellm_params": {
+                    "model": "openai/o3-deep-research",
+                    "api_key": "fake-key",
+                    "tools": [{"type": "web_search"}],
+                    **deployment_params,
+                },
+            },
+        ],
+        default_litellm_params={**router_defaults},
+    )
+    kwargs: Final[dict[str, object]] = {"metadata": {}, "tools": 5, **request_params}
+    router._update_kwargs_with_deployment(
+        deployment=router.get_deployment_by_model_group_name(model_group_name="o3-deep-research"), kwargs=kwargs
+    )
+
+    assert kwargs["tools"] == expected_tools
+
+
+_NAMED_REQUEST_TOOL_CHOICE: Final = {"type": "function", "function": {"name": "lookup_order"}}
+
+
+@pytest.mark.parametrize(
+    "deployment_params, expected_tool_fields",
+    [
+        (
+            {"drop_params": True, "tool_choice": "required"},
+            {"tools": [{"type": "web_search"}], "tool_choice": "required"},
+        ),
+        ({"drop_params": True}, {"tools": [{"type": "web_search"}]}),
+        ({}, {"tools": 5, "tool_choice": _NAMED_REQUEST_TOOL_CHOICE, "parallel_tool_calls": False}),
+    ],
+    ids=["deployment_tool_choice_applies", "no_deployment_tool_choice", "no_drop_policy"],
+)
+def test_update_kwargs_with_deployment_drops_request_tool_settings_with_malformed_request_tools(
+    deployment_params: dict[str, object], expected_tool_fields: dict[str, object]
+) -> None:
+    router: Final = litellm.Router(
+        model_list=[
+            {
+                "model_name": "o3-deep-research",
+                "litellm_params": {
+                    "model": "openai/o3-deep-research",
+                    "api_key": "fake-key",
+                    "tools": [{"type": "web_search"}],
+                    **deployment_params,
+                },
+            },
+        ],
+    )
+    kwargs: Final[dict[str, object]] = {
+        "metadata": {},
+        "tools": 5,
+        "tool_choice": _NAMED_REQUEST_TOOL_CHOICE,
+        "parallel_tool_calls": False,
+    }
+    router._update_kwargs_with_deployment(
+        deployment=router.get_deployment_by_model_group_name(model_group_name="o3-deep-research"), kwargs=kwargs
+    )
+
+    tool_fields: Final = ("tools", "tool_choice", "parallel_tool_calls")
+    assert {name: kwargs[name] for name in tool_fields if name in kwargs} == expected_tool_fields
+
+
 def test_credential_name_injected_as_tag():
     """
     Test that litellm_credential_name from deployment litellm_params
@@ -16004,6 +16095,7 @@ class _AnthropicMessagesFakeByteStream:
         self._chunks = list(chunks)
         self._hidden_params = {"additional_headers": {"x-amzn-requestid": "req-1"}}
         self.closed = False
+        self.closed_as_superseded = False
 
     def __aiter__(self):
         return self
@@ -16014,6 +16106,7 @@ class _AnthropicMessagesFakeByteStream:
         return self._chunks.pop(0)
 
     async def aclose(self) -> None:
+        self.closed_as_superseded = self.closed_as_superseded or closing_superseded_attempt()
         self.closed = True
 
 
@@ -17256,6 +17349,30 @@ async def test_anthropic_messages_stream_dropped_before_content_is_retried_withi
     assert [(attempted, budget) for _, attempted, budget in provider.calls] == [(0, 2), (1, 2)]
 
 
+@pytest.mark.asyncio
+async def test_anthropic_messages_superseded_stream_is_closed_before_the_retry_opens():
+    """Both attempts log through the request's one logging object, so the superseded attempt's end-of-stream
+    logging must be queued before the retry starts producing its own: the router closes the dropped stream
+    before it asks the group for another."""
+    router = _anthropic_messages_retry_router(num_retries=1)
+    superseded = _AnthropicMessagesFakeByteStream(
+        [_anthropic_messages_message_start_chunk(), _anthropic_messages_overloaded_error_chunk()]
+    )
+    superseded_closed_when_retry_opened: list[bool] = []
+
+    def retry_stream():
+        superseded_closed_when_retry_opened.append(superseded.closed_as_superseded)
+        return _anthropic_messages_retried_stream()
+
+    provider = _AnthropicMessagesScriptedProvider(lambda: superseded, retry_stream)
+
+    stream = await _anthropic_messages_stream_through_router(router, provider)
+    body = [chunk async for chunk in stream]
+
+    assert body == [_anthropic_messages_message_start_chunk(), _anthropic_messages_content_chunk("pong")]
+    assert superseded_closed_when_retry_opened == [True]
+
+
 @pytest.mark.asyncio
 async def test_a_ptu_share_holders_messages_stream_dropped_before_content_is_retried_on_its_shared_group(monkeypatch):
     """The same-group retry has to look the group's health up as the calling team; looked up with no
@@ -18387,7 +18504,7 @@ async def test_aanthropic_messages_recover_stream_error_flushes_buffered_frames_
 
     with patch.object(router, "_aanthropic_messages_fallback_attempt") as mock_attempt:
         recovery = router._aanthropic_messages_recover_stream_error(
-            declined, True, buffered, "primary", {"model": "primary"}, _anthropic_messages_make_wrapper()
+            declined, True, buffered, "primary", {"model": "primary"}, _anthropic_messages_make_wrapper(), AsyncMock()
         )
         with pytest.raises(BedrockError) as exc_info:
             await drain(recovery)
@@ -18408,7 +18525,7 @@ async def test_aanthropic_messages_recover_stream_error_hands_converted_raise_to
 
     with patch.object(router, "_aanthropic_messages_fallback_attempt", new=fake_attempt):
         recovery = router._aanthropic_messages_recover_stream_error(
-            raised, False, (), "primary", {"model": "primary"}, _anthropic_messages_make_wrapper()
+            raised, False, (), "primary", {"model": "primary"}, _anthropic_messages_make_wrapper(), AsyncMock()
         )
         collected = [chunk async for chunk in recovery]
     assert collected == [b"fallback"]
@@ -18466,6 +18583,25 @@ async def test_anthropic_messages_post_first_chunk_error_skips_fallback():
     mock_fallback.assert_not_awaited()
 
 
+@pytest.mark.asyncio
+async def test_anthropic_messages_stream_the_client_closes_at_a_forwarded_error_is_not_closed_as_superseded():
+    """An error frame forwarded to the client ends that request, and the SDK hangs up on it. No retry took the
+    request over, so the source must not be closed as a superseded attempt, which would log it as a failure and
+    drop the usage the provider billed for it."""
+    router = _anthropic_messages_make_router()
+    error_chunk = _anthropic_messages_overloaded_error_chunk()
+    source = _AnthropicMessagesFakeByteStream([_anthropic_messages_content_chunk("partial answer"), error_chunk])
+
+    wrapped = await router._aanthropic_messages_streaming_iterator(response=source, initial_kwargs={"model": "primary"})
+    async for chunk in wrapped:
+        if chunk == error_chunk:
+            break
+    await wrapped.aclose()
+
+    assert source.closed is True
+    assert source.closed_as_superseded is False
+
+
 @pytest.mark.asyncio
 async def test_anthropic_messages_non_retriable_error_flushes_buffered_lifecycle_frames():
     """A non-retriable error arriving while lifecycle frames are still
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index 07232f25e93..2f0b6060ec9 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -2422,6 +2422,87 @@ def test_register_model_openrouter_without_slash():
     assert "openai/gpt-4-turbo" in litellm.openrouter_models
 
 
+def test_register_model_makes_the_model_resolvable_and_wildcard_visible_without_a_restart():
+    model_name: Final = "my-tuned-gemini-regression"
+    try:
+        litellm.register_model(
+            {
+                model_name: {
+                    "litellm_provider": "vertex_ai-language-models",
+                    "mode": "chat",
+                    "input_cost_per_token": 0.000001,
+                    "output_cost_per_token": 0.000002,
+                }
+            },
+            persist_across_reloads=False,
+        )
+
+        _, provider, _, _ = litellm.get_llm_provider(model=model_name)
+
+        assert provider == "vertex_ai"
+        assert model_name in litellm.models_by_provider["vertex_ai"]
+    finally:
+        litellm.model_cost.pop(model_name, None)
+        litellm.vertex_language_models.discard(model_name)
+        litellm.models_by_provider["vertex_ai"].discard(model_name)
+
+
+@pytest.mark.parametrize(
+    ("litellm_provider", "wildcard", "provider_set"),
+    [
+        ("ai21", "ai21/*", "ai21_chat_models"),
+        ("vertex_ai-code-chat-models", "vertex_ai/*", "vertex_code_chat_models"),
+    ],
+)
+def test_registered_chat_model_lists_under_its_provider_wildcard(
+    litellm_provider: str, wildcard: str, provider_set: str
+) -> None:
+    from litellm.proxy.auth.model_checks import get_known_models_from_wildcard
+
+    model_name: Final = f"chat-listing-regression-{litellm_provider}"
+    try:
+        litellm.register_model(
+            {model_name: {"litellm_provider": litellm_provider, "mode": "chat"}}, persist_across_reloads=False
+        )
+
+        listed: Final = get_known_models_from_wildcard(wildcard)
+
+        assert f"{wildcard.removesuffix('*')}{model_name}" in listed
+    finally:
+        litellm.model_cost.pop(model_name, None)
+        getattr(litellm, provider_set).discard(model_name)
+        litellm.add_known_models(model_cost_map={})
+
+
+def test_priced_router_deployment_id_stays_out_of_wildcard_model_listing():
+    from litellm.proxy.auth.model_checks import get_known_models_from_wildcard
+
+    deployment_id: Final = "priced-deployment-id-regression"
+    router: Final = litellm.Router(
+        model_list=[
+            {
+                "model_name": "priced-gemini",
+                "litellm_params": {
+                    "model": "gemini/gemini-2.5-flash",
+                    "api_key": "fake-key",
+                    "input_cost_per_token": 0.000001,
+                    "output_cost_per_token": 0.000002,
+                },
+                "model_info": {"id": deployment_id, "litellm_provider": "gemini", "mode": "chat"},
+            },
+            {"model_name": "gemini/*", "litellm_params": {"model": "gemini/*", "api_key": "fake-key"}},
+        ]
+    )
+
+    router.completion(model="priced-gemini", messages=[{"role": "user", "content": "hi"}], mock_response="ok")
+    listed: Final = get_known_models_from_wildcard("gemini/*")
+
+    assert "gemini/gemini-2.5-flash" in listed
+    assert f"gemini/{deployment_id}" not in listed
+    assert deployment_id not in litellm.models_by_provider["gemini"]
+    assert litellm.model_cost[deployment_id]["input_cost_per_token"] == 0.000001
+
+
 def test_reasoning_content_preserved_in_text_completion_wrapper():
     """Ensure reasoning_content is copied from delta to text_choices."""
     chunk = ModelResponseStream(
@@ -9864,6 +9945,33 @@ def test_get_provider_audio_transcription_config_resolves_for_every_provider() -
     assert isinstance(configs[LlmProviders.OPENAI], litellm.OpenAIWhisperAudioTranscriptionConfig)
 
 
+@pytest.mark.parametrize(
+    ("model", "optional_params", "expected_response_format"),
+    [
+        ("whisper-1", {}, "verbose_json"),
+        ("my-transcribe-whisper", {}, "verbose_json"),
+        ("whisper-1", {"response_format": "srt"}, "srt"),
+        ("gpt-4o-mini-transcribe", {}, None),
+        ("gpt-transcribe", {}, None),
+        ("gpt-transcribe", {"response_format": "text"}, "text"),
+    ],
+)
+def test_openai_transcription_defaults_verbose_json_only_for_whisper_models(
+    model: str, optional_params: dict[str, str], expected_response_format: str | None
+) -> None:
+    config: Final = ProviderConfigManager.get_provider_audio_transcription_config(
+        model=model, provider=LlmProviders.OPENAI
+    )
+    assert config is not None
+
+    request: Final = config.transform_audio_transcription_request(
+        model=model, audio_file=b"audio", optional_params=dict(optional_params), litellm_params={}
+    )
+
+    assert isinstance(request.data, dict)
+    assert request.data.get("response_format") == expected_response_format
+
+
 def test_get_valid_models_from_provider_cache_invalidation(monkeypatch):
     """
     Test that get_valid_models returns the correct models for a given provider
diff --git a/tests/unit/types/test_litellm_params.py b/tests/unit/types/test_litellm_params.py
index 122d811e491..aef43a15a72 100644
--- a/tests/unit/types/test_litellm_params.py
+++ b/tests/unit/types/test_litellm_params.py
@@ -65,6 +65,7 @@ CONNECTION_NAMES: Final = (
     "api_key",
     "api_base",
     "api_version",
+    "responses_api_version",
     "region_name",
     "headers",
     "provider_specific_header",
diff --git a/tests/unit/types/test_router.py b/tests/unit/types/test_router.py
index 6188bb966ee..0db122b927f 100644
--- a/tests/unit/types/test_router.py
+++ b/tests/unit/types/test_router.py
@@ -63,6 +63,7 @@ def test_custom_pricing_params_keeps_every_field_it_had():
         "output_cost_per_character",
         "cache_read_input_token_cost",
         "cache_creation_input_token_cost",
+        "cache_creation_input_token_cost_above_1hr",
         "cost_per_second",
         "input_cost_per_second",
         "cache_read_input_token_cost_flex",
@@ -372,3 +373,9 @@ def test_server_owned_wif_fields_present_reports_openai_fields():
 def test_reject_server_owned_wif_params_names_each_openai_field(param_name: str):
     with pytest.raises(ValueError, match=param_name):
         reject_server_owned_wif_params({param_name: "client-supplied"})
+
+
+@pytest.mark.parametrize("param_name", openai_wif_litellm_params)
+def test_reject_server_owned_wif_params_catches_the_array_form_key(param_name: str):
+    with pytest.raises(ValueError, match=param_name):
+        reject_server_owned_wif_params({f"{param_name}[]": "client-supplied"})
diff --git a/tests/unit/vector_stores/test_vector_store_registry.py b/tests/unit/vector_stores/test_vector_store_registry.py
index f6c888d20ff..83b59d77aaf 100644
--- a/tests/unit/vector_stores/test_vector_store_registry.py
+++ b/tests/unit/vector_stores/test_vector_store_registry.py
@@ -349,6 +349,56 @@ async def test_malformed_vector_store_index_row_from_the_db_raises_a_validation_
         await VectorStoreIndexRegistry.get_vector_store_indexes_from_db(_database_listing_index_rows([row]))
 
 
+@pytest.mark.parametrize(
+    ("tools", "expected"),
+    [
+        (5, []),
+        (["vector_store_ids", {"type": "file_search", "vector_store_ids": ["vs_kept"]}], ["vs_kept"]),
+        (
+            [{"type": "file_search", "vector_store_ids": 5}, {"type": "file_search", "vector_store_ids": ["vs_kept"]}],
+            ["vs_kept"],
+        ),
+    ],
+    ids=["int", "string_entry", "int_vector_store_ids"],
+)
+def test_vector_store_ids_to_run_skips_malformed_tools(tools: object, expected: list[str]) -> None:
+    assert VectorStoreRegistry().get_vector_store_ids_to_run(non_default_params={}, tools=tools) == expected
+
+
+@pytest.mark.parametrize(
+    "vector_store_ids",
+    ["vs_requested", ["vs_requested", 5]],
+    ids=["string", "list_with_a_non_string"],
+)
+def test_vector_store_ids_to_run_reads_every_store_id_a_malformed_vector_store_ids_field_names(
+    vector_store_ids: object,
+) -> None:
+    tools: Final = [{"type": "file_search", "vector_store_ids": vector_store_ids}]
+    assert VectorStoreRegistry().get_vector_store_ids_to_run(non_default_params={}, tools=tools) == ["vs_requested"]
+
+
+@pytest.mark.parametrize(
+    "vector_store_ids",
+    ["vs_allowed", ["vs_allowed", 12345], [12345], ["vs_allowed"]],
+    ids=["string", "list_with_a_non_string", "only_non_strings", "list_of_strings"],
+)
+def test_vector_store_tools_pop_exactly_the_store_ids_the_registry_reports_to_run(vector_store_ids: object) -> None:
+    now: Final = datetime.now(timezone.utc)
+    registry: Final = VectorStoreRegistry(
+        [
+            LiteLLM_ManagedVectorStore(vector_store_id=vector_store_id, created_at=now, updated_at=now)
+            for vector_store_id in ("vs_allowed", 12345)
+        ]
+    )
+    tools: Final = [{"type": "file_search", "vector_store_ids": vector_store_ids}]
+    checked: Final = registry.get_vector_store_ids_to_run(non_default_params={}, tools=tools)
+    ran: Final[list[str]] = []
+
+    registry.get_and_pop_recognised_vector_store_tools(tools=[dict(tool) for tool in tools], vector_store_ids=ran)
+
+    assert ran == checked
+
+
 class TestRegistriesDoNotShareDefaultState:
     def test_adding_to_one_registry_leaves_the_next_one_empty(self):
         VectorStoreRegistry().add_vector_store_to_registry(
diff --git a/ui/litellm-dashboard/eslint-suppressions.json b/ui/litellm-dashboard/eslint-suppressions.json
index b1b6cef7320..9eead41a102 100644
--- a/ui/litellm-dashboard/eslint-suppressions.json
+++ b/ui/litellm-dashboard/eslint-suppressions.json
@@ -2090,11 +2090,26 @@
       "count": 1
     }
   },
+  "src/components/ui/attachment.tsx": {
+    "local/no-ad-hoc-z-index": {
+      "count": 2
+    }
+  },
+  "src/components/ui/message-scroller.tsx": {
+    "local/no-noop-hover-variant": {
+      "count": 1
+    }
+  },
   "src/components/ui/slider.tsx": {
     "no-nested-ternary": {
       "count": 1
     }
   },
+  "src/components/ui/toggle-group.tsx": {
+    "local/no-ad-hoc-z-index": {
+      "count": 2
+    }
+  },
   "src/components/update_model_credentials_modal.tsx": {
     "local/filename-pascal-case": {
       "count": 1
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx
index 3eb80d3f587..e6cd9eb54a5 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/PassthroughAuthorizeSection.tsx
@@ -3,9 +3,11 @@ import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
 import { Label } from "@/components/ui/label";
 import { PasswordInput } from "@/components/shared/PasswordInput";
+import { Input } from "@/components/ui/input";
+import { MultiSelect } from "@/components/shared/MultiSelect";
 import DcrBridgeToggle from "./DcrBridgeToggle";
 import { MountedFormField } from "@/components/common_components/MountedFormField";
-import { textControl } from "./mcpFieldRules";
+import { tagsControl, textControl } from "./mcpFieldRules";
 import { credentialAuthClass, isClientForwardedTokenMode } from "@/components/mcp_tools/types";
 
 interface PassthroughOAuthFlow {
@@ -69,6 +71,7 @@ export default function PassthroughAuthorizeSection({
   const clientSecretPlaceholder = classUnchanged
     ? "Leave blank to keep the currently saved secret (if any)"
     : "Leave blank for public clients / PKCE";
+  const fieldClassName = "rounded-lg border-border focus:border-info focus:ring-ring";
   const clientIdExtra = classUnchanged
     ? "Set this to make everyone authorize through a specific app; required for upstreams without dynamic client registration (e.g. a pre-registered Slack app)."
     : "Switching the auth type discards the previously saved app; enter a client ID here or leave blank to use dynamic client registration.";
@@ -113,6 +116,39 @@ export default function PassthroughAuthorizeSection({
           />
         )}
       </MountedFormField>
+      <MountedFormField
+        label={<span className="text-sm font-medium text-foreground">Authorization URL (optional)</span>}
+        name="authorization_url"
+        help="Set this when the upstream publishes no OAuth metadata, for example an internal server behind Microsoft Entra. Leave blank to discover it from the upstream."
+      >
+        {(control) => (
+          <Input
+            {...textControl(control)}
+            placeholder="https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/authorize"
+            className={fieldClassName}
+          />
+        )}
+      </MountedFormField>
+      <MountedFormField
+        label={<span className="text-sm font-medium text-foreground">Token URL (optional)</span>}
+        name="token_url"
+        help="Token endpoint of the same authorization server. Leave blank to discover it from the upstream."
+      >
+        {(control) => (
+          <Input
+            {...textControl(control)}
+            placeholder="https://login.microsoftonline.com/<tenant-id>/oauth2/v2.0/token"
+            className={fieldClassName}
+          />
+        )}
+      </MountedFormField>
+      <MountedFormField
+        label={<span className="text-sm font-medium text-foreground">Scopes (optional)</span>}
+        name={["credentials", "scopes"]}
+        help="Scopes requested from the upstream when a user authorizes. Press enter or comma between scopes."
+      >
+        {(control) => <MultiSelect {...tagsControl(control)} placeholder="Add scopes" className="rounded-lg" />}
+      </MountedFormField>
       <DcrBridgeToggle authType={authType} initialChecked={dcrBridgeInitialChecked} />
       {isEditing && onRemoveStoredAppChange && (
         <Label className="items-start leading-normal font-normal text-foreground">
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createServerPayload.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createServerPayload.test.ts
index 4573069ff07..3ae846b0308 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createServerPayload.test.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/createServerPayload.test.ts
@@ -201,6 +201,22 @@ describe("buildCreateServerPayload credentials", () => {
     },
   );
 
+  it.each([["true_passthrough"], ["oauth_delegate"]])(
+    "carries the admin-entered authorization URL, token URL and scopes for %s",
+    (authType) => {
+      const entraServer = {
+        auth_type: authType,
+        authorization_url: "https://login.microsoftonline.com/tenant/oauth2/v2.0/authorize",
+        token_url: "https://login.microsoftonline.com/tenant/oauth2/v2.0/token",
+        credentials: { client_id: "org-app", scopes: ["api://mcp/.default", "offline_access", ""] },
+      };
+      const payload = payloadOf(build(entraServer));
+      expect(payload.authorization_url).toBe("https://login.microsoftonline.com/tenant/oauth2/v2.0/authorize");
+      expect(payload.token_url).toBe("https://login.microsoftonline.com/tenant/oauth2/v2.0/token");
+      expect(payload.credentials).toEqual({ client_id: "org-app", scopes: ["api://mcp/.default", "offline_access"] });
+    },
+  );
+
   it("merges the DCR-minted client into an oauth2 payload", () => {
     const payload = payloadOf(
       build(
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.differential.cases.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.differential.cases.ts
index 7db2d0dda36..4219113918b 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.differential.cases.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.differential.cases.ts
@@ -295,11 +295,6 @@ export const CASES: readonly DifferentialCase[] = [
     ui: {},
   },
   { label: "credentials absent entirely", values: { ...ROOT, auth_type: "oauth2" }, ui: {} },
-  {
-    label: "removeStoredApp forces an explicit-null app write",
-    values: { ...ROOT, auth_type: "true_passthrough", credentials: { ...CREDS } },
-    ui: { removeStoredApp: true, mcpServer: { ...SERVER, auth_type: "true_passthrough" } },
-  },
   {
     label: "removeStoredApp ignored outside a client-forwarded mode",
     values: { ...ROOT, auth_type: "api_key", credentials: { ...CREDS } },
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.differential.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.differential.test.ts
index 8a9bac582d6..ee5cce2d0d2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.differential.test.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.differential.test.ts
@@ -398,3 +398,61 @@ it.each([
   expect(result.payload.credentials?.client_secret).toBe(useDcr ? null : "configured-secret");
   expect(result.payload.credentials?.dcr_issuer).toBe(useDcr ? "https://new.example" : undefined);
 });
+
+it.each([AUTH_TYPE.OAUTH_DELEGATE, AUTH_TYPE.TRUE_PASSTHROUGH])(
+  "keeps the endpoints typed for %s when the server was saved as oauth2",
+  (authType) => {
+    const authorizationUrl = "https://login.microsoftonline.com/tenant/oauth2/v2.0/authorize";
+    const tokenUrl = "https://login.microsoftonline.com/tenant/oauth2/v2.0/token";
+    const values: EditServerFormValues = {
+      auth_type: authType,
+      transport: "http",
+      authorization_url: authorizationUrl,
+      token_url: tokenUrl,
+    };
+    const ui: EditServerUiState = { ...baseUi, mcpServer: { ...baseUi.mcpServer, auth_type: AUTH_TYPE.OAUTH2 } };
+    const result = buildEditServerPayload(values, ui);
+    expect(result.kind).toBe("ok");
+    if (result.kind !== "ok") throw new Error("Expected valid MCP server payload");
+    expect(result.payload.authorization_url).toBe(authorizationUrl);
+    expect(result.payload.token_url).toBe(tokenUrl);
+    expect(result.payload.issuer).toBeNull();
+    expect(result.payload.registration_url).toBeNull();
+  },
+);
+
+it.each([AUTH_TYPE.OAUTH_DELEGATE, AUTH_TYPE.TRUE_PASSTHROUGH])(
+  "writes an explicit null when the admin removes every scope on a %s server",
+  (authType) => {
+    const values: EditServerFormValues = {
+      auth_type: authType,
+      transport: "http",
+      credentials: { client_id: "org-app", scopes: [""] },
+    };
+    const ui: EditServerUiState = { ...baseUi, mcpServer: { ...baseUi.mcpServer, auth_type: authType } };
+    const result = buildEditServerPayload(values, ui);
+    expect(result.kind).toBe("ok");
+    if (result.kind !== "ok") throw new Error("Expected valid MCP server payload");
+    expect(result.payload.credentials).toEqual({ client_id: "org-app", scopes: null });
+  },
+);
+
+it.each([
+  [["read"], ["read"]],
+  [[""], null],
+])("keeps the scope edit %j when the saved app is removed on a client-forwarded server", (typed, expected) => {
+  const values: EditServerFormValues = {
+    auth_type: AUTH_TYPE.TRUE_PASSTHROUGH,
+    transport: "http",
+    credentials: { client_id: "cid", client_secret: "csec", scopes: typed },
+  };
+  const ui: EditServerUiState = {
+    ...baseUi,
+    removeStoredApp: true,
+    mcpServer: { ...baseUi.mcpServer, auth_type: AUTH_TYPE.TRUE_PASSTHROUGH },
+  };
+  const result = buildEditServerPayload(values, ui);
+  expect(result.kind).toBe("ok");
+  if (result.kind !== "ok") throw new Error("Expected valid MCP server payload");
+  expect(result.payload.credentials).toEqual({ scopes: expected, client_id: null, client_secret: null });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.ts b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.ts
index f166fa20d1f..081063854c0 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.ts
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/editServerPayload.ts
@@ -214,6 +214,21 @@ const buildCredentials = (credentialValues: unknown): Readonly<Record<string, un
   return Object.fromEntries(kept);
 };
 
+const unmountedOauth2Endpoints = (authType: string | undefined) =>
+  isClientForwardedTokenMode(authType) ? {} : { authorization_url: null, token_url: null };
+
+const scopesCleared = (credentialValues: unknown): boolean => {
+  if (!credentialValues || typeof credentialValues !== "object") return false;
+  const scopes: unknown = (credentialValues as { scopes?: unknown }).scopes;
+  return Array.isArray(scopes) && scopes.every((scope: unknown) => scope == null || scope === "");
+};
+
+const withClearedScopes = (
+  credentials: Readonly<Record<string, unknown>> | undefined,
+  credentialValues: unknown,
+): Readonly<Record<string, unknown>> | undefined =>
+  scopesCleared(credentialValues) ? { ...(credentials ?? {}), scopes: null } : credentials;
+
 interface CredentialsEntryInput {
   readonly dcrClient?: McpDcrCredentials | null;
   readonly oauthFlow?: string;
@@ -239,7 +254,7 @@ const resolveCredentialsEntry = ({
     return { credentials: { ...credentials, ...dcrClient } };
   }
   if (removeStoredApp && isClientForwardedTokenMode(authType)) {
-    return { credentials: { client_id: null, client_secret: null } };
+    return { credentials: { ...(credentials ?? {}), client_id: null, client_secret: null } };
   }
   if (includeCredentials && credentials && Object.keys(credentials).length > 0) {
     return { credentials };
@@ -334,7 +349,7 @@ export const buildEditServerPayload = (values: EditServerFormValues, ui: EditSer
   // Client-forwarded rows persist ONLY the declared app; strip any token material lingering in the
   // form (e.g. from a prior oauth2 authorize this session) so it can never reach the row.
   const submitCredentials = isClientForwardedTokenMode(restValues.auth_type)
-    ? preservedAdminCredentials(credentialsPayload)
+    ? withClearedScopes(preservedAdminCredentials(credentialsPayload), credentialValues)
     : credentialsPayload;
   const includeCredentials = restValues.auth_type && AUTH_TYPES_REQUIRING_CREDENTIALS.includes(restValues.auth_type);
 
@@ -355,7 +370,7 @@ export const buildEditServerPayload = (values: EditServerFormValues, ui: EditSer
     stdio_config: undefined,
     env_json: undefined,
     ...(mcpServer.auth_type === AUTH_TYPE.OAUTH2 && restValues.auth_type !== AUTH_TYPE.OAUTH2
-      ? { issuer: null, authorization_url: null, token_url: null, registration_url: null }
+      ? { issuer: null, ...unmountedOauth2Endpoints(restValues.auth_type), registration_url: null }
       : {}),
     ...(mcpServer.auth_type === AUTH_TYPE.OAUTH2_TOKEN_EXCHANGE &&
     restValues.auth_type !== AUTH_TYPE.OAUTH2_TOKEN_EXCHANGE
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.integration.test.tsx
index 7aed6488b54..9f91c06e9e5 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.integration.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/mcp-servers/_components/mcp_server_edit.integration.test.tsx
@@ -264,6 +264,8 @@ const CASES: readonly Case[] = [
       ...EXPECTED_BASE,
       auth_type: "true_passthrough",
       credentials: { client_id: "cid", client_secret: "csec" },
+      authorization_url: undefined,
+      token_url: undefined,
     },
   },
   {
@@ -273,6 +275,8 @@ const CASES: readonly Case[] = [
       ...EXPECTED_BASE,
       auth_type: "oauth_delegate",
       credentials: { client_id: "cid", client_secret: "csec" },
+      authorization_url: undefined,
+      token_url: undefined,
     },
   },
   {
@@ -283,7 +287,13 @@ const CASES: readonly Case[] = [
   {
     label: "dcr_bridge stays true for a client-forwarded mode",
     server: { ...BASE, auth_type: "true_passthrough", dcr_bridge: true },
-    expected: { ...EXPECTED_BASE, auth_type: "true_passthrough", dcr_bridge: true },
+    expected: {
+      ...EXPECTED_BASE,
+      auth_type: "true_passthrough",
+      dcr_bridge: true,
+      authorization_url: undefined,
+      token_url: undefined,
+    },
   },
   {
     label: "an existing allowed_tools list enforces the allowlist and round-trips",
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ByokConnect.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ByokConnect.tsx
new file mode 100644
index 00000000000..f94c43b720a
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ByokConnect.tsx
@@ -0,0 +1,152 @@
+"use client";
+
+import { useId, useState } from "react";
+import { Check, ExternalLink, KeyRound } from "lucide-react";
+import { PasswordInput } from "@/components/shared/PasswordInput";
+import { Button } from "@/components/ui/button";
+import { InputGroupButton } from "@/components/ui/input-group";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { Field, FieldDescription, FieldGroup, FieldLabel } from "@/components/ui/field";
+import { Spinner } from "@/components/ui/spinner";
+import { Switch } from "@/components/ui/switch";
+import type { MCPServer } from "@/components/mcp_tools/types";
+import { fetchClient } from "@/lib/http/api";
+import { ApiError } from "@/lib/http/client";
+import { toast } from "@/lib/toast";
+
+const saveErrorMessage = (error: unknown): string => {
+  if (error instanceof ApiError) {
+    const detail = (error.body as { detail?: { error?: string } } | null)?.detail?.error;
+    if (detail) return detail;
+  }
+  return error instanceof Error && error.message ? error.message : "Failed to connect";
+};
+
+export function ByokConnect({
+  server,
+  name,
+  onConnected,
+  onCancel,
+}: {
+  server: MCPServer;
+  name: string;
+  onConnected: () => void;
+  onCancel?: () => void;
+}) {
+  const [credential, setCredential] = useState("");
+  const [save, setSave] = useState(true);
+  const [isSaving, setIsSaving] = useState(false);
+  const keyId = useId();
+  const saveId = useId();
+
+  const connect = async () => {
+    if (!credential.trim()) {
+      toast.error("Enter your API key");
+      return;
+    }
+    setIsSaving(true);
+    try {
+      await fetchClient.POST("/v1/mcp/server/{server_id}/user-credential", {
+        params: { path: { server_id: server.server_id } },
+        body: { credential: credential.trim(), save },
+      });
+      toast.success(`Connected to ${name}`);
+      setCredential("");
+      onConnected();
+    } catch (error) {
+      toast.error(saveErrorMessage(error));
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  return (
+    <FieldGroup className="gap-4 p-4">
+      <div className="flex flex-col gap-1">
+        <p className="flex items-center gap-2 text-sm font-medium">
+          <KeyRound className="size-4 text-muted-foreground" />
+          {server.has_user_credential ? `Replace your ${name} API key` : `${name} needs your API key`}
+        </p>
+        <p className="text-sm text-muted-foreground">
+          {server.has_user_credential
+            ? `The new key replaces the one the gateway uses for ${name}.`
+            : `The gateway calls ${name} with your own key. Connect it to list and use its tools.`}
+        </p>
+      </div>
+      {server.byok_description && server.byok_description.length > 0 && (
+        <ul className="flex flex-col gap-1.5 text-sm">
+          {server.byok_description.map((item) => (
+            <li key={item} className="flex items-center gap-2">
+              <Check className="size-3.5 shrink-0 text-muted-foreground" />
+              {item}
+            </li>
+          ))}
+        </ul>
+      )}
+      <Field>
+        <FieldLabel htmlFor={keyId}>{name} API key</FieldLabel>
+        <PasswordInput
+          id={keyId}
+          value={credential}
+          onChange={(event) => setCredential(event.target.value)}
+          placeholder="Paste your API key"
+        />
+        {server.byok_api_key_help_url && (
+          <FieldDescription>
+            <a href={server.byok_api_key_help_url} target="_blank" rel="noopener noreferrer">
+              Where to find this key
+              <ExternalLink className="ml-1 inline size-3" />
+            </a>
+          </FieldDescription>
+        )}
+      </Field>
+      <Field orientation="horizontal">
+        <FieldLabel htmlFor={saveId} className="font-normal">
+          Save the key for next time
+        </FieldLabel>
+        <Switch id={saveId} checked={save} onCheckedChange={setSave} />
+      </Field>
+      <div className="flex gap-2">
+        <Button size="sm" onClick={() => void connect()} disabled={isSaving}>
+          {isSaving && <Spinner />}
+          Connect
+        </Button>
+        {onCancel && (
+          <Button variant="ghost" size="sm" onClick={onCancel} disabled={isSaving}>
+            Cancel
+          </Button>
+        )}
+      </div>
+    </FieldGroup>
+  );
+}
+
+export function ByokKeyButton({
+  server,
+  name,
+  onConnected,
+}: {
+  server: MCPServer;
+  name: string;
+  onConnected: () => void;
+}) {
+  const [open, setOpen] = useState(false);
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger render={<InputGroupButton size="xs" className="shrink-0" />}>
+        <KeyRound />
+        {server.has_user_credential ? "Replace key" : "Connect key"}
+      </PopoverTrigger>
+      <PopoverContent align="start" className="w-80 p-0">
+        <ByokConnect
+          server={server}
+          name={name}
+          onConnected={() => {
+            setOpen(false);
+            onConnected();
+          }}
+        />
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Composer.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Composer.test.tsx
new file mode 100644
index 00000000000..c62b839e5b3
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Composer.test.tsx
@@ -0,0 +1,61 @@
+import { createRef } from "react";
+import { createPortal } from "react-dom";
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { describe, expect, it, vi } from "vitest";
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import type { MCPToolArgumentsFormRef } from "@/components/mcp_tools/MCPToolArgumentsForm";
+import { Composer, type ChecklistProps, type DraftState } from "./Composer";
+import { capabilitiesFor } from "./endpointCapabilities";
+
+const checklist: ChecklistProps = { groups: [], value: [], onValueChange: vi.fn(), isLoading: false };
+
+const draft: DraftState = {
+  text: "",
+  setText: vi.fn(),
+  files: [],
+  attach: vi.fn(),
+  removeFile: vi.fn(),
+  isLoading: false,
+  send: vi.fn().mockResolvedValue(undefined),
+  cancel: vi.fn(),
+};
+
+const renderComposer = () =>
+  render(
+    <Composer
+      capabilities={capabilitiesFor(EndpointType.CHAT)}
+      endpoint={EndpointType.CHAT}
+      targetRow={<input aria-label="Model search" />}
+      draft={draft}
+      directTool={null}
+      toolArgsForm={createRef<MCPToolArgumentsFormRef>()}
+      mcpControl={null}
+      vectorStores={checklist}
+      guardrails={checklist}
+      codeInterpreter={{ enabled: false, onToggle: vi.fn() }}
+      settingsControl={createPortal(<input aria-label="Request tags" />, document.body)}
+      sendDisabled
+    />,
+  );
+
+describe("Composer", () => {
+  it("keeps focus in a popover field opened from the composer toolbar", async () => {
+    const user = userEvent.setup();
+    renderComposer();
+
+    await user.click(screen.getByLabelText("Request tags"));
+
+    expect(screen.getByLabelText("Request tags")).toHaveFocus();
+  });
+
+  it("focuses the message box when empty toolbar space is clicked", async () => {
+    const user = userEvent.setup();
+    const { container } = renderComposer();
+    const toolbar = container.querySelectorAll<HTMLElement>('[data-slot="input-group-addon"]');
+
+    await user.click(toolbar[toolbar.length - 1]);
+
+    expect(screen.getByLabelText("Message")).toHaveFocus();
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Composer.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Composer.tsx
new file mode 100644
index 00000000000..a9fbb777393
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Composer.tsx
@@ -0,0 +1,196 @@
+"use client";
+
+import { useRef, type DragEvent, type KeyboardEvent, type MouseEvent, type ReactNode, type RefObject } from "react";
+import { ArrowUp, Code2, Database, Paperclip, Shield, Square } from "lucide-react";
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import MCPToolArgumentsForm, { type MCPToolArgumentsFormRef } from "@/components/mcp_tools/MCPToolArgumentsForm";
+import type { MCPTool } from "@/components/mcp_tools/types";
+import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupTextarea } from "@/components/ui/input-group";
+import { Toggle } from "@/components/ui/toggle";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { DraftAttachments } from "./ComposerControls";
+import type { DraftFile } from "./composerFiles";
+import { ACCEPT_FOR, ATTACH_LABEL, type Capabilities } from "./endpointCapabilities";
+import { ChecklistMenu, type OptionGroup } from "./Pickers";
+
+export type ChecklistProps = Readonly<{
+  groups: readonly OptionGroup[];
+  value: readonly string[];
+  onValueChange: (value: readonly string[]) => void;
+  isLoading: boolean;
+}>;
+
+export type DraftState = Readonly<{
+  text: string;
+  setText: (text: string) => void;
+  files: readonly DraftFile[];
+  attach: (files: readonly File[]) => void;
+  removeFile: (index: number) => void;
+  isLoading: boolean;
+  send: () => Promise<void>;
+  cancel: () => void;
+}>;
+
+function AttachButton({
+  capabilities,
+  attach,
+}: {
+  capabilities: Capabilities;
+  attach: (files: readonly File[]) => void;
+}) {
+  const input = useRef<HTMLInputElement>(null);
+  if (!capabilities.attach) return null;
+  const label = ATTACH_LABEL[capabilities.attach];
+  return (
+    <>
+      <Tooltip>
+        <TooltipTrigger
+          render={<InputGroupButton size="icon-xs" aria-label={label} onClick={() => input.current?.click()} />}
+        >
+          <Paperclip />
+        </TooltipTrigger>
+        <TooltipContent>{label}</TooltipContent>
+      </Tooltip>
+      <input
+        ref={input}
+        type="file"
+        className="sr-only"
+        tabIndex={-1}
+        aria-hidden
+        accept={ACCEPT_FOR[capabilities.attach]}
+        multiple={capabilities.attach === "images"}
+        onChange={(event) => {
+          attach(Array.from(event.target.files ?? []));
+          event.target.value = "";
+        }}
+      />
+    </>
+  );
+}
+
+function SendButton({ draft, disabled }: { draft: DraftState; disabled: boolean }) {
+  if (draft.isLoading)
+    return (
+      <InputGroupButton size="icon-xs" variant="default" aria-label="Stop" onClick={draft.cancel}>
+        <Square className="fill-current" />
+      </InputGroupButton>
+    );
+  return (
+    <InputGroupButton
+      size="icon-xs"
+      variant="default"
+      aria-label="Send message"
+      disabled={disabled}
+      onClick={() => void draft.send()}
+    >
+      <ArrowUp />
+    </InputGroupButton>
+  );
+}
+
+export function Composer({
+  capabilities,
+  endpoint,
+  targetRow,
+  draft,
+  directTool,
+  toolArgsForm,
+  mcpControl,
+  vectorStores,
+  guardrails,
+  codeInterpreter,
+  settingsControl,
+  sendDisabled,
+}: {
+  capabilities: Capabilities;
+  endpoint: EndpointType;
+  targetRow: ReactNode;
+  draft: DraftState;
+  directTool: MCPTool | null;
+  toolArgsForm: RefObject<MCPToolArgumentsFormRef | null>;
+  mcpControl: ReactNode;
+  vectorStores: ChecklistProps;
+  guardrails: ChecklistProps;
+  codeInterpreter: Readonly<{ enabled: boolean; onToggle: (enabled: boolean) => void }>;
+  settingsControl: ReactNode;
+  sendDisabled: boolean;
+}) {
+  const isDirectCall = endpoint === EndpointType.MCP;
+  const isRealtime = endpoint === EndpointType.REALTIME;
+  const message = useRef<HTMLTextAreaElement>(null);
+  const focusMessage = (event: MouseEvent<HTMLDivElement>) => {
+    const target = event.target as HTMLElement;
+    if (!event.currentTarget.contains(target) || target.closest("button, input, textarea")) return;
+    message.current?.focus();
+  };
+  const handleDrop = (event: DragEvent<HTMLDivElement>) => {
+    if (!capabilities.attach) return;
+    event.preventDefault();
+    draft.attach(Array.from(event.dataTransfer.files));
+  };
+  const handleKeyDown = (event: KeyboardEvent<HTMLTextAreaElement>) => {
+    if (event.key !== "Enter" || event.shiftKey || event.nativeEvent.isComposing) return;
+    event.preventDefault();
+    if (!sendDisabled) void draft.send();
+  };
+  const directCallBody = (
+    <div data-slot="input-group-control" className="w-full px-3 py-3">
+      {directTool ? (
+        <MCPToolArgumentsForm ref={toolArgsForm} tool={directTool} className="flex flex-col gap-3" />
+      ) : (
+        <p className="text-sm text-muted-foreground">Pick a server and a tool above to fill in its arguments</p>
+      )}
+    </div>
+  );
+  const textBody = (
+    <InputGroupTextarea
+      ref={message}
+      value={draft.text}
+      onChange={(event) => draft.setText(event.target.value)}
+      onKeyDown={handleKeyDown}
+      placeholder={capabilities.placeholder}
+      rows={2}
+      aria-label="Message"
+      className="max-h-60"
+    />
+  );
+  return (
+    <InputGroup onDragOver={(event) => capabilities.attach && event.preventDefault()} onDrop={handleDrop}>
+      <InputGroupAddon align="block-start" className="gap-1 border-b border-border pb-2" onClick={focusMessage}>
+        {targetRow}
+      </InputGroupAddon>
+      {draft.files.length > 0 && (
+        <InputGroupAddon align="block-start" className="pt-2" onClick={focusMessage}>
+          <DraftAttachments files={draft.files} onRemove={draft.removeFile} />
+        </InputGroupAddon>
+      )}
+      {!isRealtime && (isDirectCall ? directCallBody : textBody)}
+      <InputGroupAddon align="block-end" className="gap-1" onClick={focusMessage}>
+        {capabilities.mcp && mcpControl}
+        {capabilities.vectorStores && (
+          <ChecklistMenu label="Vector stores" icon={<Database />} emptyText="No vector stores yet" {...vectorStores} />
+        )}
+        {capabilities.guardrails && (
+          <ChecklistMenu label="Guardrails" icon={<Shield />} emptyText="No guardrails yet" {...guardrails} />
+        )}
+        {capabilities.codeInterpreter && (
+          <Toggle
+            size="sm"
+            pressed={codeInterpreter.enabled}
+            onPressedChange={codeInterpreter.onToggle}
+            aria-label="Code interpreter"
+            className="h-6 gap-1 px-1.5 text-xs"
+          >
+            <Code2 />
+            Code interpreter
+          </Toggle>
+        )}
+        <span className="ml-auto flex items-center gap-1">
+          {settingsControl}
+          <AttachButton capabilities={capabilities} attach={draft.attach} />
+          {!isRealtime && <SendButton draft={draft} disabled={sendDisabled} />}
+        </span>
+      </InputGroupAddon>
+    </InputGroup>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ComposerControls.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ComposerControls.tsx
new file mode 100644
index 00000000000..e3e52be3b7b
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ComposerControls.tsx
@@ -0,0 +1,120 @@
+"use client";
+
+import { ChevronDown, FileText, Music, X } from "lucide-react";
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import {
+  Attachment,
+  AttachmentAction,
+  AttachmentActions,
+  AttachmentContent,
+  AttachmentDescription,
+  AttachmentGroup,
+  AttachmentMedia,
+  AttachmentTitle,
+} from "@/components/ui/attachment";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuLabel,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { InputGroupButton } from "@/components/ui/input-group";
+import { ENDPOINT_OPTIONS, OPEN_AI_VOICE_SELECT_OPTIONS, type OpenAIVoice } from "../chat_ui/chatConstants";
+import { formatBytes, type DraftFile } from "./composerFiles";
+
+const shortEndpoint = (label: string): string => label.replace(/^\/v1(beta)?\//, "");
+
+export function EndpointMenu({
+  value,
+  onValueChange,
+}: {
+  value: EndpointType;
+  onValueChange: (value: EndpointType) => void;
+}) {
+  const current = ENDPOINT_OPTIONS.find((option) => option.value === value);
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger render={<InputGroupButton size="xs" className="shrink-0" aria-label="Endpoint" />}>
+        <span className="font-mono text-xs">{shortEndpoint(current?.label ?? value)}</span>
+        <ChevronDown className="text-muted-foreground" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="start" className="w-64">
+        <DropdownMenuRadioGroup value={value} onValueChange={(next) => onValueChange(next as EndpointType)}>
+          <DropdownMenuLabel>Endpoint</DropdownMenuLabel>
+          {ENDPOINT_OPTIONS.map((option) => (
+            <DropdownMenuRadioItem key={option.value} value={option.value} closeOnClick className="font-mono text-xs">
+              {option.label}
+            </DropdownMenuRadioItem>
+          ))}
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
+
+export function VoiceMenu({
+  value,
+  onValueChange,
+}: {
+  value: OpenAIVoice;
+  onValueChange: (value: OpenAIVoice) => void;
+}) {
+  const current = OPEN_AI_VOICE_SELECT_OPTIONS.find((option) => option.value === value);
+  return (
+    <DropdownMenu>
+      <DropdownMenuTrigger render={<InputGroupButton size="xs" className="shrink-0" aria-label="Voice" />}>
+        <span className="text-xs">Voice: {current?.label.split(" - ")[0] ?? value}</span>
+        <ChevronDown className="text-muted-foreground" />
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="start" className="w-72">
+        <DropdownMenuRadioGroup value={value} onValueChange={(next) => onValueChange(next as OpenAIVoice)}>
+          <DropdownMenuLabel>Voice</DropdownMenuLabel>
+          {OPEN_AI_VOICE_SELECT_OPTIONS.map((option) => (
+            <DropdownMenuRadioItem key={option.value} value={option.value} closeOnClick>
+              {option.label}
+            </DropdownMenuRadioItem>
+          ))}
+        </DropdownMenuRadioGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
+
+function FileMedia({ draft }: { draft: DraftFile }) {
+  if (draft.previewUrl)
+    return (
+      <AttachmentMedia variant="image">
+        <img src={draft.previewUrl} alt="" />
+      </AttachmentMedia>
+    );
+  return <AttachmentMedia>{draft.file.type.startsWith("audio/") ? <Music /> : <FileText />}</AttachmentMedia>;
+}
+
+export function DraftAttachments({
+  files,
+  onRemove,
+}: {
+  files: readonly DraftFile[];
+  onRemove: (index: number) => void;
+}) {
+  return (
+    <AttachmentGroup className="w-full">
+      {files.map((draft, index) => (
+        <Attachment key={`${draft.file.name}-${index}`} size="xs">
+          <FileMedia draft={draft} />
+          <AttachmentContent>
+            <AttachmentTitle>{draft.file.name}</AttachmentTitle>
+            <AttachmentDescription>{formatBytes(draft.file.size)}</AttachmentDescription>
+          </AttachmentContent>
+          <AttachmentActions>
+            <AttachmentAction aria-label={`Remove ${draft.file.name}`} onClick={() => onRemove(index)}>
+              <X />
+            </AttachmentAction>
+          </AttachmentActions>
+        </Attachment>
+      ))}
+    </AttachmentGroup>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Conversation.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Conversation.tsx
new file mode 100644
index 00000000000..31eb395408a
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Conversation.tsx
@@ -0,0 +1,388 @@
+"use client";
+
+import type { ReactNode } from "react";
+import {
+  ArrowDownToLine,
+  ArrowUpFromLine,
+  Brain,
+  Clock,
+  Coins,
+  DatabaseZap,
+  FileText,
+  Music,
+  PlayCircle,
+  Repeat,
+  ScanSearch,
+  Timer,
+  Wrench,
+} from "lucide-react";
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import MCPEventsDisplay from "@/components/chat_ui/MCPEventsDisplay";
+import ReasoningContent from "@/components/chat_ui/ReasoningContent";
+import type { MessageAttachment, MessageType } from "@/components/chat_ui/types";
+import type { CodeInterpreterResult } from "@/components/llm_calls/code_interpreter_handler";
+import type { MCPEvent } from "@/components/mcp_tools/types";
+import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
+import {
+  Attachment,
+  AttachmentContent,
+  AttachmentDescription,
+  AttachmentGroup,
+  AttachmentMedia,
+  AttachmentTitle,
+} from "@/components/ui/attachment";
+import { Badge } from "@/components/ui/badge";
+import { Bubble, BubbleContent } from "@/components/ui/Bubble";
+import { Button } from "@/components/ui/button";
+import { Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyMedia, EmptyTitle } from "@/components/ui/empty";
+import { Marker, MarkerContent, MarkerIcon } from "@/components/ui/marker";
+import { Message, MessageContent, MessageFooter, MessageHeader } from "@/components/ui/message";
+import {
+  MessageScroller,
+  MessageScrollerButton,
+  MessageScrollerContent,
+  MessageScrollerItem,
+  MessageScrollerProvider,
+  MessageScrollerViewport,
+} from "@/components/ui/message-scroller";
+import { Spinner } from "@/components/ui/spinner";
+import { Toggle } from "@/components/ui/toggle";
+import A2AMetrics from "../chat_ui/A2AMetrics";
+import CodeInterpreterOutput from "../chat_ui/CodeInterpreterOutput";
+import { SearchResultsDisplay } from "../chat_ui/SearchResultsDisplay";
+import { formatBytes } from "./composerFiles";
+import { CopyIconButton, FallbackBadge, LongValue } from "./ModelName";
+import { ReplyBody } from "./ReplyContent";
+
+export const formatSeconds = (ms: number): string => `${(ms / 1000).toFixed(2)}s`;
+
+export const formatCost = (cost: number): string =>
+  `$${cost < 0.0001 && cost > 0 ? cost.toPrecision(2) : cost.toFixed(4)}`;
+
+const MCP_EVENT_ENDPOINTS: readonly EndpointType[] = [EndpointType.CHAT, EndpointType.RESPONSES];
+
+const textOf = (message: MessageType): string => (typeof message.content === "string" ? message.content : "");
+
+const fellBack = (message: MessageType): boolean => (message.trace?.attemptedFallbacks ?? 0) > 0;
+
+export const servedModel = (message: MessageType): string | undefined =>
+  message.trace?.modelGroup ?? (message.isError ? undefined : message.model ?? message.trace?.requestedModel);
+
+const replyModel = (message: MessageType): Readonly<{ value: string; detail: string }> | null => {
+  const served = servedModel(message);
+  if (served) return { value: served, detail: fellBack(message) ? "Served by, after a fallback" : "Served by" };
+  const requested = message.trace?.requestedModel ?? message.model;
+  return requested ? { value: requested, detail: "Requested model" } : null;
+};
+
+function Metric({ icon, value, label }: { icon: ReactNode; value: string; label?: string }) {
+  return (
+    <span className="inline-flex items-center gap-1 whitespace-nowrap [&_svg]:size-3.5">
+      {icon}
+      <span className="text-foreground">{value}</span>
+      {label}
+    </span>
+  );
+}
+
+function ReplyMetrics({ message }: { message: MessageType }) {
+  const usage = message.usage;
+  const cost = usage?.cost ?? message.trace?.cost;
+  const cached = usage?.servedFromResponseCache || message.trace?.cacheHit;
+  return (
+    <div
+      aria-label="Request metrics"
+      className="flex flex-wrap items-center gap-x-3 gap-y-1 text-xs text-muted-foreground tabular-nums"
+    >
+      {message.timeToFirstToken !== undefined && (
+        <Metric icon={<Timer />} value={formatSeconds(message.timeToFirstToken)} label="to first token" />
+      )}
+      {message.totalLatency !== undefined && (
+        <Metric icon={<Clock />} value={formatSeconds(message.totalLatency)} label="total" />
+      )}
+      {usage?.promptTokens !== undefined && (
+        <Metric icon={<ArrowDownToLine />} value={String(usage.promptTokens)} label="in" />
+      )}
+      {usage?.completionTokens !== undefined && (
+        <Metric icon={<ArrowUpFromLine />} value={String(usage.completionTokens)} label="out" />
+      )}
+      {usage?.reasoningTokens ? (
+        <Metric icon={<Brain />} value={String(usage.reasoningTokens)} label="reasoning" />
+      ) : null}
+      {usage?.cacheReadTokens ? (
+        <Metric icon={<DatabaseZap />} value={String(usage.cacheReadTokens)} label="cached" />
+      ) : null}
+      {cost !== undefined && <Metric icon={<Coins />} value={formatCost(cost)} />}
+      {message.toolName && <Metric icon={<Wrench />} value={message.toolName} />}
+      {cached && <Badge variant="secondary">Cached response</Badge>}
+    </div>
+  );
+}
+
+function AttachmentMediaFor({ attachment }: { attachment: MessageAttachment }) {
+  if (attachment.previewUrl)
+    return (
+      <AttachmentMedia variant="image">
+        <img src={attachment.previewUrl} alt="" />
+      </AttachmentMedia>
+    );
+  return <AttachmentMedia>{attachment.kind === "audio" ? <Music /> : <FileText />}</AttachmentMedia>;
+}
+
+function UserTurn({ message }: { message: MessageType }) {
+  const text = textOf(message);
+  return (
+    <Message align="end">
+      <MessageContent>
+        {message.attachments && message.attachments.length > 0 && (
+          <AttachmentGroup className="justify-end">
+            {message.attachments.map((attachment, index) => (
+              <Attachment key={`${attachment.name}-${index}`} size="sm">
+                <AttachmentMediaFor attachment={attachment} />
+                <AttachmentContent>
+                  <AttachmentTitle>{attachment.name}</AttachmentTitle>
+                  <AttachmentDescription>{formatBytes(attachment.size)}</AttachmentDescription>
+                </AttachmentContent>
+              </Attachment>
+            ))}
+          </AttachmentGroup>
+        )}
+        {message.mcpToolCall && (
+          <Bubble variant="muted" align="end">
+            <BubbleContent className="flex flex-col gap-1">
+              <span className="flex items-center gap-1.5 text-xs text-muted-foreground">
+                <Wrench className="size-3.5" />
+                Called <span className="font-mono text-foreground">{message.mcpToolCall.tool}</span>
+              </span>
+              <pre className="font-mono text-xs whitespace-pre-wrap">
+                {JSON.stringify(message.mcpToolCall.arguments, null, 2)}
+              </pre>
+            </BubbleContent>
+          </Bubble>
+        )}
+        {text && (
+          <Bubble variant="muted" align="end">
+            <BubbleContent className="whitespace-pre-wrap">{text}</BubbleContent>
+          </Bubble>
+        )}
+      </MessageContent>
+    </Message>
+  );
+}
+
+export type LastReplyExtras = Readonly<{
+  endpoint: EndpointType;
+  mcpEvents: readonly MCPEvent[];
+  codeInterpreter: CodeInterpreterResult | null;
+  accessToken: string;
+}>;
+
+function AssistantReply({
+  message,
+  isLast,
+  extras,
+  inspected,
+  onInspect,
+}: {
+  message: MessageType;
+  isLast: boolean;
+  extras: LastReplyExtras;
+  inspected: boolean;
+  onInspect: () => void;
+}) {
+  const model = replyModel(message);
+  const showMcpEvents = isLast && extras.mcpEvents.length > 0 && MCP_EVENT_ENDPOINTS.includes(extras.endpoint);
+  const showCode = isLast && extras.codeInterpreter && extras.endpoint === EndpointType.RESPONSES;
+  return (
+    <Message>
+      <MessageContent className="text-sm">
+        {model && (
+          <MessageHeader className="gap-2 px-0 font-normal">
+            <LongValue
+              value={model.value}
+              detail={model.detail}
+              copyLabel="model name"
+              className="max-w-96 text-xs text-muted-foreground"
+            />
+            {fellBack(message) && <FallbackBadge />}
+          </MessageHeader>
+        )}
+        {message.reasoningContent && <ReasoningContent reasoningContent={message.reasoningContent} />}
+        {showMcpEvents && <MCPEventsDisplay events={[...extras.mcpEvents]} />}
+        {message.searchResults && <SearchResultsDisplay searchResults={message.searchResults} />}
+        {showCode && extras.codeInterpreter && (
+          <CodeInterpreterOutput
+            code={extras.codeInterpreter.code}
+            containerId={extras.codeInterpreter.containerId}
+            annotations={extras.codeInterpreter.annotations}
+            accessToken={extras.accessToken}
+          />
+        )}
+        {message.isError ? (
+          <Alert variant="destructive">
+            <AlertTitle>The request failed</AlertTitle>
+            <AlertDescription className="font-mono text-xs wrap-anywhere">{textOf(message)}</AlertDescription>
+          </Alert>
+        ) : (
+          <ReplyBody message={message} />
+        )}
+        <MessageFooter className="items-center gap-2 px-0 font-normal">
+          <div className="min-w-0 flex-1">
+            {message.a2aMetadata ? (
+              <A2AMetrics
+                a2aMetadata={message.a2aMetadata}
+                timeToFirstToken={message.timeToFirstToken}
+                totalLatency={message.totalLatency}
+              />
+            ) : (
+              <ReplyMetrics message={message} />
+            )}
+          </div>
+          <span className="flex shrink-0 items-center gap-0.5">
+            {!message.isImage && !message.isAudio && <CopyIconButton value={textOf(message)} label="reply" />}
+            {message.trace && (
+              <Toggle
+                size="sm"
+                pressed={inspected}
+                onPressedChange={onInspect}
+                aria-label="Inspect this request"
+                className="h-6 gap-1 px-1.5 text-xs"
+              >
+                <ScanSearch />
+                Inspect
+              </Toggle>
+            )}
+          </span>
+        </MessageFooter>
+      </MessageContent>
+    </Message>
+  );
+}
+
+function WaitingTurn({ target }: { target: string | undefined }) {
+  return (
+    <Message>
+      <MessageContent className="text-sm">
+        <div className="flex items-center gap-2 text-muted-foreground">
+          <Spinner className="size-3.5" />
+          <span className="shimmer">{target ? `Waiting for ${target}` : "Waiting for a reply"}</span>
+        </div>
+      </MessageContent>
+    </Message>
+  );
+}
+
+function SwitchMarker({ model }: { model: string }) {
+  return (
+    <Marker variant="separator">
+      <MarkerIcon>
+        <Repeat />
+      </MarkerIcon>
+      <MarkerContent>Switched to {model}</MarkerContent>
+    </Marker>
+  );
+}
+
+function EmptyConversation({
+  suggestions,
+  onPick,
+}: {
+  suggestions: readonly string[];
+  onPick: (text: string) => void;
+}) {
+  return (
+    <Empty className="flex-1">
+      <EmptyHeader>
+        <EmptyMedia variant="icon">
+          <PlayCircle />
+        </EmptyMedia>
+        <EmptyTitle>Send a test request</EmptyTitle>
+        <EmptyDescription>
+          Pick a model and anything the request should go through, then inspect what the gateway did with it
+        </EmptyDescription>
+      </EmptyHeader>
+      {suggestions.length > 0 && (
+        <EmptyContent className="max-w-xl flex-row flex-wrap justify-center gap-2">
+          {suggestions.map((suggestion) => (
+            <Button key={suggestion} variant="outline" size="sm" onClick={() => onPick(suggestion)}>
+              {suggestion}
+            </Button>
+          ))}
+        </EmptyContent>
+      )}
+    </Empty>
+  );
+}
+
+const switchedModel = (messages: readonly MessageType[], index: number): string | null => {
+  const message = messages[index];
+  if (message?.role !== "user" || !message.model) return null;
+  const previous = messages.slice(0, index).findLast((candidate) => candidate.role === "user");
+  return previous?.model && previous.model !== message.model ? message.model : null;
+};
+
+export function Conversation({
+  messages,
+  isLoading,
+  waitingFor,
+  extras,
+  inspectedIndex,
+  onInspect,
+  suggestions,
+  onPickSuggestion,
+}: {
+  messages: readonly MessageType[];
+  isLoading: boolean;
+  waitingFor: string | undefined;
+  extras: LastReplyExtras;
+  inspectedIndex: number | null;
+  onInspect: (index: number) => void;
+  suggestions: readonly string[];
+  onPickSuggestion: (text: string) => void;
+}) {
+  if (messages.length === 0) return <EmptyConversation suggestions={suggestions} onPick={onPickSuggestion} />;
+  const lastIndex = messages.length - 1;
+  const waiting = isLoading && messages[lastIndex]?.role === "user";
+  return (
+    <MessageScrollerProvider autoScroll defaultScrollPosition="end">
+      <MessageScroller className="min-h-0 flex-1">
+        <MessageScrollerViewport aria-label="Conversation" className="scroll-fade-b">
+          <MessageScrollerContent className="mx-auto w-full max-w-3xl gap-6 px-6 py-6">
+            {messages.flatMap((message, index) => {
+              const switched = switchedModel(messages, index);
+              const turn = (
+                <MessageScrollerItem key={`m${index}`} messageId={`m${index}`} scrollAnchor={index === lastIndex}>
+                  {message.role === "user" ? (
+                    <UserTurn message={message} />
+                  ) : (
+                    <AssistantReply
+                      message={message}
+                      isLast={index === lastIndex}
+                      extras={extras}
+                      inspected={inspectedIndex === index}
+                      onInspect={() => onInspect(index)}
+                    />
+                  )}
+                </MessageScrollerItem>
+              );
+              return switched
+                ? [
+                    <MessageScrollerItem key={`s${index}`} messageId={`s${index}`}>
+                      <SwitchMarker model={switched} />
+                    </MessageScrollerItem>,
+                    turn,
+                  ]
+                : [turn];
+            })}
+            {waiting && (
+              <MessageScrollerItem key="waiting" messageId="waiting" scrollAnchor>
+                <WaitingTurn target={waitingFor} />
+              </MessageScrollerItem>
+            )}
+          </MessageScrollerContent>
+        </MessageScrollerViewport>
+        <MessageScrollerButton />
+      </MessageScroller>
+    </MessageScrollerProvider>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Inspector.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Inspector.tsx
new file mode 100644
index 00000000000..3a9919ce38f
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Inspector.tsx
@@ -0,0 +1,292 @@
+"use client";
+
+import { useState, type ReactNode } from "react";
+import {
+  ArrowDownToLine,
+  ArrowUpFromLine,
+  Brain,
+  Clock,
+  Coins,
+  DatabaseZap,
+  Gauge,
+  RotateCw,
+  Server,
+  Shuffle,
+  Timer,
+} from "lucide-react";
+import type { MessageType } from "@/components/chat_ui/types";
+import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion";
+import { Badge } from "@/components/ui/badge";
+import { Empty, EmptyDescription, EmptyHeader, EmptyTitle } from "@/components/ui/empty";
+import { FieldDescription } from "@/components/ui/field";
+import { Item, ItemActions, ItemContent, ItemDescription, ItemGroup, ItemTitle } from "@/components/ui/item";
+import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { ToggleGroup, ToggleGroupItem } from "@/components/ui/toggle-group";
+import { formatCost, formatSeconds, servedModel } from "./Conversation";
+import { CopyIconButton, FallbackBadge, LongValue } from "./ModelName";
+
+export type CodeSdk = "openai" | "azure";
+
+function TraceRow({ title, description, children }: { title: string; description?: string; children?: ReactNode }) {
+  return (
+    <Item size="xs" className="flex-nowrap px-0 py-1.5">
+      <ItemContent className="flex-none gap-0">
+        <ItemTitle className="font-normal whitespace-nowrap text-muted-foreground">{title}</ItemTitle>
+        {description && <ItemDescription className="whitespace-nowrap">{description}</ItemDescription>}
+      </ItemContent>
+      {children && <ItemActions className="min-w-0 flex-1 justify-end text-sm tabular-nums">{children}</ItemActions>}
+    </Item>
+  );
+}
+
+type StatValue = Readonly<{ label: string; icon: ReactNode; value: string | undefined }>;
+
+function StatGrid({ stats }: { stats: readonly StatValue[] }) {
+  const shown = stats.filter((stat): stat is StatValue & { value: string } => stat.value !== undefined);
+  if (shown.length === 0) return null;
+  return (
+    <ItemGroup className="grid grid-cols-3 gap-x-4 gap-y-3 py-2 has-data-[size=sm]:gap-y-3">
+      {shown.map((stat) => (
+        <Item key={stat.label} size="sm" className="flex-col flex-nowrap items-start gap-0.5 p-0">
+          <ItemDescription className="inline-flex items-center gap-1 whitespace-nowrap [&_svg]:size-3.5">
+            {stat.icon}
+            {stat.label}
+          </ItemDescription>
+          <ItemTitle className="tabular-nums">{stat.value}</ItemTitle>
+        </Item>
+      ))}
+    </ItemGroup>
+  );
+}
+
+function TraceSection({ value, title, children }: { value: string; title: string; children: ReactNode }) {
+  return (
+    <AccordionItem value={value} className="px-4">
+      <AccordionTrigger className="py-3">{title}</AccordionTrigger>
+      <AccordionContent className="pb-3 [&_p:not(:last-child)]:mb-0">
+        <ItemGroup className="gap-0 pb-1 has-data-[size=xs]:gap-0">{children}</ItemGroup>
+      </AccordionContent>
+    </AccordionItem>
+  );
+}
+
+function Muted({ children }: { children: ReactNode }) {
+  return <p className="py-1.5 text-sm text-muted-foreground">{children}</p>;
+}
+
+const count = (value: number | undefined): string | undefined => (value === undefined ? undefined : String(value));
+const millis = (value: number | undefined): string | undefined =>
+  value === undefined ? undefined : `${Math.round(value)}ms`;
+
+function Routing({ message }: { message: MessageType }) {
+  const trace = message.trace;
+  const served = servedModel(message);
+  const fellBack = (trace?.attemptedFallbacks ?? 0) > 0;
+  const reported = Boolean(trace?.callId || trace?.modelGroup || trace?.providerModel);
+  return (
+    <TraceSection value="routing" title="Routing">
+      {trace?.requestedModel && (
+        <TraceRow title="Requested">
+          <LongValue value={trace.requestedModel} detail="Requested model" copyLabel="model name" className="text-xs" />
+        </TraceRow>
+      )}
+      {served && (
+        <TraceRow title="Served by">
+          {fellBack && <FallbackBadge />}
+          <LongValue value={served} detail="Model group that answered" copyLabel="model name" className="text-xs" />
+        </TraceRow>
+      )}
+      {trace?.providerModel && (
+        <TraceRow title="Provider model">
+          <LongValue
+            value={trace.providerModel}
+            detail={trace.deploymentId ? `Deployment ID ${trace.deploymentId}` : "Model sent to the provider"}
+            copyLabel="provider model"
+            className="text-xs"
+            align="end"
+          />
+        </TraceRow>
+      )}
+      {trace?.apiBase && (
+        <TraceRow title="API base">
+          <LongValue
+            value={trace.apiBase}
+            detail="Provider endpoint"
+            copyLabel="API base"
+            className="text-xs"
+            align="end"
+          />
+        </TraceRow>
+      )}
+      {trace?.callId && (
+        <TraceRow title="Call ID">
+          <span className="min-w-0 truncate font-mono text-xs">{trace.callId}</span>
+          <CopyIconButton value={trace.callId} label="call ID" />
+        </TraceRow>
+      )}
+      {trace?.responseId && (
+        <TraceRow title="Response ID">
+          <span className="min-w-0 truncate font-mono text-xs">{trace.responseId}</span>
+          <CopyIconButton value={trace.responseId} label="response ID" />
+        </TraceRow>
+      )}
+      <StatGrid
+        stats={[
+          { label: "Fallbacks", icon: <Shuffle />, value: count(trace?.attemptedFallbacks) },
+          { label: "Retries", icon: <RotateCw />, value: count(trace?.attemptedRetries) },
+          { label: "Overhead", icon: <Gauge />, value: millis(trace?.overheadMs) },
+        ]}
+      />
+      {!reported && (
+        <Muted>
+          The gateway did not share routing details with this page. Open the dashboard from the proxy to see them
+        </Muted>
+      )}
+    </TraceSection>
+  );
+}
+
+const noneRan = (policies: readonly string[] | undefined): string | null => {
+  if (policies === undefined) return "No guardrails ran on this request";
+  return policies.length === 0 ? "No guardrails or policies ran on this request" : null;
+};
+
+function Guardrails({ message }: { message: MessageType }) {
+  const guardrails = message.trace?.appliedGuardrails;
+  const policies = message.trace?.appliedPolicies;
+  if (guardrails === undefined) {
+    return (
+      <TraceSection value="guardrails" title="Guardrails and policies">
+        <Muted>This endpoint does not report which guardrails or policies ran</Muted>
+      </TraceSection>
+    );
+  }
+  const emptyNote = guardrails.length === 0 ? noneRan(policies) : null;
+  return (
+    <TraceSection value="guardrails" title="Guardrails and policies">
+      {guardrails.map((name) => (
+        <TraceRow key={`g-${name}`} title={name} description="Guardrail">
+          <Badge variant="secondary">Ran</Badge>
+        </TraceRow>
+      ))}
+      {policies?.map((name) => (
+        <TraceRow key={`p-${name}`} title={name} description="Policy">
+          <Badge variant="secondary">Ran</Badge>
+        </TraceRow>
+      ))}
+      {emptyNote && <Muted>{emptyNote}</Muted>}
+      {policies === undefined && <Muted>Policies are only reported when the dashboard is opened from the proxy</Muted>}
+    </TraceSection>
+  );
+}
+
+function SpeedAndCost({ message }: { message: MessageType }) {
+  const usage = message.usage;
+  const cost = usage?.cost ?? message.trace?.cost;
+  return (
+    <TraceSection value="performance" title="Speed and cost">
+      <StatGrid
+        stats={[
+          {
+            label: "First token",
+            icon: <Timer />,
+            value: message.timeToFirstToken === undefined ? undefined : formatSeconds(message.timeToFirstToken),
+          },
+          {
+            label: "Total",
+            icon: <Clock />,
+            value: message.totalLatency === undefined ? undefined : formatSeconds(message.totalLatency),
+          },
+          { label: "Cost", icon: <Coins />, value: cost === undefined ? undefined : formatCost(cost) },
+          { label: "Tokens in", icon: <ArrowDownToLine />, value: count(usage?.promptTokens) },
+          { label: "Tokens out", icon: <ArrowUpFromLine />, value: count(usage?.completionTokens) },
+          { label: "Cached", icon: <DatabaseZap />, value: count(usage?.cacheReadTokens) },
+          { label: "Reasoning", icon: <Brain />, value: count(usage?.reasoningTokens) },
+          { label: "Gateway time", icon: <Server />, value: millis(message.trace?.responseMs) },
+        ]}
+      />
+    </TraceSection>
+  );
+}
+
+function NothingYet() {
+  return (
+    <Empty className="flex-1">
+      <EmptyHeader>
+        <EmptyTitle className="text-sm">Nothing to inspect yet</EmptyTitle>
+        <EmptyDescription>
+          Each reply shows here with the deployment that served it, fallbacks, guardrails, timing and cost
+        </EmptyDescription>
+      </EmptyHeader>
+    </Empty>
+  );
+}
+
+function Trace({ message }: { message: MessageType | null }) {
+  if (!message) return <NothingYet />;
+  return (
+    <Accordion multiple defaultValue={["routing", "guardrails", "performance"]}>
+      <Routing message={message} />
+      <Guardrails message={message} />
+      <SpeedAndCost message={message} />
+    </Accordion>
+  );
+}
+
+function CodeTab({ code }: { code: (sdk: CodeSdk) => string }) {
+  const [sdk, setSdk] = useState<CodeSdk>("openai");
+  const snippet = code(sdk);
+  return (
+    <div className="flex flex-col">
+      <div className="flex items-center gap-2 px-4 pt-3">
+        <ToggleGroup
+          value={[sdk]}
+          onValueChange={(value) => value[0] && setSdk(value[0] as CodeSdk)}
+          variant="outline"
+          size="sm"
+          spacing={0}
+          aria-label="SDK"
+        >
+          <ToggleGroupItem value="openai" className="h-7 px-2 text-xs">
+            OpenAI SDK
+          </ToggleGroupItem>
+          <ToggleGroupItem value="azure" className="h-7 px-2 text-xs">
+            Azure SDK
+          </ToggleGroupItem>
+        </ToggleGroup>
+        <span className="ml-auto">
+          <CopyIconButton value={snippet} label="code" />
+        </span>
+      </div>
+      <FieldDescription className="px-4 pt-2 text-xs">
+        Send this request from your own app. Replace YOUR_LITELLM_API_KEY with a virtual key
+      </FieldDescription>
+      <ScrollArea className="w-full">
+        <pre className="px-4 py-3 font-mono text-xs leading-5 whitespace-pre text-foreground">{snippet}</pre>
+        <ScrollBar orientation="horizontal" />
+      </ScrollArea>
+    </div>
+  );
+}
+
+export function InspectorPanel({ message, code }: { message: MessageType | null; code: (sdk: CodeSdk) => string }) {
+  return (
+    <Tabs defaultValue="trace" className="min-h-0 flex-1 gap-0">
+      <div className="flex h-12 shrink-0 items-center border-b border-border px-4">
+        <TabsList className="w-full">
+          <TabsTrigger value="trace">Trace</TabsTrigger>
+          <TabsTrigger value="code">Code</TabsTrigger>
+        </TabsList>
+      </div>
+      <ScrollArea className="min-h-0 flex-1">
+        <TabsContent value="trace" className="flex min-h-96 flex-col">
+          <Trace message={message} />
+        </TabsContent>
+        <TabsContent value="code">
+          <CodeTab code={code} />
+        </TabsContent>
+      </ScrollArea>
+    </Tabs>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/McpDialog.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/McpDialog.tsx
new file mode 100644
index 00000000000..e5e0828825d
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/McpDialog.tsx
@@ -0,0 +1,391 @@
+"use client";
+
+import { useId, useState, type ReactNode } from "react";
+import { Blocks, KeyRound, Search } from "lucide-react";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { Checkbox } from "@/components/ui/checkbox";
+import {
+  Dialog,
+  DialogClose,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from "@/components/ui/dialog";
+import { Empty, EmptyContent, EmptyDescription, EmptyHeader, EmptyTitle } from "@/components/ui/empty";
+import { Field, FieldLabel, FieldLegend, FieldSet } from "@/components/ui/field";
+import { InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput } from "@/components/ui/input-group";
+import { ScrollArea } from "@/components/ui/scroll-area";
+import { Spinner } from "@/components/ui/spinner";
+import type { MCPServer, MCPToolset } from "@/components/mcp_tools/types";
+import { uiHref } from "@/utils/uiHref";
+import { ByokConnect } from "./ByokConnect";
+import {
+  ALL_MCP_SERVERS,
+  TOOLSET_PREFIX,
+  allowedTools,
+  toggleMcpItem,
+  toggleToolLimit,
+  withoutStaleLimits,
+  type ToolLimits,
+} from "./playgroundSettings";
+import { useServerTools } from "./usePlaygroundCatalog";
+
+type Row = Readonly<{ value: string; label: string }>;
+
+export const serverName = (server: MCPServer): string => server.alias || server.server_name || server.server_id;
+
+const matches = (value: string, query: string): boolean => value.toLowerCase().includes(query.trim().toLowerCase());
+
+const needsKey = (server: MCPServer | undefined): boolean => Boolean(server?.is_byok && !server.has_user_credential);
+
+function SearchField({
+  value,
+  onChange,
+  placeholder,
+  autoFocus,
+}: {
+  value: string;
+  onChange: (value: string) => void;
+  placeholder: string;
+  autoFocus: boolean;
+}) {
+  return (
+    <InputGroup className="h-8">
+      <InputGroupAddon>
+        <Search />
+      </InputGroupAddon>
+      <InputGroupInput
+        value={value}
+        onChange={(event) => onChange(event.target.value)}
+        placeholder={placeholder}
+        aria-label={placeholder}
+        autoFocus={autoFocus}
+      />
+    </InputGroup>
+  );
+}
+
+function MasterRow({
+  row,
+  checked,
+  onCheckedChange,
+  active,
+  onSelect,
+  summary,
+}: {
+  row: Row;
+  checked: boolean;
+  onCheckedChange: (checked: boolean) => void;
+  active: boolean;
+  onSelect: () => void;
+  summary?: string;
+}) {
+  return (
+    <div data-active={active || undefined} className="flex items-center gap-1 rounded-sm pl-2 data-active:bg-accent">
+      <Checkbox checked={checked} onCheckedChange={onCheckedChange} aria-label={`Use ${row.label}`} />
+      <Button
+        variant="ghost"
+        size="sm"
+        aria-pressed={active}
+        onClick={onSelect}
+        className="min-w-0 flex-1 justify-between px-2 font-normal hover:bg-transparent aria-pressed:bg-transparent"
+      >
+        <span className="truncate">{row.label}</span>
+        {summary && <span className="text-xs whitespace-nowrap text-muted-foreground">{summary}</span>}
+      </Button>
+    </div>
+  );
+}
+
+function ToolRow({
+  label,
+  checked,
+  disabled,
+  onCheckedChange,
+}: {
+  label: string;
+  checked: boolean;
+  disabled: boolean;
+  onCheckedChange: (checked: boolean) => void;
+}) {
+  const id = useId();
+  return (
+    <Field orientation="horizontal" className="min-h-8 gap-2 rounded-sm px-2 py-1 hover:bg-accent">
+      <Checkbox id={id} checked={checked} disabled={disabled} onCheckedChange={onCheckedChange} />
+      <FieldLabel htmlFor={id} className="min-w-0 flex-1 truncate font-mono text-xs font-normal">
+        {label}
+      </FieldLabel>
+    </Field>
+  );
+}
+
+function Note({ title, children, action }: { title: string; children: ReactNode; action?: ReactNode }) {
+  return (
+    <Empty>
+      <EmptyHeader>
+        <EmptyTitle className="text-sm">{title}</EmptyTitle>
+        <EmptyDescription>{children}</EmptyDescription>
+      </EmptyHeader>
+      {action && <EmptyContent>{action}</EmptyContent>}
+    </Empty>
+  );
+}
+
+function RowGroup({ title, rows, render }: { title: string; rows: readonly Row[]; render: (row: Row) => ReactNode }) {
+  if (rows.length === 0) return null;
+  return (
+    <FieldSet className="gap-0">
+      <FieldLegend variant="label" className="mb-0 px-2 pt-2 pb-1 text-xs font-normal text-muted-foreground">
+        {title}
+      </FieldLegend>
+      {rows.map(render)}
+    </FieldSet>
+  );
+}
+
+export function McpDialog({
+  requestKey,
+  servers,
+  toolsets,
+  isLoading,
+  selection,
+  toolLimits,
+  onChange,
+  onCredentialSaved,
+  defaultOpen = false,
+}: {
+  requestKey: string | null;
+  servers: readonly MCPServer[];
+  toolsets: readonly MCPToolset[];
+  isLoading: boolean;
+  selection: readonly string[];
+  toolLimits: ToolLimits;
+  onChange: (selection: readonly string[], limits: ToolLimits) => void;
+  onCredentialSaved: () => void;
+  defaultOpen?: boolean;
+}) {
+  const [focused, setFocused] = useState<string>(selection.find((item) => item !== ALL_MCP_SERVERS) ?? ALL_MCP_SERVERS);
+  const [query, setQuery] = useState("");
+  const [toolQuery, setToolQuery] = useState("");
+  const [replacingKey, setReplacingKey] = useState<string | null>(null);
+  const serverById = new Map(servers.map((server) => [server.server_id, server]));
+  const selectedServers = selection.filter((item) => serverById.has(item));
+  const toolsByServer = useServerTools(
+    requestKey,
+    [...new Set([...selectedServers, ...(serverById.has(focused) ? [focused] : [])])].filter(
+      (id) => !needsKey(serverById.get(id)),
+    ),
+  );
+  const toolNames = (serverId: string): readonly string[] =>
+    (toolsByServer[serverId]?.tools ?? []).map((tool) => tool.name);
+
+  const serverRows: Row[] = servers.map((server) => ({ value: server.server_id, label: serverName(server) }));
+  const toolsetRows: Row[] = toolsets.map((toolset) => ({
+    value: `${TOOLSET_PREFIX}${toolset.toolset_id}`,
+    label: toolset.toolset_name,
+  }));
+  const visible = (rows: readonly Row[]) => rows.filter((row) => matches(row.label, query));
+
+  const toggle = (item: string, on: boolean) => {
+    const next = toggleMcpItem(selection, item, on);
+    onChange(next, withoutStaleLimits(toolLimits, next));
+    if (on) setFocused(item);
+  };
+
+  const summary = (row: Row): string | undefined => {
+    if (!selection.includes(row.value)) return undefined;
+    const server = serverById.get(row.value);
+    if (!server) return undefined;
+    if (needsKey(server)) return "Needs your key";
+    const tools = toolNames(row.value);
+    if (tools.length === 0) return undefined;
+    const allowed = allowedTools(toolLimits, row.value, tools).length;
+    return allowed === tools.length ? `All ${tools.length} tools` : `${allowed} of ${tools.length} tools`;
+  };
+
+  const focus = (item: string) => {
+    setFocused(item);
+    setToolQuery("");
+    setReplacingKey(null);
+  };
+
+  const masterRow = (row: Row) => (
+    <MasterRow
+      key={row.value}
+      row={row}
+      checked={selection.includes(row.value)}
+      onCheckedChange={(on) => toggle(row.value, on)}
+      active={row.value === focused}
+      onSelect={() => focus(row.value)}
+      summary={summary(row)}
+    />
+  );
+
+  const detail = (): ReactNode => {
+    if (focused === ALL_MCP_SERVERS)
+      return <Note title="All MCP servers">Every server this key can reach, with all of its tools</Note>;
+    const toolset = toolsets.find((item) => `${TOOLSET_PREFIX}${item.toolset_id}` === focused);
+    if (toolset)
+      return (
+        <ScrollArea className="min-h-0 flex-1">
+          <div className="flex flex-col gap-3 p-4">
+            <p className="text-sm text-muted-foreground">
+              {toolset.description || "A toolset's tools are fixed by whoever created it"}
+            </p>
+            <div className="flex flex-wrap gap-1.5">
+              {toolset.tools.map((tool) => (
+                <Badge key={`${tool.server_id}-${tool.tool_name}`} variant="secondary" className="font-mono">
+                  {tool.tool_name}
+                </Badge>
+              ))}
+            </div>
+          </div>
+        </ScrollArea>
+      );
+    const server = serverById.get(focused);
+    if (!server) return <Note title="Nothing selected">Pick a server or toolset on the left</Note>;
+    const name = serverName(server);
+    if (needsKey(server) || replacingKey === focused)
+      return (
+        <ByokConnect
+          server={server}
+          name={name}
+          onConnected={() => {
+            setReplacingKey(null);
+            onCredentialSaved();
+          }}
+          onCancel={needsKey(server) ? undefined : () => setReplacingKey(null)}
+        />
+      );
+    const replaceKey = server.is_byok ? (
+      <Button variant="outline" size="sm" onClick={() => setReplacingKey(focused)}>
+        <KeyRound />
+        Replace key
+      </Button>
+    ) : undefined;
+    if (!selection.includes(focused))
+      return (
+        <Note title={name} action={replaceKey}>
+          Check this server to choose which of its tools the model can call
+        </Note>
+      );
+    const state = toolsByServer[focused];
+    if (!state || state.isLoading)
+      return (
+        <div className="flex flex-1 items-center justify-center">
+          <Spinner />
+        </div>
+      );
+    if (state.failed)
+      return (
+        <Note title={name} action={replaceKey}>
+          Couldn&apos;t load this server&apos;s tools
+        </Note>
+      );
+    const tools = toolNames(focused);
+    if (tools.length === 0) return <Note title={name}>This server has no tools</Note>;
+    const allowed = allowedTools(toolLimits, focused, tools);
+    return (
+      <div className="flex min-h-0 flex-1 flex-col">
+        <div className="flex items-center gap-2 p-2">
+          <SearchField
+            value={toolQuery}
+            onChange={setToolQuery}
+            placeholder={`Search ${name} tools`}
+            autoFocus={false}
+          />
+          <Button
+            variant="ghost"
+            size="sm"
+            disabled={allowed.length === tools.length}
+            onClick={() => onChange(selection, { ...toolLimits, [focused]: [] })}
+          >
+            Allow all
+          </Button>
+          {replaceKey}
+        </div>
+        <ScrollArea className="min-h-0 flex-1">
+          <div className="grid grid-cols-2 p-1">
+            {tools
+              .filter((tool) => matches(tool, toolQuery))
+              .map((tool) => (
+                <ToolRow
+                  key={tool}
+                  label={tool}
+                  checked={allowed.includes(tool)}
+                  disabled={allowed.length === 1 && allowed.includes(tool)}
+                  onCheckedChange={(on) =>
+                    onChange(selection, toggleToolLimit(toolLimits, { server: focused, tools }, tool, on))
+                  }
+                />
+              ))}
+          </div>
+        </ScrollArea>
+      </div>
+    );
+  };
+
+  const nothingAvailable = !isLoading && servers.length === 0 && toolsets.length === 0;
+
+  return (
+    <Dialog defaultOpen={defaultOpen} onOpenChange={(open) => !open && setReplacingKey(null)}>
+      <DialogTrigger render={<InputGroupButton size="xs" aria-label="MCP" />}>
+        <Blocks />
+        MCP
+        {selection.length > 0 && (
+          <Badge variant="secondary" className="h-4 min-w-4 px-1 tabular-nums">
+            {selection.length}
+          </Badge>
+        )}
+      </DialogTrigger>
+      <DialogContent className="gap-0 p-0 sm:max-w-3xl">
+        <DialogHeader className="border-b border-border p-4">
+          <DialogTitle>MCP servers</DialogTitle>
+          <DialogDescription>
+            Pick the servers the model can use, then limit their tools. A server allows every tool until you uncheck
+            some.
+          </DialogDescription>
+        </DialogHeader>
+        {nothingAvailable ? (
+          <div className="h-96">
+            <Note title="No MCP servers for this key">
+              Add one on the <a href={uiHref("mcp-servers")}>MCP servers page</a>, or send as a key that can reach one
+            </Note>
+          </div>
+        ) : (
+          <div className="grid h-96 grid-cols-[18rem_1fr]">
+            <div className="flex min-h-0 flex-col border-r border-border">
+              <div className="p-2">
+                <SearchField value={query} onChange={setQuery} placeholder="Search servers" autoFocus />
+              </div>
+              <ScrollArea className="min-h-0 flex-1">
+                {isLoading ? (
+                  <div className="flex justify-center p-6">
+                    <Spinner />
+                  </div>
+                ) : (
+                  <div className="p-1">
+                    <RowGroup
+                      title="MCP servers"
+                      rows={visible([{ value: ALL_MCP_SERVERS, label: "All MCP servers" }, ...serverRows])}
+                      render={masterRow}
+                    />
+                    <RowGroup title="Toolsets" rows={visible(toolsetRows)} render={masterRow} />
+                  </div>
+                )}
+              </ScrollArea>
+            </div>
+            <div className="flex min-h-0 flex-col">{detail()}</div>
+          </div>
+        )}
+        <DialogFooter className="m-0 border-t border-border p-3">
+          <DialogClose render={<Button size="sm" />}>Done</DialogClose>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ModelName.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ModelName.tsx
new file mode 100644
index 00000000000..bbea909711a
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ModelName.tsx
@@ -0,0 +1,74 @@
+"use client";
+
+import { Copy, Split } from "lucide-react";
+import { Badge } from "@/components/ui/badge";
+import { Button } from "@/components/ui/button";
+import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+import { cn } from "@/lib/cva.config";
+import { toast } from "@/lib/toast";
+
+export function copyText(value: string, label: string): void {
+  void navigator.clipboard.writeText(value).then(
+    () => toast.success(`${label} copied`),
+    () => toast.error("Unable to copy to clipboard"),
+  );
+}
+
+export function CopyIconButton({ value, label }: { value: string; label: string }) {
+  return (
+    <Tooltip>
+      <TooltipTrigger
+        render={
+          <Button variant="ghost" size="icon-xs" aria-label={`Copy ${label}`} onClick={() => copyText(value, label)} />
+        }
+      >
+        <Copy />
+      </TooltipTrigger>
+      <TooltipContent>Copy {label}</TooltipContent>
+    </Tooltip>
+  );
+}
+
+export function LongValue({
+  value,
+  detail,
+  copyLabel,
+  className,
+  align = "start",
+}: {
+  value: string;
+  detail: string;
+  copyLabel: string;
+  className?: string;
+  align?: "start" | "end";
+}) {
+  return (
+    <HoverCard>
+      <HoverCardTrigger
+        delay={300}
+        render={<span tabIndex={0} className={cn("min-w-0 cursor-default truncate font-mono", className)} />}
+      >
+        {value}
+      </HoverCardTrigger>
+      <HoverCardContent align={align} className="w-80">
+        <div className="flex items-start gap-2">
+          <div className="flex min-w-0 flex-1 flex-col gap-1">
+            <span className="text-xs text-muted-foreground">{detail}</span>
+            <span className="font-mono text-sm wrap-anywhere">{value}</span>
+          </div>
+          <CopyIconButton value={value} label={copyLabel} />
+        </div>
+      </HoverCardContent>
+    </HoverCard>
+  );
+}
+
+export function FallbackBadge() {
+  return (
+    <Badge variant="outline" className="border-warning/20 bg-warning/10 text-warning">
+      <Split data-icon="inline-start" />
+      Fallback
+    </Badge>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Pickers.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Pickers.test.tsx
new file mode 100644
index 00000000000..92258ed1428
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Pickers.test.tsx
@@ -0,0 +1,83 @@
+import { render, screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { describe, expect, it, vi } from "vitest";
+import { ChecklistMenu, TargetPicker, type OptionGroup } from "./Pickers";
+
+const GROUPS: readonly OptionGroup[] = [
+  {
+    label: "openai",
+    options: [
+      { value: "gpt-fast", label: "gpt-fast" },
+      { value: "gpt-smart", label: "gpt-smart" },
+    ],
+  },
+];
+
+const renderTargetPicker = (onValueChange = vi.fn()) => {
+  render(
+    <TargetPicker
+      label="Model"
+      placeholder="Select a model"
+      groups={GROUPS}
+      value={null}
+      onValueChange={onValueChange}
+      isLoading={false}
+      emptyText="No models"
+      allowCustom
+    />,
+  );
+  return onValueChange;
+};
+
+describe("TargetPicker", () => {
+  it("selects the first match when Enter is pressed after searching", async () => {
+    const user = userEvent.setup();
+    const onValueChange = renderTargetPicker();
+
+    await user.click(screen.getByRole("combobox", { name: "Model" }));
+    await user.type(await screen.findByPlaceholderText("Search models"), "smart{Enter}");
+
+    expect(onValueChange).toHaveBeenCalledWith("gpt-smart");
+  });
+
+  it("uses a typed model name that matches nothing when Enter is pressed", async () => {
+    const user = userEvent.setup();
+    const onValueChange = renderTargetPicker();
+
+    await user.click(screen.getByRole("combobox", { name: "Model" }));
+    await user.type(await screen.findByPlaceholderText("Search models"), "my-custom-model{Enter}");
+
+    expect(onValueChange).toHaveBeenCalledWith("my-custom-model");
+  });
+});
+
+describe("ChecklistMenu", () => {
+  it("toggles the first match when Enter is pressed after searching", async () => {
+    const user = userEvent.setup();
+    const onValueChange = vi.fn();
+    render(
+      <ChecklistMenu
+        label="Guardrails"
+        icon={null}
+        groups={[
+          {
+            label: "Guardrails",
+            options: [
+              { value: "pii-mask", label: "pii-mask" },
+              { value: "toxicity", label: "toxicity" },
+            ],
+          },
+        ]}
+        value={["pii-mask"]}
+        onValueChange={onValueChange}
+        isLoading={false}
+        emptyText="No guardrails"
+      />,
+    );
+
+    await user.click(screen.getByRole("combobox", { name: "Guardrails" }));
+    await user.type(await screen.findByPlaceholderText("Search guardrails"), "tox{Enter}");
+
+    expect(onValueChange).toHaveBeenLastCalledWith(["pii-mask", "toxicity"]);
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Pickers.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Pickers.tsx
new file mode 100644
index 00000000000..28ce6fe2f4a
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/Pickers.tsx
@@ -0,0 +1,193 @@
+"use client";
+
+import { useState, type ReactNode } from "react";
+import { Plus } from "lucide-react";
+import { Badge } from "@/components/ui/badge";
+import {
+  Combobox,
+  ComboboxCollection,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxGroup,
+  ComboboxInput,
+  ComboboxItem,
+  ComboboxLabel,
+  ComboboxList,
+  ComboboxTrigger,
+} from "@/components/ui/combobox";
+import { InputGroupButton } from "@/components/ui/input-group";
+import { Spinner } from "@/components/ui/spinner";
+import { cn } from "@/lib/cva.config";
+import type { PickerOption } from "./usePlaygroundCatalog";
+
+export type OptionGroup = Readonly<{ label: string; options: readonly PickerOption[] }>;
+
+type GroupItems = Readonly<{ value: string; items: readonly string[] }>;
+
+const toItems = (groups: readonly OptionGroup[]): GroupItems[] =>
+  groups
+    .filter((group) => group.options.length > 0)
+    .map((group) => ({ value: group.label, items: group.options.map((option) => option.value) }));
+
+const isListed = (index: ReadonlyMap<string, PickerOption>, name: string): boolean =>
+  index.has(name) || [...index.values()].some((option) => option.label === name);
+
+const optionIndex = (groups: readonly OptionGroup[]): ReadonlyMap<string, PickerOption> =>
+  new Map(groups.flatMap((group) => group.options.map((option) => [option.value, option] as const)));
+
+function GroupedOptions({ index, mono = false }: { index: ReadonlyMap<string, PickerOption>; mono?: boolean }) {
+  return (
+    <ComboboxList>
+      {(group: GroupItems) => (
+        <ComboboxGroup key={group.value} items={[...group.items]}>
+          <ComboboxLabel>{group.value}</ComboboxLabel>
+          <ComboboxCollection>
+            {(value: string) => {
+              const option = index.get(value);
+              if (!option) return <CustomItem key={value} value={value} />;
+              return (
+                <ComboboxItem key={value} value={value} className={cn("items-start", mono && "font-mono text-xs")}>
+                  <span className="flex min-w-0 flex-col">
+                    <span className="truncate">{option.label}</span>
+                    {option.description && (
+                      <span className="truncate font-sans text-xs text-muted-foreground">{option.description}</span>
+                    )}
+                  </span>
+                </ComboboxItem>
+              );
+            }}
+          </ComboboxCollection>
+        </ComboboxGroup>
+      )}
+    </ComboboxList>
+  );
+}
+
+function CustomItem({ value }: { value: string }) {
+  return (
+    <ComboboxItem value={value} className="font-mono text-xs">
+      <Plus />
+      <span className="min-w-0 truncate">
+        <span className="font-sans">Use</span> {value}
+      </span>
+    </ComboboxItem>
+  );
+}
+
+function CountBadge({ count }: { count: number }) {
+  if (count === 0) return null;
+  return (
+    <Badge variant="secondary" className="h-4 min-w-4 px-1 tabular-nums">
+      {count}
+    </Badge>
+  );
+}
+
+export function ChecklistMenu({
+  label,
+  icon,
+  groups,
+  value,
+  onValueChange,
+  isLoading,
+  emptyText,
+  defaultOpen = false,
+}: {
+  label: string;
+  icon: ReactNode;
+  groups: readonly OptionGroup[];
+  value: readonly string[];
+  onValueChange: (value: readonly string[]) => void;
+  isLoading: boolean;
+  emptyText: string;
+  defaultOpen?: boolean;
+}) {
+  const index = optionIndex(groups);
+  const items = toItems(groups);
+  return (
+    <Combobox
+      items={items}
+      multiple
+      value={[...value]}
+      onValueChange={(next: string[]) => onValueChange(next)}
+      itemToStringLabel={(item: string) => index.get(item)?.label ?? item}
+      defaultOpen={defaultOpen}
+      autoHighlight
+    >
+      <ComboboxTrigger render={<InputGroupButton size="xs" aria-label={label} />}>
+        {icon}
+        {label}
+        <CountBadge count={value.length} />
+      </ComboboxTrigger>
+      <ComboboxContent side="top" className="w-72">
+        <ComboboxInput showTrigger={false} placeholder={`Search ${label.toLowerCase()}`} />
+        <ComboboxEmpty>
+          {isLoading ? <Spinner className="size-3.5" /> : items.length === 0 && emptyText}
+          {!isLoading && items.length > 0 && "Nothing matches"}
+        </ComboboxEmpty>
+        <GroupedOptions index={index} />
+      </ComboboxContent>
+    </Combobox>
+  );
+}
+
+export function TargetPicker({
+  label,
+  placeholder,
+  groups,
+  value,
+  onValueChange,
+  isLoading,
+  emptyText,
+  allowCustom = false,
+  defaultOpen = false,
+}: {
+  label: string;
+  placeholder: string;
+  groups: readonly OptionGroup[];
+  value: string | null;
+  onValueChange: (value: string) => void;
+  isLoading: boolean;
+  emptyText: string;
+  allowCustom?: boolean;
+  defaultOpen?: boolean;
+}) {
+  const [query, setQuery] = useState("");
+  const index = optionIndex(groups);
+  const custom = query.trim();
+  const offerCustom = allowCustom && custom !== "" && !isListed(index, custom);
+  const items = [...toItems(groups), ...(offerCustom ? [{ value: "Custom name", items: [custom] }] : [])];
+  const unsetText = isLoading ? `Loading ${label.toLowerCase()}s` : placeholder;
+  return (
+    <Combobox
+      items={items}
+      value={value}
+      onValueChange={(next: string | null) => next && onValueChange(next)}
+      inputValue={query}
+      onInputValueChange={setQuery}
+      onOpenChange={(open) => !open && setQuery("")}
+      itemToStringLabel={(item: string) => index.get(item)?.label ?? item}
+      defaultOpen={defaultOpen}
+      autoHighlight
+    >
+      <ComboboxTrigger render={<InputGroupButton size="xs" className="max-w-72 min-w-0" aria-label={label} />}>
+        {isLoading && !value ? <Spinner className="size-3" /> : null}
+        <span
+          className={cn(
+            "min-w-0 truncate font-mono text-xs font-medium",
+            value ? "text-foreground" : "text-muted-foreground",
+          )}
+        >
+          {value ? index.get(value)?.label ?? value : unsetText}
+        </span>
+      </ComboboxTrigger>
+      <ComboboxContent side="top" className="w-80">
+        <ComboboxInput showTrigger={false} placeholder={`Search ${label.toLowerCase()}s`} />
+        <ComboboxEmpty>
+          {items.length === 0 && !custom ? emptyText : `No matching ${label.toLowerCase()}`}
+        </ComboboxEmpty>
+        <GroupedOptions index={index} mono />
+      </ComboboxContent>
+    </Combobox>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/PlaygroundChat.integration.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/PlaygroundChat.integration.test.tsx
new file mode 100644
index 00000000000..c80f47045c2
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/PlaygroundChat.integration.test.tsx
@@ -0,0 +1,658 @@
+import { act, fireEvent, screen, waitFor } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { renderWithProviders as render, testQueryClient } from "@/../tests/test-utils";
+import { makeOpenAIChatCompletionRequest } from "@/components/llm_calls/chat_completion";
+import { fetchAvailableModels } from "@/components/llm_calls/fetch_models";
+import { makeOpenAIResponsesRequest } from "@/components/llm_calls/responses_api";
+import { callMCPTool, fetchMCPServers, fetchMCPToolsets, listMCPTools, tagListCall } from "@/components/networking";
+import { setSecureItem } from "@/utils/secureStorage";
+import { fetchClient } from "@/lib/http/api";
+import { PlaygroundChat } from "./PlaygroundChat";
+
+vi.mock("@/app/(dashboard)/hooks/useCan", () => ({ default: () => true }));
+
+vi.mock("@/lib/http/api", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/lib/http/api")>();
+  return { ...actual, fetchClient: { ...actual.fetchClient, POST: vi.fn() } };
+});
+
+vi.mock("@/components/llm_calls/fetch_models", () => ({ fetchAvailableModels: vi.fn() }));
+
+vi.mock("@/components/llm_calls/chat_completion", () => ({ makeOpenAIChatCompletionRequest: vi.fn() }));
+
+vi.mock("@/components/llm_calls/responses_api", () => ({ makeOpenAIResponsesRequest: vi.fn() }));
+
+vi.mock("@/components/networking", () => ({
+  tagListCall: vi.fn().mockResolvedValue({}),
+  vectorStoreListCall: vi.fn().mockResolvedValue({ data: [] }),
+  getGuardrailsList: vi.fn().mockResolvedValue({ guardrails: [{ guardrail_name: "pii-mask" }] }),
+  getPoliciesList: vi.fn().mockResolvedValue({ policies: [] }),
+  fetchMCPServers: vi.fn().mockResolvedValue([]),
+  fetchMCPToolsets: vi.fn().mockResolvedValue([]),
+  listMCPTools: vi.fn().mockResolvedValue({ tools: [] }),
+  callMCPTool: vi.fn(),
+  getGatewayBaseUrl: () => "http://gateway.test",
+  getGlobalLitellmHeaderName: () => "Authorization",
+}));
+
+const chatRequest = vi.mocked(makeOpenAIChatCompletionRequest);
+
+const responsesRequest = vi.mocked(makeOpenAIResponsesRequest);
+
+const credentialPost = fetchClient.POST as unknown as ReturnType<typeof vi.fn>;
+
+type ChatArgs = Parameters<typeof makeOpenAIChatCompletionRequest>;
+
+type ResponsesArgs = Parameters<typeof makeOpenAIResponsesRequest>;
+
+const sentMessages = (call: number) => (chatRequest.mock.calls[call] as ChatArgs)[0];
+
+const replyWith =
+  (text: string) =>
+  async (...args: ChatArgs) => {
+    args[1](text, args[2]);
+  };
+
+const preload = (values: Readonly<Record<string, string>>) =>
+  Object.entries(values).forEach(([key, value]) => sessionStorage.setItem(key, value));
+
+const deferred = () => {
+  const control: { release: () => void } = { release: () => undefined };
+  const promise = new Promise<void>((resolve) => {
+    control.release = resolve;
+  });
+  return { promise, release: () => control.release() };
+};
+
+const mcpTool = (name: string, required: readonly string[] = []) => ({
+  name,
+  inputSchema: {
+    type: "object",
+    properties: Object.fromEntries(required.map((field) => [field, { type: "string" }])),
+    required: [...required],
+  },
+});
+
+const settled = () => waitFor(() => expect(testQueryClient.isFetching()).toBe(0));
+
+const renderChat = () =>
+  render(<PlaygroundChat accessToken="session-token" disabledPersonalKeyCreation={false} proxySettings={undefined} />);
+
+const send = async (user: ReturnType<typeof userEvent.setup>, text: string) => {
+  await user.type(screen.getByRole("textbox", { name: "Message" }), text);
+  await user.click(screen.getByRole("button", { name: "Send message" }));
+};
+
+describe("PlaygroundChat", () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    sessionStorage.clear();
+    testQueryClient.clear();
+    Element.prototype.scrollIntoView = vi.fn();
+    chatRequest.mockReset();
+    responsesRequest.mockReset();
+    vi.mocked(callMCPTool).mockReset();
+    credentialPost.mockReset().mockResolvedValue({ data: {}, response: new Response() });
+    vi.mocked(fetchMCPServers).mockReset().mockResolvedValue([]);
+    vi.mocked(fetchMCPToolsets).mockReset().mockResolvedValue([]);
+    vi.mocked(listMCPTools).mockReset().mockResolvedValue({ tools: [] });
+    vi.mocked(fetchAvailableModels).mockResolvedValue([
+      { model_group: "gpt-fast", mode: "chat", providers: ["openai"] },
+    ]);
+  });
+
+  afterEach(() => {
+    vi.unstubAllGlobals();
+  });
+
+  it("sends the chosen model and guardrails with the session key", async () => {
+    const user = userEvent.setup();
+    chatRequest.mockImplementation(replyWith("Hi there"));
+    renderChat();
+
+    await user.click(screen.getByRole("combobox", { name: "Model" }));
+    await user.click(await screen.findByRole("option", { name: "gpt-fast" }));
+    await user.click(screen.getByRole("combobox", { name: "Guardrails" }));
+    await user.click(await screen.findByRole("option", { name: "pii-mask" }));
+    await user.keyboard("{Escape}");
+    await send(user, "hello");
+
+    expect(await screen.findByText("Hi there")).toBeInTheDocument();
+    const [messages, , model, apiKey, , , , , , , , guardrails] = chatRequest.mock.calls[0] as ChatArgs;
+    expect(messages).toEqual([{ role: "user", content: "hello" }]);
+    expect(model).toBe("gpt-fast");
+    expect(apiKey).toBe("session-token");
+    expect(guardrails).toEqual(["pii-mask"]);
+  });
+
+  it("keeps answered turns in the history but never resends a failed one", async () => {
+    const user = userEvent.setup();
+    chatRequest
+      .mockImplementationOnce(replyWith("Hi there"))
+      .mockRejectedValueOnce(new Error("rate limited"))
+      .mockImplementationOnce(replyWith("Back again"));
+    renderChat();
+
+    await user.click(screen.getByRole("combobox", { name: "Model" }));
+    await user.click(await screen.findByRole("option", { name: "gpt-fast" }));
+    await send(user, "hello");
+    expect(await screen.findByText("Hi there")).toBeInTheDocument();
+    await send(user, "this one fails");
+    expect(await screen.findByText("The request failed")).toBeInTheDocument();
+    await send(user, "try again");
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalledTimes(3));
+    expect(sentMessages(2)).toEqual([
+      { role: "user", content: "hello" },
+      { role: "assistant", content: "Hi there" },
+      { role: "user", content: "try again" },
+    ]);
+  });
+
+  it("sends every saved request setting with the chat request", async () => {
+    const user = userEvent.setup();
+    chatRequest.mockImplementation(replyWith("Hi there"));
+    vi.mocked(fetchMCPServers).mockResolvedValue([{ server_id: "srv-1", alias: "docs" }]);
+    preload({
+      selectedModel: "gpt-fast",
+      selectedTags: JSON.stringify(["team-a"]),
+      selectedVectorStores: JSON.stringify(["vs-1"]),
+      selectedPolicies: JSON.stringify(["strict"]),
+      selectedMCPServers: JSON.stringify(["srv-1"]),
+      streamingEnabled: "false",
+    });
+    setSecureItem("customHeaders", JSON.stringify([["x-team", "blue"]]));
+    renderChat();
+
+    await waitFor(() => expect(fetchMCPServers).toHaveBeenCalled());
+    await send(user, "hello");
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalledTimes(1));
+    const args = chatRequest.mock.calls[0] as ChatArgs;
+    expect(args[2]).toBe("gpt-fast");
+    expect(args[4]).toEqual(["team-a"]);
+    expect(args[10]).toEqual(["vs-1"]);
+    expect(args[12]).toEqual(["strict"]);
+    expect(args[13]).toEqual(["srv-1"]);
+    expect(args[25]).toBe(false);
+    expect(args[26]).toMatchObject({ "x-team": "blue" });
+  });
+
+  it("sends a custom model and tag that are prefixes of listed ones", async () => {
+    const user = userEvent.setup();
+    chatRequest.mockImplementation(replyWith("Hi there"));
+    vi.mocked(tagListCall).mockResolvedValueOnce({
+      production: { name: "production", models: [], created_at: "", updated_at: "" },
+    });
+    renderChat();
+
+    await user.click(screen.getByRole("combobox", { name: "Model" }));
+    await user.type(await screen.findByPlaceholderText("Search models"), "gpt-f");
+    await user.click(await screen.findByRole("option", { name: "Use gpt-f" }));
+    await user.click(screen.getByRole("button", { name: "Settings" }));
+    await user.type(await screen.findByLabelText("Tags"), "prod");
+    await user.click(await screen.findByRole("option", { name: "Add prod" }));
+    await send(user, "hello");
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalledTimes(1));
+    const args = chatRequest.mock.calls[0] as ChatArgs;
+    expect(args[2]).toBe("gpt-f");
+    expect(args[4]).toEqual(["prod"]);
+  });
+
+  it("sends a temperature typed with two decimals", async () => {
+    const user = userEvent.setup();
+    chatRequest.mockImplementation(replyWith("Hi there"));
+    preload({ selectedModel: "gpt-fast" });
+    renderChat();
+
+    await user.click(screen.getByRole("button", { name: "Settings" }));
+    await user.click(await screen.findByRole("button", { name: "Advanced" }));
+    await user.type(screen.getByLabelText("Temperature value"), "0.05");
+    await user.keyboard("{Escape}");
+    await send(user, "hello");
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalledTimes(1));
+    expect((chatRequest.mock.calls[0] as ChatArgs)[16]).toBe(0.05);
+  });
+
+  it("keeps the saved MCP selection when the server list cannot be fetched", async () => {
+    const user = userEvent.setup();
+    chatRequest.mockImplementation(replyWith("Hi there"));
+    vi.mocked(fetchMCPServers).mockRejectedValue(new Error("forbidden"));
+    preload({ selectedModel: "gpt-fast", selectedMCPServers: JSON.stringify(["srv-1"]) });
+    renderChat();
+
+    await waitFor(() => expect(fetchMCPServers).toHaveBeenCalled());
+    await settled();
+    await send(user, "hello");
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalledTimes(1));
+    expect((chatRequest.mock.calls[0] as ChatArgs)[13]).toEqual(["srv-1"]);
+  });
+
+  it("drops a saved model that the current key cannot use", async () => {
+    const user = userEvent.setup();
+    chatRequest.mockImplementation(replyWith("Hi there"));
+    preload({ selectedModel: "retired-model" });
+    renderChat();
+
+    await waitFor(() => expect(fetchAvailableModels).toHaveBeenCalled());
+    await waitFor(() => expect(screen.getByRole("combobox", { name: "Model" })).toHaveTextContent("Select a model"));
+    await user.click(screen.getByRole("combobox", { name: "Model" }));
+    await user.click(await screen.findByRole("option", { name: "gpt-fast" }));
+    await send(user, "hello");
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalledTimes(1));
+    expect((chatRequest.mock.calls[0] as ChatArgs)[2]).toBe("gpt-fast");
+  });
+
+  it("calls a toolset tool on the server that backs it", async () => {
+    const user = userEvent.setup();
+    vi.mocked(fetchMCPToolsets).mockResolvedValue([
+      { toolset_id: "ts-1", toolset_name: "Research", tools: [{ server_id: "srv-2", tool_name: "search" }] },
+    ]);
+    vi.mocked(listMCPTools).mockResolvedValue({
+      tools: [{ name: "search", inputSchema: { type: "object", properties: {} } }],
+    });
+    vi.mocked(callMCPTool).mockResolvedValue({ content: [{ type: "text", text: "found it" }] });
+    preload({ endpointType: "mcp", selectedMCPServers: JSON.stringify(["toolset:ts-1"]) });
+    renderChat();
+
+    await user.click(await screen.findByRole("combobox", { name: "Tool" }));
+    await user.click(await screen.findByRole("option", { name: /search/ }));
+    await user.click(screen.getByRole("button", { name: "Send message" }));
+
+    await waitFor(() => expect(callMCPTool).toHaveBeenCalledTimes(1));
+    expect(listMCPTools).toHaveBeenCalledWith("session-token", "srv-2");
+    expect(listMCPTools).not.toHaveBeenCalledWith("session-token", "toolset:ts-1");
+    expect(vi.mocked(callMCPTool).mock.calls[0]?.slice(1, 3)).toEqual(["srv-2", "search"]);
+  });
+
+  it("offers toolsets as targets and lists only the toolset's own tools", async () => {
+    const user = userEvent.setup();
+    vi.mocked(fetchMCPToolsets).mockResolvedValue([
+      {
+        toolset_id: "ts-1",
+        toolset_name: "Research",
+        tools: [
+          { server_id: "srv-a", tool_name: "search" },
+          { server_id: "srv-b", tool_name: "fetch" },
+          { server_id: "srv-b", tool_name: "search" },
+        ],
+      },
+    ]);
+    vi.mocked(listMCPTools).mockImplementation(async (_key: string, server: string) => ({
+      tools:
+        server === "srv-a" ? [mcpTool("search"), mcpTool("fetch", ["a_arg"])] : [mcpTool("search"), mcpTool("fetch")],
+    }));
+    vi.mocked(callMCPTool).mockResolvedValue({ content: [{ type: "text", text: "fetched" }] });
+    preload({ endpointType: "mcp" });
+    renderChat();
+
+    await user.click(await screen.findByRole("combobox", { name: "Server" }));
+    await user.click(await screen.findByRole("option", { name: /Research/ }));
+    await settled();
+    await user.click(screen.getByRole("combobox", { name: "Tool" }));
+    await waitFor(() =>
+      expect(screen.getAllByRole("option").map((option) => option.textContent)).toEqual(["search", "fetch"]),
+    );
+    await user.click(screen.getByRole("option", { name: "fetch" }));
+    await user.click(screen.getByRole("button", { name: "Send message" }));
+
+    await waitFor(() => expect(callMCPTool).toHaveBeenCalledTimes(1));
+    expect(vi.mocked(callMCPTool).mock.calls[0]?.slice(1, 4)).toEqual(["srv-b", "fetch", {}]);
+  });
+
+  it("says the tools could not be loaded when the server's tool list fails", async () => {
+    const user = userEvent.setup();
+    vi.mocked(fetchMCPServers).mockResolvedValue([{ server_id: "srv-1", alias: "docs" }]);
+    vi.mocked(listMCPTools).mockResolvedValue({ error: "server unreachable" });
+    preload({ endpointType: "mcp", selectedMCPServers: JSON.stringify(["srv-1"]) });
+    renderChat();
+
+    await settled();
+    await user.click(screen.getByRole("combobox", { name: "Tool" }));
+
+    expect(await screen.findByText("Unable to load tools for this server")).toBeInTheDocument();
+  });
+
+  it("keeps the saved MCP selection when the toolset list cannot be fetched", async () => {
+    const user = userEvent.setup();
+    chatRequest.mockImplementation(replyWith("Hi there"));
+    vi.mocked(fetchMCPServers).mockResolvedValue([{ server_id: "srv-1", alias: "docs" }]);
+    vi.mocked(fetchMCPToolsets).mockRejectedValue(new Error("database not connected"));
+    preload({ selectedModel: "gpt-fast", selectedMCPServers: JSON.stringify(["srv-1", "srv-gone"]) });
+    renderChat();
+
+    await waitFor(() => expect(fetchMCPToolsets).toHaveBeenCalled());
+    await settled();
+    await send(user, "hello");
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalledTimes(1));
+    expect((chatRequest.mock.calls[0] as ChatArgs)[13]).toEqual(["srv-1", "srv-gone"]);
+  });
+
+  it("drops a saved model that is missing from an already loaded model list", async () => {
+    const first = renderChat();
+    await waitFor(() => expect(fetchAvailableModels).toHaveBeenCalled());
+    await settled();
+    first.unmount();
+    sessionStorage.setItem("selectedModel", "retired-model");
+
+    renderChat();
+
+    await waitFor(() => expect(screen.getByRole("combobox", { name: "Model" })).toHaveTextContent("Select a model"));
+    expect(fetchAvailableModels).toHaveBeenCalledTimes(1);
+  });
+
+  it("drops a request that is still running when a new chat starts", async () => {
+    const user = userEvent.setup();
+    const first = deferred();
+    chatRequest.mockImplementationOnce(async (...args: ChatArgs) => {
+      await first.promise;
+      args[1]("late reply", args[2]);
+    });
+    preload({ selectedModel: "gpt-fast" });
+    renderChat();
+
+    await send(user, "first");
+    expect(await screen.findByRole("button", { name: "Stop" })).toBeInTheDocument();
+    await user.click(screen.getByRole("button", { name: "New chat" }));
+    await act(async () => {
+      first.release();
+      await chatRequest.mock.results[0]?.value;
+    });
+
+    expect(chatRequest).toHaveBeenCalledTimes(1);
+    expect(screen.queryByRole("button", { name: "Stop" })).not.toBeInTheDocument();
+    expect(screen.queryByText("late reply")).not.toBeInTheDocument();
+  });
+
+  it("keeps a stopped request's response id out of the next request", async () => {
+    const user = userEvent.setup();
+    const first = deferred();
+    responsesRequest
+      .mockImplementationOnce(async (...args: ResponsesArgs) => {
+        await first.promise;
+        args[15]?.("resp-stopped");
+      })
+      .mockImplementationOnce(async (...args: ResponsesArgs) => {
+        args[15]?.("resp-fresh");
+        args[1]("assistant", "fresh reply", args[2]);
+      })
+      .mockImplementationOnce(async (...args: ResponsesArgs) => {
+        args[1]("assistant", "third reply", args[2]);
+      });
+    preload({ endpointType: "responses", selectedModel: "gpt-fast", useApiSessionManagement: "true" });
+    renderChat();
+
+    await send(user, "first");
+    await user.click(await screen.findByRole("button", { name: "Stop" }));
+    await send(user, "second");
+    expect(await screen.findByText("fresh reply")).toBeInTheDocument();
+    await act(async () => {
+      first.release();
+      await responsesRequest.mock.results[0]?.value;
+    });
+    await send(user, "third");
+
+    await waitFor(() => expect(responsesRequest).toHaveBeenCalledTimes(3));
+    expect((responsesRequest.mock.calls[2] as ResponsesArgs)[14]).toBe("resp-fresh");
+  });
+
+  it("ignores a stopped request that finishes after a newer one started", async () => {
+    const user = userEvent.setup();
+    const first = deferred();
+    const second = deferred();
+    chatRequest
+      .mockImplementationOnce(async (...args: ChatArgs) => {
+        await first.promise;
+        args[1]("late reply", args[2]);
+      })
+      .mockImplementationOnce(async (...args: ChatArgs) => {
+        await second.promise;
+        args[1]("fresh reply", args[2]);
+      });
+    preload({ selectedModel: "gpt-fast" });
+    renderChat();
+
+    await send(user, "first");
+    await user.click(await screen.findByRole("button", { name: "Stop" }));
+    await send(user, "second");
+    first.release();
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalledTimes(2));
+    expect(screen.getByRole("button", { name: "Stop" })).toBeInTheDocument();
+    expect(screen.queryByText("late reply")).not.toBeInTheDocument();
+    second.release();
+    expect(await screen.findByText("fresh reply")).toBeInTheDocument();
+    expect(screen.queryByText("late reply")).not.toBeInTheDocument();
+  });
+
+  it("only says no guardrails ran when the gateway reported its headers", async () => {
+    const user = userEvent.setup();
+    vi.stubGlobal("matchMedia", (query: string) => ({
+      matches: true,
+      media: query,
+      addEventListener: () => undefined,
+      removeEventListener: () => undefined,
+    }));
+    chatRequest
+      .mockImplementationOnce(replyWith("unreported reply"))
+      .mockImplementationOnce(async (...args: ChatArgs) => {
+        args[27]?.(new Headers({ "x-litellm-call-id": "call-reported" }));
+        args[1]("reported reply", args[2]);
+      });
+    preload({ selectedModel: "gpt-fast", selectedGuardrails: JSON.stringify(["pii-mask"]) });
+    renderChat();
+
+    await send(user, "first");
+    expect(await screen.findByText("unreported reply")).toBeInTheDocument();
+    expect(screen.getByText("This endpoint does not report which guardrails or policies ran")).toBeInTheDocument();
+    expect(screen.queryByText("No guardrails or policies ran on this request")).not.toBeInTheDocument();
+
+    await send(user, "second");
+    expect(await screen.findByText("call-reported")).toBeInTheDocument();
+    expect(screen.getByText("No guardrails or policies ran on this request")).toBeInTheDocument();
+  });
+
+  it("does not claim policies were skipped when the gateway's own headers are hidden", async () => {
+    const user = userEvent.setup();
+    vi.stubGlobal("matchMedia", (query: string) => ({
+      matches: true,
+      media: query,
+      addEventListener: () => undefined,
+      removeEventListener: () => undefined,
+    }));
+    chatRequest.mockImplementationOnce(async (...args: ChatArgs) => {
+      args[27]?.(new Headers({ "content-type": "application/json" }));
+      args[1]("cross-origin reply", args[2]);
+    });
+    preload({ selectedModel: "gpt-fast" });
+    renderChat();
+
+    await send(user, "hello");
+    expect(await screen.findByText("cross-origin reply")).toBeInTheDocument();
+    expect(
+      screen.getByText("Policies are only reported when the dashboard is opened from the proxy"),
+    ).toBeInTheDocument();
+    expect(screen.queryByText(/policies ran on this request/)).not.toBeInTheDocument();
+  });
+
+  it("keeps a stopped request's gateway details off the newer reply", async () => {
+    const user = userEvent.setup();
+    vi.stubGlobal("matchMedia", (query: string) => ({
+      matches: true,
+      media: query,
+      addEventListener: () => undefined,
+      removeEventListener: () => undefined,
+    }));
+    const first = deferred();
+    chatRequest
+      .mockImplementationOnce(async (...args: ChatArgs) => {
+        args[27]?.(new Headers({ "x-litellm-call-id": "call-stopped" }));
+        await first.promise;
+      })
+      .mockImplementationOnce(async (...args: ChatArgs) => {
+        args[27]?.(new Headers({ "x-litellm-call-id": "call-fresh" }));
+        args[1]("fresh reply", args[2]);
+      });
+    preload({ selectedModel: "gpt-fast" });
+    renderChat();
+
+    await send(user, "first");
+    await user.click(await screen.findByRole("button", { name: "Stop" }));
+    await send(user, "second");
+    expect(await screen.findByText("call-fresh")).toBeInTheDocument();
+    await act(async () => {
+      first.release();
+      await chatRequest.mock.results[0]?.value;
+    });
+
+    expect(screen.queryByRole("button", { name: "Stop" })).not.toBeInTheDocument();
+    expect(screen.getByText("call-fresh")).toBeInTheDocument();
+    expect(screen.queryByText("call-stopped")).not.toBeInTheDocument();
+  });
+
+  it("sends once when Enter is pressed twice before the first request starts", async () => {
+    const user = userEvent.setup();
+    const first = deferred();
+    chatRequest.mockImplementation(async (...args: ChatArgs) => {
+      await first.promise;
+      args[1]("Hi there", args[2]);
+    });
+    preload({ selectedModel: "gpt-fast" });
+    renderChat();
+
+    const message = screen.getByRole("textbox", { name: "Message" });
+    await user.type(message, "hello");
+    fireEvent.keyDown(message, { key: "Enter" });
+    fireEvent.keyDown(message, { key: "Enter" });
+
+    await waitFor(() => expect(chatRequest).toHaveBeenCalled());
+    await act(async () => {
+      first.release();
+      await chatRequest.mock.results[0]?.value;
+    });
+    expect(chatRequest).toHaveBeenCalledTimes(1);
+    expect(screen.getAllByText("hello")).toHaveLength(1);
+  });
+
+  it("drops a chat attachment when the endpoint cannot use it", async () => {
+    const user = userEvent.setup();
+    preload({ selectedModel: "gpt-fast" });
+    renderChat();
+
+    fireEvent.drop(screen.getByRole("textbox", { name: "Message" }), {
+      dataTransfer: { files: [new File(["%PDF"], "notes.pdf", { type: "application/pdf" })] },
+    });
+    expect(await screen.findByRole("button", { name: "Remove notes.pdf" })).toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: "Endpoint" }));
+    await user.click(await screen.findByRole("menuitemradio", { name: "/v1/audio/transcriptions" }));
+
+    await waitFor(() =>
+      expect(screen.getByRole("button", { name: "Endpoint" })).toHaveTextContent("audio/transcriptions"),
+    );
+    expect(screen.queryByRole("button", { name: "Remove notes.pdf" })).not.toBeInTheDocument();
+  });
+
+  it("keeps a stopped request's code output off the newer reply", async () => {
+    const user = userEvent.setup();
+    const first = deferred();
+    responsesRequest
+      .mockImplementationOnce(async (...args: ResponsesArgs) => {
+        await first.promise;
+        args[18]?.({ code: "print('stopped run')", containerId: "c-1", annotations: [] });
+      })
+      .mockImplementationOnce(async (...args: ResponsesArgs) => {
+        args[1]("assistant", "fresh reply", args[2]);
+      });
+    preload({ endpointType: "responses", selectedModel: "gpt-fast" });
+    renderChat();
+
+    await send(user, "first");
+    await user.click(await screen.findByRole("button", { name: "Stop" }));
+    await send(user, "second");
+    expect(await screen.findByText("fresh reply")).toBeInTheDocument();
+    await act(async () => {
+      first.release();
+      await responsesRequest.mock.results[0]?.value;
+    });
+
+    expect(screen.queryByText("Python Code Executed")).not.toBeInTheDocument();
+  });
+
+  it("lets a user connect a key for a BYOK server picked for a direct tool call", async () => {
+    const user = userEvent.setup();
+    vi.mocked(fetchMCPServers).mockResolvedValue([
+      { server_id: "srv-byok", alias: "Linear", is_byok: true, has_user_credential: false },
+    ]);
+    preload({ endpointType: "mcp", selectedMCPServers: JSON.stringify(["srv-byok"]) });
+    renderChat();
+
+    await user.click(await screen.findByRole("button", { name: "Connect key" }));
+    await user.type(await screen.findByLabelText("Linear API key"), "lin-key-1");
+    await user.click(screen.getByRole("button", { name: "Connect" }));
+
+    await waitFor(() => expect(credentialPost).toHaveBeenCalledTimes(1));
+    expect(credentialPost.mock.calls[0]?.[1]).toMatchObject({
+      params: { path: { server_id: "srv-byok" } },
+      body: { credential: "lin-key-1" },
+    });
+    await waitFor(() => expect(fetchMCPServers).toHaveBeenCalledTimes(2));
+  });
+
+  it("lets a user replace the key of a connected BYOK server whose tools fail to load", async () => {
+    const user = userEvent.setup();
+    vi.mocked(fetchMCPServers).mockResolvedValue([
+      { server_id: "srv-byok", alias: "Linear", is_byok: true, has_user_credential: true },
+    ]);
+    vi.mocked(listMCPTools).mockResolvedValue({ error: "401 from upstream" });
+    preload({ selectedModel: "gpt-fast", selectedMCPServers: JSON.stringify(["srv-byok"]) });
+    renderChat();
+
+    await settled();
+    await user.click(screen.getByRole("button", { name: "MCP" }));
+    await user.click(await screen.findByRole("button", { name: "Replace key" }));
+    await user.type(await screen.findByLabelText("Linear API key"), "lin-key-2");
+    await user.click(screen.getByRole("button", { name: "Connect" }));
+
+    await waitFor(() => expect(credentialPost).toHaveBeenCalledTimes(1));
+    expect(credentialPost.mock.calls[0]?.[1]).toMatchObject({ body: { credential: "lin-key-2" } });
+    await waitFor(() =>
+      expect(vi.mocked(listMCPTools).mock.calls.filter(([, server]) => server === "srv-byok").length).toBeGreaterThan(
+        1,
+      ),
+    );
+  });
+
+  it("leaves replace-key mode on cancel or when the MCP dialog closes", async () => {
+    const user = userEvent.setup();
+    vi.mocked(fetchMCPServers).mockResolvedValue([
+      { server_id: "srv-byok", alias: "Linear", is_byok: true, has_user_credential: true },
+    ]);
+    vi.mocked(listMCPTools).mockResolvedValue({ error: "401 from upstream" });
+    preload({ selectedModel: "gpt-fast", selectedMCPServers: JSON.stringify(["srv-byok"]) });
+    renderChat();
+
+    await settled();
+    await user.click(screen.getByRole("button", { name: "MCP" }));
+    await user.click(await screen.findByRole("button", { name: "Replace key" }));
+    expect(await screen.findByLabelText("Linear API key")).toBeInTheDocument();
+    await user.click(screen.getByRole("button", { name: "Cancel" }));
+    expect(screen.queryByLabelText("Linear API key")).not.toBeInTheDocument();
+
+    await user.click(screen.getByRole("button", { name: "Replace key" }));
+    expect(await screen.findByLabelText("Linear API key")).toBeInTheDocument();
+    await user.keyboard("{Escape}");
+    await waitFor(() => expect(screen.queryByLabelText("Linear API key")).not.toBeInTheDocument());
+    await user.click(screen.getByRole("button", { name: "MCP" }));
+
+    expect(await screen.findByRole("button", { name: "Replace key" })).toBeInTheDocument();
+    expect(screen.queryByLabelText("Linear API key")).not.toBeInTheDocument();
+    expect(credentialPost).not.toHaveBeenCalled();
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/PlaygroundChat.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/PlaygroundChat.tsx
new file mode 100644
index 00000000000..5b2de80315d
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/PlaygroundChat.tsx
@@ -0,0 +1,489 @@
+"use client";
+
+import { useRef, useState } from "react";
+import { ChevronDown, PanelRight, RotateCcw, SquarePen } from "lucide-react";
+import useCan from "@/app/(dashboard)/hooks/useCan";
+import { generateCodeSnippet } from "@/components/chat_ui/CodeSnippets";
+import { EndpointType, getEndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import type { MessageType } from "@/components/chat_ui/types";
+import type { ModelGroup } from "@/components/llm_calls/fetch_models";
+import { customHeadersFromPairs } from "@/components/llm_calls/request_headers";
+import type { MCPToolArgumentsFormRef } from "@/components/mcp_tools/MCPToolArgumentsForm";
+import type { MCPServer, MCPTool, MCPToolset } from "@/components/mcp_tools/types";
+import { Button } from "@/components/ui/button";
+import { ButtonGroup } from "@/components/ui/button-group";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from "@/components/ui/dropdown-menu";
+import { Sheet, SheetContent, SheetTitle } from "@/components/ui/sheet";
+import { toast } from "@/lib/toast";
+import { useChatHistory } from "../../hooks/useChatHistory";
+import { useCodeInterpreter } from "../../hooks/useCodeInterpreter";
+import { filterModelsForEndpoint, isModelCompatibleWithEndpoint } from "../chat_ui/EndpointUtils";
+import RealtimePlayground from "../chat_ui/RealtimePlayground";
+import { Composer } from "./Composer";
+import { EndpointMenu, VoiceMenu } from "./ComposerControls";
+import { Conversation, formatCost } from "./Conversation";
+import { capabilitiesFor, CODE_INTERPRETER_SUGGESTIONS, SUGGESTIONS } from "./endpointCapabilities";
+import { InspectorPanel, type CodeSdk } from "./Inspector";
+import { ByokKeyButton } from "./ByokConnect";
+import { McpDialog, serverName } from "./McpDialog";
+import { TargetPicker, type OptionGroup } from "./Pickers";
+import { TOOLSET_PREFIX, withEndpoint, withReachableMcp } from "./playgroundSettings";
+import { SettingsPopover } from "./SettingsPopover";
+import {
+  useGuardrailOptions,
+  useMcpCatalog,
+  usePlaygroundAgents,
+  usePlaygroundModels,
+  usePolicyOptions,
+  useServerTools,
+  useTagOptions,
+  useVectorStoreOptions,
+  type PickerOption,
+  type ServerTools,
+} from "./usePlaygroundCatalog";
+import { usePlaygroundSend, type SendDeps } from "./usePlaygroundSend";
+import { usePlaygroundSettings } from "./usePlaygroundSettings";
+import { useIsWide } from "./useIsWide";
+
+export type ProxySettings = Readonly<{ PROXY_BASE_URL?: string; LITELLM_UI_API_DOC_BASE_URL?: string | null }>;
+
+const POLICY_PREFIX = "policy:";
+
+const providerOf = (model: ModelGroup): string => model.providers?.[0] ?? "other";
+
+const modelGroups = (models: readonly ModelGroup[]): readonly OptionGroup[] =>
+  [...new Set(models.map(providerOf))].sort().map((provider) => ({
+    label: provider,
+    options: models
+      .filter((model) => providerOf(model) === provider)
+      .map((model) => ({ value: model.model_group, label: model.model_group })),
+  }));
+
+const modelEmptyText = (failed: boolean, hasKey: boolean): string => {
+  if (failed) return "Unable to load models for this key";
+  if (!hasKey) return "Enter a virtual key to load models";
+  return "No models available for this endpoint";
+};
+
+const reachableMcp = (servers: readonly MCPServer[], toolsets: readonly MCPToolset[]): ReadonlySet<string> =>
+  new Set([
+    ...servers.map((server) => server.server_id),
+    ...toolsets.map((toolset) => `${TOOLSET_PREFIX}${toolset.toolset_id}`),
+  ]);
+
+const toolsetFor = (selection: string | null, toolsets: readonly MCPToolset[]): MCPToolset | null =>
+  toolsets.find((toolset) => `${TOOLSET_PREFIX}${toolset.toolset_id}` === selection) ?? null;
+
+const backingServers = (selection: string | null, toolset: MCPToolset | null): readonly string[] => {
+  if (toolset) return [...new Set(toolset.tools.map((tool) => tool.server_id))];
+  return selection && !selection.startsWith(TOOLSET_PREFIX) ? [selection] : [];
+};
+
+type DirectTarget = Readonly<{ server: string; tool: MCPTool }>;
+
+const toolsetTargets = (toolset: MCPToolset, loaded: Readonly<Record<string, ServerTools>>): DirectTarget[] =>
+  toolset.tools
+    .flatMap((entry) => {
+      const tool = loaded[entry.server_id]?.tools.find((candidate) => candidate.name === entry.tool_name);
+      return tool ? [{ server: entry.server_id, tool }] : [];
+    })
+    .filter((target, index, targets) => targets.findIndex((other) => other.tool.name === target.tool.name) === index);
+
+const directTargets = (
+  servers: readonly string[],
+  toolset: MCPToolset | null,
+  loaded: Readonly<Record<string, ServerTools>>,
+): readonly DirectTarget[] => {
+  if (toolset) return toolsetTargets(toolset, loaded);
+  return servers.flatMap((server) => (loaded[server]?.tools ?? []).map((tool) => ({ server, tool })));
+};
+
+const prefixed = (options: readonly PickerOption[]): readonly PickerOption[] =>
+  options.map((option) => ({ ...option, value: `${POLICY_PREFIX}${option.value}` }));
+
+const lastTracedReply = (messages: readonly MessageType[]): number =>
+  messages.findLastIndex((message) => message.role === "assistant" && message.trace !== undefined);
+
+const totalCost = (messages: readonly MessageType[]): number =>
+  messages.reduce((sum, message) => sum + (message.usage?.cost ?? message.trace?.cost ?? 0), 0);
+
+const conversationSummary = (messages: readonly MessageType[]): string => {
+  const requests = messages.filter((message) => message.role === "user").length;
+  if (requests === 0) return "New chat";
+  const label = requests === 1 ? "1 request" : `${requests} requests`;
+  const cost = totalCost(messages);
+  return cost > 0 ? `${label}, ${formatCost(cost)}` : label;
+};
+
+export function PlaygroundChat({
+  accessToken,
+  disabledPersonalKeyCreation,
+  proxySettings,
+}: {
+  accessToken: string | null;
+  disabledPersonalKeyCreation: boolean;
+  proxySettings: ProxySettings | undefined;
+}) {
+  const { settings: stored, update, reset } = usePlaygroundSettings(disabledPersonalKeyCreation);
+  const canViewPolicies = useCan("viewPolicies");
+  const apiKey = (stored.keySource === "session" ? accessToken : stored.virtualKey.trim()) || null;
+  const mcp = useMcpCatalog(apiKey);
+  const settings = withReachableMcp(stored, mcp.isReady ? reachableMcp(mcp.servers, mcp.toolsets) : null);
+  const capabilities = capabilitiesFor(settings.endpoint);
+  const chat = useChatHistory({ simplified: false });
+  const codeInterpreter = useCodeInterpreter();
+  const toolArgsForm = useRef<MCPToolArgumentsFormRef | null>(null);
+  const [inspected, setInspected] = useState<number | null>(null);
+  const [sheetOpen, setSheetOpen] = useState(false);
+  const isWide = useIsWide();
+
+  const models = usePlaygroundModels(apiKey);
+  const [checkedModels, setCheckedModels] = useState<readonly ModelGroup[] | undefined>(undefined);
+  if (models.data && models.data !== checkedModels) {
+    setCheckedModels(models.data);
+    const loaded = models.data;
+    update((current) =>
+      current.model && !loaded.some((option) => option.model_group === current.model)
+        ? { ...current, model: null }
+        : current,
+    );
+  }
+  const agents = usePlaygroundAgents(apiKey, settings.proxyBaseUrl, settings.endpoint === EndpointType.A2A_AGENTS);
+  const guardrails = useGuardrailOptions(accessToken);
+  const policies = usePolicyOptions(accessToken, canViewPolicies);
+  const vectorStores = useVectorStoreOptions(accessToken);
+  const tags = useTagOptions(accessToken);
+
+  const directSelection = settings.endpoint === EndpointType.MCP ? settings.mcpSelection[0] ?? null : null;
+  const directToolset = toolsetFor(directSelection, mcp.toolsets);
+  const directServers = backingServers(directSelection, directToolset);
+  const directServerTools = useServerTools(apiKey, directServers);
+  const directByok = directToolset ? undefined : mcp.servers.find((server) => server.server_id === directSelection);
+  const targets = directTargets(directServers, directToolset, directServerTools);
+  const directTarget = targets.find((target) => target.tool.name === settings.directTool) ?? null;
+  const directTool = directTarget?.tool ?? null;
+  const toolsFailed = directServers.some((server) => directServerTools[server]?.failed);
+  const customHeaders = customHeadersFromPairs(settings.headerPairs);
+
+  const sendDeps: SendDeps = {
+    settings,
+    capabilities,
+    apiKey,
+    signedIn: Boolean(accessToken),
+    customHeaders,
+    mcpServers: mcp.servers,
+    mcpToolsets: mcp.toolsets,
+    directCall: () => (directTarget ? { serverId: directTarget.server, tool: directTarget.tool.name } : null),
+    toolArgsForm,
+    chat,
+    codeInterpreter,
+  };
+  const draft = usePlaygroundSend(sendDeps);
+
+  const messages = chat.chatHistory;
+  const inspectedIndex = inspected ?? lastTracedReply(messages);
+  const inspectedMessage = inspectedIndex >= 0 ? messages[inspectedIndex] ?? null : null;
+  const modelList = models.data ?? [];
+
+  const selectModel = (model: string) => {
+    const info = modelList.find((option) => option.model_group === model);
+    const switchTo =
+      info?.mode && !isModelCompatibleWithEndpoint(info, settings.endpoint) ? getEndpointType(info.mode) : null;
+    update((current) => ({ ...(switchTo ? withEndpoint(current, switchTo) : current), model }));
+  };
+
+  const inspect = (index: number) => {
+    setInspected(index);
+    if (!isWide) setSheetOpen(true);
+  };
+
+  const clearChat = () => {
+    chat.clearChatHistory();
+    draft.clearDraft();
+    codeInterpreter.clearResult();
+    setInspected(null);
+  };
+
+  const newChat = () => {
+    clearChat();
+    toast.success("Chat history cleared.");
+  };
+
+  const resetAll = () => {
+    clearChat();
+    reset();
+    toast.success("Chat and settings reset");
+  };
+
+  const code = (sdk: CodeSdk): string => {
+    const snippet: Parameters<typeof generateCodeSnippet>[0] = {
+      apiKeySource: "custom",
+      accessToken: null,
+      apiKey: "",
+      inputMessage: draft.text,
+      chatHistory: messages,
+      selectedTags: [...settings.tags],
+      selectedVectorStores: [...settings.vectorStores],
+      selectedGuardrails: [...settings.guardrails],
+      selectedPolicies: [...settings.policies],
+      selectedMCPServers: [...settings.mcpSelection],
+      mcpServers: [...mcp.servers],
+      mcpServerToolRestrictions: Object.fromEntries(
+        Object.entries(settings.toolLimits).map(([server, tools]) => [server, [...tools]]),
+      ),
+      endpointType: settings.endpoint,
+      selectedModel: settings.model ?? undefined,
+      selectedSdk: sdk,
+      selectedVoice: settings.voice,
+      proxySettings,
+      customHeaders,
+    };
+    return generateCodeSnippet(snippet);
+  };
+
+  const targetRow = (
+    <>
+      {capabilities.target === "model" && (
+        <TargetPicker
+          label="Model"
+          placeholder="Select a model"
+          groups={modelGroups(filterModelsForEndpoint([...modelList], settings.endpoint))}
+          value={settings.model}
+          onValueChange={selectModel}
+          isLoading={models.isLoading}
+          emptyText={modelEmptyText(models.isError, Boolean(apiKey))}
+          allowCustom
+        />
+      )}
+      {capabilities.target === "agent" && (
+        <TargetPicker
+          label="Agent"
+          placeholder="Select an agent"
+          groups={[
+            {
+              label: "Agents",
+              options: (agents.data ?? []).map((agent) => ({
+                value: agent.agent_name,
+                label: agent.agent_name || agent.agent_id,
+                description: agent.agent_card_params?.description,
+              })),
+            },
+          ]}
+          value={settings.agent}
+          onValueChange={(agent) => update({ agent })}
+          isLoading={agents.isLoading}
+          emptyText="No agents available for this key"
+        />
+      )}
+      {capabilities.target === "mcpTool" && (
+        <>
+          <TargetPicker
+            label="Server"
+            placeholder="Select an MCP server"
+            groups={[
+              {
+                label: "MCP servers",
+                options: mcp.servers.map((server) => ({ value: server.server_id, label: serverName(server) })),
+              },
+              {
+                label: "Toolsets",
+                options: mcp.toolsets.map((toolset) => ({
+                  value: `${TOOLSET_PREFIX}${toolset.toolset_id}`,
+                  label: toolset.toolset_name,
+                  description: toolset.description,
+                })),
+              },
+            ]}
+            value={directSelection}
+            onValueChange={(server) => update({ mcpSelection: [server], directTool: null })}
+            isLoading={mcp.isLoading}
+            emptyText="No MCP servers available for this key"
+          />
+          {directByok?.is_byok && (
+            <ByokKeyButton server={directByok} name={serverName(directByok)} onConnected={mcp.refreshCredentials} />
+          )}
+          {directSelection && (
+            <TargetPicker
+              label="Tool"
+              placeholder="Select a tool"
+              groups={[
+                {
+                  label: "Tools",
+                  options: targets.map(({ tool }) => ({
+                    value: tool.name,
+                    label: tool.name,
+                    description: tool.description,
+                  })),
+                },
+              ]}
+              value={settings.directTool}
+              onValueChange={(tool) => update({ directTool: tool })}
+              isLoading={directServers.some((server) => directServerTools[server]?.isLoading)}
+              emptyText={toolsFailed ? "Unable to load tools for this server" : "This server has no tools"}
+            />
+          )}
+        </>
+      )}
+      <EndpointMenu
+        value={settings.endpoint}
+        onValueChange={(endpoint) => update((current) => withEndpoint(current, endpoint))}
+      />
+      {capabilities.voice && <VoiceMenu value={settings.voice} onValueChange={(voice) => update({ voice })} />}
+    </>
+  );
+
+  const guardrailGroups: readonly OptionGroup[] = [
+    { label: "Guardrails", options: guardrails.data ?? [] },
+    ...(canViewPolicies ? [{ label: "Policies", options: prefixed(policies.data ?? []) }] : []),
+  ];
+
+  const composer = (
+    <Composer
+      capabilities={capabilities}
+      endpoint={settings.endpoint}
+      targetRow={targetRow}
+      draft={draft}
+      directTool={directTool}
+      toolArgsForm={toolArgsForm}
+      mcpControl={
+        <McpDialog
+          requestKey={apiKey}
+          servers={mcp.servers}
+          toolsets={mcp.toolsets}
+          isLoading={mcp.isLoading}
+          selection={settings.mcpSelection}
+          toolLimits={settings.toolLimits}
+          onChange={(mcpSelection, toolLimits) => update({ mcpSelection, toolLimits })}
+          onCredentialSaved={mcp.refreshCredentials}
+        />
+      }
+      vectorStores={{
+        groups: [{ label: "Vector stores", options: vectorStores.data ?? [] }],
+        value: settings.vectorStores,
+        onValueChange: (value) => update({ vectorStores: value }),
+        isLoading: vectorStores.isLoading,
+      }}
+      guardrails={{
+        groups: guardrailGroups,
+        value: [...settings.guardrails, ...settings.policies.map((policy) => `${POLICY_PREFIX}${policy}`)],
+        onValueChange: (value) =>
+          update({
+            guardrails: value.filter((item) => !item.startsWith(POLICY_PREFIX)),
+            policies: value
+              .filter((item) => item.startsWith(POLICY_PREFIX))
+              .map((item) => item.slice(POLICY_PREFIX.length)),
+          }),
+        isLoading: guardrails.isLoading || policies.isLoading,
+      }}
+      codeInterpreter={{ enabled: codeInterpreter.enabled, onToggle: codeInterpreter.setEnabled }}
+      settingsControl={
+        <SettingsPopover
+          settings={settings}
+          update={update}
+          capabilities={capabilities}
+          keysDisabled={disabledPersonalKeyCreation}
+          tagOptions={tags.data ?? []}
+          suggestedBaseUrl={proxySettings?.LITELLM_UI_API_DOC_BASE_URL ?? proxySettings?.PROXY_BASE_URL ?? null}
+          sessions={{
+            enabled: chat.useApiSessionManagement,
+            responseId: chat.responsesSessionId,
+            onToggle: chat.handleToggleSessionManagement,
+          }}
+        />
+      }
+      sendDisabled={draft.isLoading}
+    />
+  );
+
+  const suggestions =
+    settings.endpoint === EndpointType.RESPONSES && codeInterpreter.enabled
+      ? CODE_INTERPRETER_SUGGESTIONS
+      : SUGGESTIONS[settings.endpoint] ?? [];
+
+  const inspector = <InspectorPanel message={inspectedMessage} code={code} />;
+
+  return (
+    <div className="flex min-h-0 flex-1">
+      <div className="flex min-h-0 min-w-0 flex-1 flex-col">
+        <div className="flex h-12 shrink-0 items-center gap-2 border-b border-border px-4">
+          <span className="text-xs text-muted-foreground tabular-nums">{conversationSummary(messages)}</span>
+          <span className="ml-auto flex items-center gap-2">
+            {!isWide && (
+              <Button variant="outline" size="sm" onClick={() => setSheetOpen(true)}>
+                <PanelRight />
+                Inspector
+              </Button>
+            )}
+            <ButtonGroup>
+              <Button variant="outline" size="sm" onClick={newChat}>
+                <SquarePen />
+                New chat
+              </Button>
+              <DropdownMenu>
+                <DropdownMenuTrigger
+                  render={<Button variant="outline" size="icon-sm" aria-label="More chat actions" />}
+                >
+                  <ChevronDown />
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="end" className="w-64">
+                  <DropdownMenuItem onClick={newChat}>
+                    <SquarePen />
+                    New chat, keep settings
+                  </DropdownMenuItem>
+                  <DropdownMenuItem onClick={resetAll}>
+                    <RotateCcw />
+                    Reset chat and settings
+                  </DropdownMenuItem>
+                </DropdownMenuContent>
+              </DropdownMenu>
+            </ButtonGroup>
+          </span>
+        </div>
+        {settings.endpoint === EndpointType.REALTIME ? (
+          <div className="flex min-h-0 flex-1 flex-col">
+            <RealtimePlayground
+              accessToken={apiKey ?? ""}
+              selectedModel={settings.model ?? ""}
+              customProxyBaseUrl={settings.proxyBaseUrl || undefined}
+              selectedGuardrails={settings.guardrails.length > 0 ? [...settings.guardrails] : undefined}
+            />
+          </div>
+        ) : (
+          <Conversation
+            messages={messages}
+            isLoading={draft.isLoading}
+            waitingFor={messages.at(-1)?.model}
+            extras={{
+              endpoint: settings.endpoint,
+              mcpEvents: chat.mcpEvents,
+              codeInterpreter: codeInterpreter.result,
+              accessToken: apiKey ?? "",
+            }}
+            inspectedIndex={inspectedIndex}
+            onInspect={inspect}
+            suggestions={suggestions}
+            onPickSuggestion={draft.setText}
+          />
+        )}
+        <div className="mx-auto w-full max-w-3xl px-6 pb-6">{composer}</div>
+      </div>
+      {isWide ? (
+        <aside aria-label="Inspector" className="flex w-96 shrink-0 flex-col border-l border-border">
+          {inspector}
+        </aside>
+      ) : (
+        <Sheet open={sheetOpen} onOpenChange={setSheetOpen}>
+          <SheetContent side="right" className="w-96 gap-0 p-0" showCloseButton={false}>
+            <SheetTitle className="sr-only">Inspector</SheetTitle>
+            {inspector}
+          </SheetContent>
+        </Sheet>
+      )}
+    </div>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ReplyContent.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ReplyContent.tsx
new file mode 100644
index 00000000000..5733ede7168
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/ReplyContent.tsx
@@ -0,0 +1,92 @@
+"use client";
+
+import ReactMarkdown from "react-markdown";
+import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
+import { coy } from "react-syntax-highlighter/dist/esm/styles/prism";
+import remarkGfm from "remark-gfm";
+import type { MessageType } from "@/components/chat_ui/types";
+import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
+import { useSyntaxTheme } from "@/hooks/useSyntaxTheme";
+import AudioRenderer from "../chat_ui/AudioRenderer";
+
+const textOf = (message: MessageType): string => (typeof message.content === "string" ? message.content : "");
+
+function CodeBlock({ language, code }: { language: string; code: string }) {
+  const theme = useSyntaxTheme(coy);
+  return (
+    <SyntaxHighlighter
+      style={theme}
+      language={language}
+      PreTag="div"
+      customStyle={{ margin: 0, fontSize: "0.75rem" }}
+      className="my-2 overflow-x-auto rounded-lg border border-border"
+    >
+      {code}
+    </SyntaxHighlighter>
+  );
+}
+
+export function Markdown({ children }: { children: string }) {
+  return (
+    <ReactMarkdown
+      remarkPlugins={[remarkGfm]}
+      components={{
+        p: ({ node: _node, ...props }) => <p className="my-2 first:mt-0 last:mb-0" {...props} />,
+        ul: ({ node: _node, ...props }) => <ul className="my-2 list-disc space-y-1 pl-5" {...props} />,
+        ol: ({ node: _node, ...props }) => <ol className="my-2 list-decimal space-y-1 pl-5" {...props} />,
+        a: ({ node: _node, ...props }) => (
+          <a className="underline underline-offset-3" target="_blank" rel="noreferrer" {...props} />
+        ),
+        pre: ({ node: _node, children }) => <>{children}</>,
+        code: ({ node: _node, className, children, ...props }) => {
+          const language = /language-(\w+)/.exec(className ?? "")?.[1];
+          const code = String(children).replace(/\n$/, "");
+          if (language || code.includes("\n")) return <CodeBlock language={language ?? "text"} code={code} />;
+          return (
+            <code className="rounded-sm bg-muted px-1 py-0.5 font-mono text-xs" {...props}>
+              {children}
+            </code>
+          );
+        },
+        table: ({ node: _node, ...props }) => (
+          <div className="my-2 rounded-lg border border-border">
+            <Table {...props} />
+          </div>
+        ),
+        thead: ({ node: _node, ...props }) => <TableHeader {...props} />,
+        tbody: ({ node: _node, ...props }) => <TableBody {...props} />,
+        tr: ({ node: _node, ...props }) => <TableRow {...props} />,
+        th: ({ node: _node, ...props }) => <TableHead {...props} />,
+        td: ({ node: _node, ...props }) => <TableCell className="whitespace-normal" {...props} />,
+      }}
+    >
+      {children}
+    </ReactMarkdown>
+  );
+}
+
+function GeneratedImage({ src }: { src: string }) {
+  return <img src={src} alt="Generated image" className="max-h-[500px] max-w-full rounded-lg border border-border" />;
+}
+
+function Embeddings({ value }: { value: string }) {
+  return (
+    <ScrollArea className="max-h-64 w-full rounded-lg border border-border">
+      <pre className="p-3 font-mono text-xs leading-5 whitespace-pre">{value}</pre>
+      <ScrollBar orientation="horizontal" />
+    </ScrollArea>
+  );
+}
+
+export function ReplyBody({ message }: { message: MessageType }) {
+  if (message.isImage) return <GeneratedImage src={textOf(message)} />;
+  if (message.isAudio) return <AudioRenderer message={message} />;
+  if (message.isEmbeddings) return <Embeddings value={textOf(message)} />;
+  return (
+    <>
+      <Markdown>{textOf(message)}</Markdown>
+      {message.image && <GeneratedImage src={message.image.url} />}
+    </>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/SettingsPopover.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/SettingsPopover.tsx
new file mode 100644
index 00000000000..c3d6ef469ea
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/SettingsPopover.tsx
@@ -0,0 +1,395 @@
+"use client";
+
+import { useState } from "react";
+import { ChevronRight, Minus, Plus, SlidersHorizontal } from "lucide-react";
+import type { KeyValuePair } from "@/components/key_value_input";
+import { PasswordInput } from "@/components/shared/PasswordInput";
+import { Button } from "@/components/ui/button";
+import { ButtonGroup } from "@/components/ui/button-group";
+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible";
+import {
+  Combobox,
+  ComboboxChip,
+  ComboboxChips,
+  ComboboxChipsInput,
+  ComboboxContent,
+  ComboboxEmpty,
+  ComboboxItem,
+  ComboboxList,
+  ComboboxValue,
+  useComboboxAnchor,
+} from "@/components/ui/combobox";
+import { Field, FieldDescription, FieldGroup, FieldLabel, FieldSet } from "@/components/ui/field";
+import { Input } from "@/components/ui/input";
+import { InputGroupButton } from "@/components/ui/input-group";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { Slider } from "@/components/ui/slider";
+import { Switch } from "@/components/ui/switch";
+import type { Capabilities } from "./endpointCapabilities";
+import { CopyIconButton } from "./ModelName";
+import type { KeySource, PlaygroundSettings } from "./playgroundSettings";
+import type { SettingsUpdate } from "./usePlaygroundSettings";
+
+const KEY_SOURCES = [
+  { value: "session", label: "Current UI session" },
+  { value: "custom", label: "Virtual key" },
+];
+
+const DEFAULT_TEMPERATURE = 1;
+
+function TagField({
+  value,
+  options,
+  onChange,
+}: {
+  value: readonly string[];
+  options: readonly string[];
+  onChange: (value: readonly string[]) => void;
+}) {
+  const anchor = useComboboxAnchor();
+  const [query, setQuery] = useState("");
+  const custom = query.trim();
+  const known = [...new Set([...options, ...value])];
+  const items = custom === "" || known.includes(custom) ? known : [...known, custom];
+  return (
+    <Combobox
+      items={items}
+      multiple
+      value={[...value]}
+      onValueChange={(next: string[]) => onChange(next)}
+      inputValue={query}
+      onInputValueChange={setQuery}
+      autoHighlight
+    >
+      <ComboboxChips ref={anchor} className="min-h-8 py-1">
+        <ComboboxValue>
+          {(values: string[]) => values.map((tag) => <ComboboxChip key={tag}>{tag}</ComboboxChip>)}
+        </ComboboxValue>
+        <ComboboxChipsInput id="playground-tags" placeholder={value.length === 0 ? "Add a tag" : ""} />
+      </ComboboxChips>
+      <ComboboxContent anchor={anchor}>
+        <ComboboxEmpty>No tags yet, type one to add it</ComboboxEmpty>
+        <ComboboxList>
+          {(tag: string) => (
+            <ComboboxItem key={tag} value={tag}>
+              {known.includes(tag) ? (
+                tag
+              ) : (
+                <>
+                  <Plus />
+                  Add {tag}
+                </>
+              )}
+            </ComboboxItem>
+          )}
+        </ComboboxList>
+      </ComboboxContent>
+    </Combobox>
+  );
+}
+
+function HeaderEditor({
+  pairs,
+  onChange,
+}: {
+  pairs: readonly KeyValuePair[];
+  onChange: (pairs: readonly KeyValuePair[]) => void;
+}) {
+  const replace = (index: number, pair: KeyValuePair) => onChange(pairs.map((item, i) => (i === index ? pair : item)));
+  return (
+    <div className="flex flex-col gap-2">
+      {pairs.map(([name, value], index) => (
+        <ButtonGroup key={index} className="w-full">
+          <Input
+            aria-label="Header name"
+            value={name}
+            onChange={(event) => replace(index, [event.target.value, value])}
+            placeholder="Name"
+            className="h-8 font-mono text-xs"
+          />
+          <Input
+            aria-label="Header value"
+            value={value}
+            onChange={(event) => replace(index, [name, event.target.value])}
+            placeholder="Value"
+            className="h-8 font-mono text-xs"
+          />
+          <Button
+            variant="outline"
+            size="icon-sm"
+            aria-label={`Remove ${name || "header"}`}
+            onClick={() => onChange(pairs.filter((_, i) => i !== index))}
+          >
+            <Minus />
+          </Button>
+        </ButtonGroup>
+      ))}
+      <Button variant="ghost" size="sm" className="-ml-2 w-fit" onClick={() => onChange([...pairs, ["", ""]])}>
+        <Plus />
+        Add header
+      </Button>
+    </div>
+  );
+}
+
+function ProxyBaseUrlField({
+  value,
+  suggested,
+  onChange,
+}: {
+  value: string;
+  suggested: string | null;
+  onChange: (value: string) => void;
+}) {
+  return (
+    <Field>
+      <div className="flex items-center justify-between">
+        <FieldLabel htmlFor="playground-base-url">Proxy base URL</FieldLabel>
+        {value ? (
+          <Button variant="link" size="xs" className="h-auto p-0" onClick={() => onChange("")}>
+            Clear
+          </Button>
+        ) : (
+          suggested && (
+            <Button variant="link" size="xs" className="h-auto p-0" onClick={() => onChange(suggested)}>
+              Use {suggested}
+            </Button>
+          )
+        )}
+      </div>
+      <Input
+        id="playground-base-url"
+        value={value}
+        onChange={(event) => onChange(event.target.value)}
+        placeholder="Same as this dashboard"
+        className="h-8"
+      />
+      {value && <FieldDescription>Requests go to {value}</FieldDescription>}
+    </Field>
+  );
+}
+
+const parseTemperature = (text: string): number | null | undefined => {
+  if (text.trim() === "") return null;
+  const parsed = Number(text);
+  return Number.isFinite(parsed) && parsed >= 0 && parsed <= 2 ? parsed : undefined;
+};
+
+function TemperatureInput({ value, onChange }: { value: number | null; onChange: (value: number | null) => void }) {
+  const [draft, setDraft] = useState<string | null>(null);
+  const edit = (text: string) => {
+    setDraft(text);
+    const parsed = parseTemperature(text);
+    if (parsed !== undefined) onChange(parsed);
+  };
+  return (
+    <Input
+      aria-label="Temperature value"
+      inputMode="decimal"
+      placeholder="Default"
+      value={draft ?? value?.toString() ?? ""}
+      onChange={(event) => edit(event.target.value)}
+      onBlur={() => setDraft(null)}
+      className="h-8 w-16 shrink-0 text-right text-xs tabular-nums"
+    />
+  );
+}
+
+function SamplingFields({
+  settings,
+  update,
+}: {
+  settings: PlaygroundSettings;
+  update: (change: SettingsUpdate) => void;
+}) {
+  const temperature = settings.temperature ?? DEFAULT_TEMPERATURE;
+  return (
+    <>
+      <Field orientation="horizontal">
+        <FieldLabel htmlFor="playground-temperature" className="w-28 shrink-0 font-normal">
+          Temperature
+        </FieldLabel>
+        <Slider
+          id="playground-temperature"
+          min={0}
+          max={2}
+          step={0.1}
+          value={[temperature]}
+          onValueChange={(value) => update({ temperature: Array.isArray(value) ? value[0] : value })}
+        />
+        <TemperatureInput value={settings.temperature} onChange={(temperature) => update({ temperature })} />
+      </Field>
+      <Field orientation="horizontal">
+        <FieldLabel htmlFor="playground-max-tokens" className="w-28 shrink-0 font-normal">
+          Max tokens
+        </FieldLabel>
+        <Input
+          id="playground-max-tokens"
+          type="number"
+          min={1}
+          value={settings.maxTokens ?? ""}
+          onChange={(event) => {
+            const parsed = Number.parseInt(event.target.value, 10);
+            update({ maxTokens: Number.isFinite(parsed) && parsed > 0 ? parsed : null });
+          }}
+          placeholder="Default"
+          className="h-8 w-24"
+        />
+      </Field>
+    </>
+  );
+}
+
+export function SettingsPopover({
+  settings,
+  update,
+  capabilities,
+  keysDisabled,
+  tagOptions,
+  suggestedBaseUrl,
+  sessions,
+  defaultOpen = false,
+}: {
+  settings: PlaygroundSettings;
+  update: (change: SettingsUpdate) => void;
+  capabilities: Capabilities;
+  keysDisabled: boolean;
+  tagOptions: readonly string[];
+  suggestedBaseUrl: string | null;
+  sessions: Readonly<{ enabled: boolean; responseId: string | null; onToggle: (enabled: boolean) => void }>;
+  defaultOpen?: boolean;
+}) {
+  const advancedSet = [
+    settings.headerPairs.length > 0,
+    Boolean(settings.proxyBaseUrl),
+    settings.temperature !== null,
+    settings.maxTokens !== null,
+  ].some(Boolean);
+  const [advancedOpen, setAdvancedOpen] = useState(advancedSet);
+  const hasToggles = capabilities.stream || capabilities.simulateFallback || capabilities.sessions;
+  const lastResponseId = capabilities.sessions && sessions.enabled ? sessions.responseId : null;
+  return (
+    <Popover defaultOpen={defaultOpen}>
+      <PopoverTrigger render={<InputGroupButton size="xs" />}>
+        <SlidersHorizontal />
+        Settings
+      </PopoverTrigger>
+      <PopoverContent align="end" side="top" className="max-h-(--available-height) w-96 overflow-y-auto p-0">
+        <FieldGroup className="gap-5 p-4">
+          <Field>
+            <FieldLabel htmlFor="playground-key-source">Send as</FieldLabel>
+            <Select
+              items={KEY_SOURCES}
+              value={settings.keySource}
+              onValueChange={(value) => update({ keySource: value as KeySource })}
+              disabled={keysDisabled}
+            >
+              <SelectTrigger id="playground-key-source" size="sm" className="w-full" aria-label="Send as">
+                <SelectValue />
+              </SelectTrigger>
+              <SelectContent>
+                {KEY_SOURCES.map((item) => (
+                  <SelectItem key={item.value} value={item.value}>
+                    {item.label}
+                  </SelectItem>
+                ))}
+              </SelectContent>
+            </Select>
+            {settings.keySource === "custom" ? (
+              <PasswordInput
+                aria-label="Virtual key"
+                value={settings.virtualKey}
+                onChange={(event) => update({ virtualKey: event.target.value })}
+                placeholder="Paste a virtual key"
+              />
+            ) : (
+              <FieldDescription>Pick a virtual key to test what it can access</FieldDescription>
+            )}
+          </Field>
+          <Field>
+            <FieldLabel htmlFor="playground-tags">Tags</FieldLabel>
+            <TagField value={settings.tags} options={tagOptions} onChange={(tags) => update({ tags })} />
+          </Field>
+          {hasToggles && (
+            <FieldSet className="gap-3">
+              {capabilities.stream && (
+                <Field orientation="horizontal">
+                  <FieldLabel htmlFor="playground-stream" className="font-normal">
+                    Stream response
+                  </FieldLabel>
+                  <Switch
+                    id="playground-stream"
+                    checked={settings.stream}
+                    onCheckedChange={(stream) => update({ stream })}
+                  />
+                </Field>
+              )}
+              {capabilities.simulateFallback && (
+                <Field orientation="horizontal">
+                  <FieldLabel htmlFor="playground-fallback" className="font-normal">
+                    Simulate a fallback
+                  </FieldLabel>
+                  <Switch
+                    id="playground-fallback"
+                    checked={settings.simulateFallback}
+                    onCheckedChange={(simulateFallback) => update({ simulateFallback })}
+                  />
+                </Field>
+              )}
+              {capabilities.sessions && (
+                <Field orientation="horizontal">
+                  <FieldLabel htmlFor="playground-sessions" className="flex-col items-start gap-0.5 font-normal">
+                    Keep context on the gateway
+                    <span className="text-xs text-muted-foreground">
+                      Sends previous_response_id instead of the whole history
+                    </span>
+                  </FieldLabel>
+                  <Switch id="playground-sessions" checked={sessions.enabled} onCheckedChange={sessions.onToggle} />
+                </Field>
+              )}
+              {lastResponseId && (
+                <div className="flex items-center gap-2 text-xs text-muted-foreground">
+                  <span className="shrink-0">Last response</span>
+                  <span className="min-w-0 truncate font-mono">{lastResponseId}</span>
+                  <CopyIconButton value={lastResponseId} label="response ID" />
+                </div>
+              )}
+            </FieldSet>
+          )}
+          <Collapsible open={advancedOpen} onOpenChange={setAdvancedOpen}>
+            <CollapsibleTrigger
+              render={
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  className="-ml-2 w-fit text-muted-foreground aria-expanded:bg-transparent"
+                />
+              }
+            >
+              <ChevronRight className="transition-transform in-data-panel-open:rotate-90" />
+              Advanced
+            </CollapsibleTrigger>
+            <CollapsibleContent>
+              <FieldGroup className="gap-5 pt-3">
+                {capabilities.customHeaders && (
+                  <Field>
+                    <FieldLabel>Custom headers</FieldLabel>
+                    <HeaderEditor pairs={settings.headerPairs} onChange={(headerPairs) => update({ headerPairs })} />
+                    <FieldDescription>Sent with every request, like anthropic-beta</FieldDescription>
+                  </Field>
+                )}
+                <ProxyBaseUrlField
+                  value={settings.proxyBaseUrl}
+                  suggested={suggestedBaseUrl}
+                  onChange={(proxyBaseUrl) => update({ proxyBaseUrl })}
+                />
+                {capabilities.sampling && <SamplingFields settings={settings} update={update} />}
+              </FieldGroup>
+            </CollapsibleContent>
+          </Collapsible>
+        </FieldGroup>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/composerFiles.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/composerFiles.ts
new file mode 100644
index 00000000000..2701443355d
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/composerFiles.ts
@@ -0,0 +1,52 @@
+import type { MessageAttachment } from "@/components/chat_ui/types";
+import { validateAudioFile, validateChatAttachment, validateImageEditFile } from "../chat_ui/uploadValidation";
+import type { AttachKind } from "./endpointCapabilities";
+
+export type DraftFile = Readonly<{ file: File; previewUrl?: string }>;
+
+export type AddFilesResult = Readonly<{ files: readonly DraftFile[]; errors: readonly string[] }>;
+
+const isImage = (file: File): boolean => file.type.startsWith("image/");
+
+const kindOf = (file: File): MessageAttachment["kind"] => {
+  if (file.type.startsWith("audio/")) return "audio";
+  if (isImage(file)) return "image";
+  return "pdf";
+};
+
+export const toAttachment = ({ file, previewUrl }: DraftFile): MessageAttachment => ({
+  name: file.name,
+  size: file.size,
+  kind: kindOf(file),
+  ...(previewUrl ? { previewUrl } : {}),
+});
+
+const validate = (kind: AttachKind, file: File, count: number) => {
+  if (kind === "images") return validateImageEditFile(file, count);
+  if (kind === "audio") return validateAudioFile(file);
+  return validateChatAttachment(file);
+};
+
+export const addFiles = (
+  kind: AttachKind,
+  current: readonly DraftFile[],
+  incoming: readonly File[],
+  preview: (file: File) => string | undefined,
+): AddFilesResult => {
+  const single = kind !== "images";
+  return incoming.reduce<AddFilesResult>(
+    (result, file) => {
+      const kept = single ? [] : result.files;
+      const check = validate(kind, file, kept.length);
+      if (!check.ok) return { ...result, errors: [...result.errors, check.error] };
+      return { ...result, files: [...kept, { file, previewUrl: isImage(file) ? preview(file) : undefined }] };
+    },
+    { files: current, errors: [] },
+  );
+};
+
+export const formatBytes = (bytes: number): string => {
+  if (bytes < 1024) return `${bytes} B`;
+  if (bytes < 1024 * 1024) return `${Math.round(bytes / 1024)} KB`;
+  return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+};
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/dispatchRequest.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/dispatchRequest.test.ts
new file mode 100644
index 00000000000..9c078880c39
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/dispatchRequest.test.ts
@@ -0,0 +1,58 @@
+import { describe, expect, it } from "vitest";
+import type { MessageType } from "@/components/chat_ui/types";
+import { textHistory } from "./dispatchRequest";
+
+const user = (content: string): MessageType => ({ role: "user", content });
+const assistant = (content: string, extra: Partial<MessageType> = {}): MessageType => ({
+  role: "assistant",
+  content,
+  ...extra,
+});
+
+describe("textHistory", () => {
+  it("resends only answered text turns", () => {
+    const history: MessageType[] = [
+      user("first question"),
+      assistant("first answer"),
+      user("question that failed"),
+      assistant("rate limited", { isError: true }),
+      user("question that broke mid-stream"),
+      assistant("half an ans"),
+      assistant("connection reset", { isError: true }),
+      user("question that was cancelled"),
+      user("draw a cat"),
+      assistant("data:image/png;base64,AAA", { isImage: true }),
+      { role: "user", content: "", mcpToolCall: { tool: "search", arguments: {} } },
+      assistant("tool output"),
+      user("think hard"),
+      assistant(""),
+      user("think again"),
+      assistant("  \n"),
+      user("embed this"),
+      assistant("[0.1, 0.2]", { isEmbeddings: true }),
+      user("second question"),
+      assistant("second answer"),
+    ];
+
+    expect(textHistory(history)).toEqual([
+      { role: "user", content: "first question" },
+      { role: "assistant", content: "first answer" },
+      { role: "user", content: "second question" },
+      { role: "assistant", content: "second answer" },
+    ]);
+  });
+
+  it("drops a transcription turn that has no typed text", () => {
+    expect(textHistory([user(""), assistant("transcribed words"), user("hi"), assistant("hello")])).toEqual([
+      { role: "user", content: "hi" },
+      { role: "assistant", content: "hello" },
+    ]);
+  });
+
+  it("drops a trailing user turn that never got a reply", () => {
+    expect(textHistory([user("hi"), assistant("hello"), user("still waiting")])).toEqual([
+      { role: "user", content: "hi" },
+      { role: "assistant", content: "hello" },
+    ]);
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/dispatchRequest.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/dispatchRequest.ts
new file mode 100644
index 00000000000..8e89b15134e
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/dispatchRequest.ts
@@ -0,0 +1,295 @@
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import type { MessageType } from "@/components/chat_ui/types";
+import { makeOpenAIChatCompletionRequest } from "@/components/llm_calls/chat_completion";
+import type { CustomHeaders } from "@/components/llm_calls/request_headers";
+import type { ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
+import { makeOpenAIResponsesRequest } from "@/components/llm_calls/responses_api";
+import type { MCPServer, MCPToolset } from "@/components/mcp_tools/types";
+import { callMCPTool } from "@/components/networking";
+import type { UseChatHistoryReturn } from "../../hooks/useChatHistory";
+import type { UseCodeInterpreterReturn } from "../../hooks/useCodeInterpreter";
+import { makeA2ASendMessageRequest } from "../../llm_calls/a2a_send_message";
+import { makeAnthropicMessagesRequest } from "../../llm_calls/anthropic_messages";
+import { makeOpenAIAudioSpeechRequest } from "../../llm_calls/audio_speech";
+import { makeOpenAIAudioTranscriptionRequest } from "../../llm_calls/audio_transcriptions";
+import { makeOpenAIEmbeddingsRequest } from "../../llm_calls/embeddings_api";
+import { makeOpenAIImageEditsRequest } from "../../llm_calls/image_edits";
+import { makeOpenAIImageGenerationRequest } from "../../llm_calls/image_generation";
+import { makeInteractionsRequest } from "../../llm_calls/interactions_api";
+import type { PlaygroundSettings } from "./playgroundSettings";
+
+type ApiMessage = { role: string; content: string | any[] };
+
+export type DirectToolCall = Readonly<{ serverId: string; tool: string; arguments: Record<string, unknown> }>;
+
+export type DispatchContext = Readonly<{
+  settings: PlaygroundSettings;
+  apiKey: string;
+  text: string;
+  userMessage: ApiMessage;
+  history: readonly MessageType[];
+  traceId: string;
+  signal: AbortSignal;
+  files: readonly File[];
+  customHeaders: CustomHeaders;
+  mcpServers: readonly MCPServer[];
+  mcpToolsets: readonly MCPToolset[];
+  directCall: DirectToolCall | null;
+  chat: UseChatHistoryReturn;
+  codeInterpreter: UseCodeInterpreterReturn;
+  onHeaders: ResponseHeadersListener;
+  onResponseId: (responseId: string) => void;
+}>;
+
+const optional = (values: readonly string[]): string[] | undefined => (values.length > 0 ? [...values] : undefined);
+
+const NON_TEXT_FLAGS = ["isImage", "isAudio", "isEmbeddings", "isError", "mcpToolCall"] as const;
+
+const isText = (message: MessageType): boolean => NON_TEXT_FLAGS.every((flag) => !message[flag]);
+
+const isFilled = (content: MessageType["content"]): boolean => typeof content !== "string" || content.trim() !== "";
+
+const isTurn = (message: MessageType | undefined, role: "user" | "assistant"): boolean =>
+  message?.role === role && isText(message) && isFilled(message.content);
+
+const isReply = (history: readonly MessageType[], index: number): boolean =>
+  isTurn(history[index], "assistant") && !history[index + 1]?.isError;
+
+const inExchange = (history: readonly MessageType[], index: number): boolean =>
+  isTurn(history[index], "user")
+    ? isReply(history, index + 1)
+    : isReply(history, index) && isTurn(history[index - 1], "user");
+
+export const textHistory = (history: readonly MessageType[]): ApiMessage[] =>
+  history.filter((_, index) => inExchange(history, index)).map(({ role, content }) => ({ role, content }));
+
+const toolResultText = (result: { content?: { type: string; text?: string }[] } | null): string => {
+  if (result?.content && result.content.length > 0) {
+    return JSON.stringify(
+      result.content.map((item) => (item.type === "text" ? item.text : item)).filter(Boolean),
+      null,
+      2,
+    );
+  }
+  return JSON.stringify(result, null, 2) || "Tool executed successfully.";
+};
+
+export async function dispatchRequest(context: DispatchContext): Promise<void> {
+  const { settings, apiKey, text, userMessage, history, traceId, signal, chat, onHeaders } = context;
+  const model = settings.model ?? "";
+  const tags = [...settings.tags];
+  const baseUrl = settings.proxyBaseUrl || undefined;
+  const headers = context.customHeaders;
+  const vectorStores = optional(settings.vectorStores);
+  const guardrails = optional(settings.guardrails);
+  const policies = optional(settings.policies);
+  const mcpSelection = [...settings.mcpSelection];
+  const mcpServers = [...context.mcpServers];
+  const toolLimits = Object.fromEntries(Object.entries(settings.toolLimits).map(([key, tools]) => [key, [...tools]]));
+  const mcpToolsets = [...context.mcpToolsets];
+
+  switch (settings.endpoint) {
+    case EndpointType.CHAT:
+      return makeOpenAIChatCompletionRequest(
+        [
+          ...textHistory(history).map(({ role, content }) => ({
+            role,
+            content: typeof content === "string" ? content : "",
+          })),
+          userMessage,
+        ],
+        (chunk, servedModel) => chat.updateTextUI("assistant", chunk, servedModel),
+        model,
+        apiKey,
+        tags,
+        signal,
+        chat.updateReasoningContent,
+        chat.updateTimingData,
+        chat.updateUsageData,
+        traceId,
+        vectorStores,
+        guardrails,
+        policies,
+        mcpSelection,
+        chat.updateChatImageUI,
+        chat.updateSearchResults,
+        settings.temperature ?? undefined,
+        settings.maxTokens ?? undefined,
+        chat.updateTotalLatency,
+        baseUrl,
+        mcpServers,
+        toolLimits,
+        chat.handleMCPEvent,
+        settings.simulateFallback,
+        mcpToolsets,
+        settings.stream,
+        headers,
+        onHeaders,
+      );
+    case EndpointType.RESPONSES: {
+      const continuing = chat.useApiSessionManagement && chat.responsesSessionId;
+      return makeOpenAIResponsesRequest(
+        (continuing ? [userMessage] : [...textHistory(history), userMessage]) as MessageType[],
+        (role, delta, servedModel) => chat.updateTextUI(role, delta, servedModel),
+        model,
+        apiKey,
+        tags,
+        signal,
+        chat.updateReasoningContent,
+        chat.updateTimingData,
+        chat.updateUsageData,
+        traceId,
+        vectorStores,
+        guardrails,
+        policies,
+        mcpSelection,
+        chat.useApiSessionManagement ? chat.responsesSessionId : null,
+        context.onResponseId,
+        chat.handleMCPEvent,
+        context.codeInterpreter.enabled,
+        context.codeInterpreter.setResult,
+        baseUrl,
+        mcpServers,
+        toolLimits,
+        mcpToolsets,
+        settings.stream,
+        chat.updateTotalLatency,
+        headers,
+        onHeaders,
+      );
+    }
+    case EndpointType.ANTHROPIC_MESSAGES:
+      return makeAnthropicMessagesRequest(
+        [...textHistory(history), userMessage] as MessageType[],
+        (role, delta, servedModel) => chat.updateTextUI(role, delta, servedModel),
+        model,
+        apiKey,
+        tags,
+        signal,
+        chat.updateReasoningContent,
+        chat.updateTimingData,
+        chat.updateUsageData,
+        traceId,
+        vectorStores,
+        guardrails,
+        policies,
+        mcpSelection,
+        baseUrl,
+        mcpServers,
+        toolLimits,
+        mcpToolsets,
+        settings.stream,
+        headers,
+        onHeaders,
+      );
+    case EndpointType.IMAGE:
+      return makeOpenAIImageGenerationRequest(
+        text,
+        (imageUrl, servedModel) => chat.updateImageUI(imageUrl, servedModel),
+        model,
+        apiKey,
+        tags,
+        signal,
+        baseUrl,
+        headers,
+        onHeaders,
+      );
+    case EndpointType.IMAGE_EDITS:
+      return makeOpenAIImageEditsRequest(
+        context.files.length === 1 ? context.files[0] : [...context.files],
+        text,
+        (imageUrl, servedModel) => chat.updateImageUI(imageUrl, servedModel),
+        model,
+        apiKey,
+        tags,
+        signal,
+        baseUrl,
+        headers,
+        onHeaders,
+      );
+    case EndpointType.SPEECH:
+      return makeOpenAIAudioSpeechRequest(
+        text,
+        settings.voice,
+        (audioUrl, servedModel) => chat.updateAudioUI(audioUrl, servedModel),
+        model,
+        apiKey,
+        tags,
+        signal,
+        undefined,
+        undefined,
+        baseUrl,
+        headers,
+        onHeaders,
+      );
+    case EndpointType.TRANSCRIPTION:
+      return makeOpenAIAudioTranscriptionRequest(
+        context.files[0],
+        (transcription, servedModel) => chat.updateTextUI("assistant", transcription, servedModel),
+        model,
+        apiKey,
+        tags,
+        signal,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        baseUrl,
+        headers,
+        onHeaders,
+      );
+    case EndpointType.EMBEDDINGS:
+      return makeOpenAIEmbeddingsRequest(
+        text,
+        (embeddings, servedModel) => chat.updateEmbeddingsUI(embeddings, servedModel),
+        model,
+        apiKey,
+        tags,
+        baseUrl,
+        headers,
+        onHeaders,
+      );
+    case EndpointType.INTERACTIONS:
+      return makeInteractionsRequest(
+        text,
+        (reply, servedModel) => chat.updateTextUI("assistant", reply, servedModel),
+        model,
+        apiKey,
+        tags,
+        signal,
+        baseUrl,
+        undefined,
+        headers,
+        onHeaders,
+      );
+    case EndpointType.A2A_AGENTS:
+      return makeA2ASendMessageRequest(
+        settings.agent ?? "",
+        text,
+        (chunk, servedModel) => chat.updateTextUI("assistant", chunk, servedModel),
+        apiKey,
+        signal,
+        chat.updateTimingData,
+        chat.updateTotalLatency,
+        chat.updateA2AMetadata,
+        baseUrl,
+        guardrails,
+        headers,
+      );
+    case EndpointType.MCP: {
+      if (!context.directCall) return;
+      const result = await callMCPTool(
+        apiKey,
+        context.directCall.serverId,
+        context.directCall.tool,
+        context.directCall.arguments,
+        { ...(guardrails ? { guardrails } : {}), customHeaders: { ...headers } },
+      );
+      chat.updateTextUI("assistant", toolResultText(result));
+      return;
+    }
+    case EndpointType.REALTIME:
+    case EndpointType.VIDEO:
+      return;
+  }
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/endpointCapabilities.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/endpointCapabilities.ts
new file mode 100644
index 00000000000..32f339e4930
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/endpointCapabilities.ts
@@ -0,0 +1,104 @@
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import { AUDIO_ACCEPT, CHAT_ATTACHMENT_ACCEPT, IMAGE_EDIT_ACCEPT } from "../chat_ui/uploadValidation";
+
+export type AttachKind = "chat" | "images" | "audio";
+
+export type Capabilities = Readonly<{
+  target: "model" | "agent" | "mcpTool";
+  mcp: boolean;
+  vectorStores: boolean;
+  guardrails: boolean;
+  policies: boolean;
+  attach: AttachKind | null;
+  codeInterpreter: boolean;
+  stream: boolean;
+  simulateFallback: boolean;
+  sampling: boolean;
+  sessions: boolean;
+  voice: boolean;
+  customHeaders: boolean;
+  textRequired: boolean;
+  placeholder: string;
+}>;
+
+const BASE: Capabilities = {
+  target: "model",
+  mcp: false,
+  vectorStores: false,
+  guardrails: false,
+  policies: false,
+  attach: null,
+  codeInterpreter: false,
+  stream: false,
+  simulateFallback: false,
+  sampling: false,
+  sessions: false,
+  voice: false,
+  customHeaders: true,
+  textRequired: true,
+  placeholder: "Send a test request",
+};
+
+const TEXT_CHAT: Partial<Capabilities> = {
+  mcp: true,
+  vectorStores: true,
+  guardrails: true,
+  policies: true,
+  stream: true,
+};
+
+const CAPABILITIES: Readonly<Record<EndpointType, Capabilities>> = {
+  [EndpointType.CHAT]: { ...BASE, ...TEXT_CHAT, attach: "chat", simulateFallback: true, sampling: true },
+  [EndpointType.RESPONSES]: { ...BASE, ...TEXT_CHAT, attach: "chat", codeInterpreter: true, sessions: true },
+  [EndpointType.ANTHROPIC_MESSAGES]: { ...BASE, ...TEXT_CHAT },
+  [EndpointType.IMAGE]: { ...BASE, placeholder: "Describe the image you want to generate" },
+  [EndpointType.VIDEO]: { ...BASE, placeholder: "Describe the video you want to generate" },
+  [EndpointType.IMAGE_EDITS]: { ...BASE, attach: "images", placeholder: "Describe how to edit the images" },
+  [EndpointType.EMBEDDINGS]: { ...BASE, placeholder: "Text to embed" },
+  [EndpointType.SPEECH]: { ...BASE, voice: true, placeholder: "Text to turn into speech" },
+  [EndpointType.TRANSCRIPTION]: {
+    ...BASE,
+    attach: "audio",
+    textRequired: false,
+    placeholder: "Optional context for the transcription",
+  },
+  [EndpointType.A2A_AGENTS]: { ...BASE, target: "agent", guardrails: true, placeholder: "Send a message to the agent" },
+  [EndpointType.MCP]: { ...BASE, target: "mcpTool", guardrails: true, textRequired: false },
+  [EndpointType.REALTIME]: { ...BASE, guardrails: true, customHeaders: false },
+  [EndpointType.INTERACTIONS]: { ...BASE },
+};
+
+export const capabilitiesFor = (endpoint: EndpointType): Capabilities => CAPABILITIES[endpoint];
+
+export const ACCEPT_FOR: Readonly<Record<AttachKind, string>> = {
+  chat: CHAT_ATTACHMENT_ACCEPT,
+  images: IMAGE_EDIT_ACCEPT,
+  audio: AUDIO_ACCEPT,
+};
+
+export const ATTACH_LABEL: Readonly<Record<AttachKind, string>> = {
+  chat: "Attach an image or PDF",
+  images: "Add images to edit",
+  audio: "Attach an audio file",
+};
+
+export const SUGGESTIONS: Readonly<Partial<Record<EndpointType, readonly string[]>>> = {
+  [EndpointType.CHAT]: ["Write me a poem", "Explain quantum computing", "Draft a polite email requesting a meeting"],
+  [EndpointType.RESPONSES]: [
+    "Write me a poem",
+    "Explain quantum computing",
+    "Draft a polite email requesting a meeting",
+  ],
+  [EndpointType.ANTHROPIC_MESSAGES]: [
+    "Write me a poem",
+    "Explain quantum computing",
+    "Draft a polite email requesting a meeting",
+  ],
+  [EndpointType.A2A_AGENTS]: ["What can you help me with?", "Tell me about yourself", "What tasks can you perform?"],
+};
+
+export const CODE_INTERPRETER_SUGGESTIONS: readonly string[] = [
+  "Generate sample sales data CSV and create a chart",
+  "Create a PNG bar chart comparing AI gateway providers including LiteLLM",
+  "Generate a CSV of LLM pricing data and visualize it as a line chart",
+];
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/playgroundSettings.test.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/playgroundSettings.test.ts
new file mode 100644
index 00000000000..1b4e4daa173
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/playgroundSettings.test.ts
@@ -0,0 +1,149 @@
+import { describe, expect, it } from "vitest";
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import { OPEN_AI_VOICES } from "../chat_ui/chatConstants";
+import {
+  ALL_MCP_SERVERS,
+  allowedTools,
+  defaultSettings,
+  loadSettings,
+  storedValues,
+  toggleMcpItem,
+  toggleToolLimit,
+  withEndpoint,
+  withReachableMcp,
+  type PlaygroundSettings,
+  type SettingsStorage,
+} from "./playgroundSettings";
+
+const storageOf = (values: Readonly<Record<string, string>>): SettingsStorage => ({
+  read: (key) => values[key] ?? null,
+  readSecure: (key) => values[key] ?? null,
+});
+
+const settingsWith = (change: Partial<PlaygroundSettings>): PlaygroundSettings => ({
+  ...defaultSettings(false),
+  ...change,
+});
+
+const TOOLS = ["search", "fetch", "summarize"] as const;
+const SCOPE = { server: "s", tools: TOOLS };
+
+describe("loadSettings", () => {
+  it("restores every persisted field from what storedValues wrote", () => {
+    const persisted: Partial<PlaygroundSettings> = {
+      keySource: "custom",
+      virtualKey: "sk-test",
+      proxyBaseUrl: "http://gateway.test",
+      endpoint: EndpointType.RESPONSES,
+      model: "gpt-test",
+      voice: OPEN_AI_VOICES.NOVA,
+      tags: ["team-a"],
+      headerPairs: [["x-trace", "abc"]],
+      vectorStores: ["vs_1"],
+      guardrails: ["pii-mask"],
+      policies: ["strict"],
+      mcpSelection: ["server-1"],
+      toolLimits: { "server-1": ["search"] },
+      stream: false,
+    };
+    const original = settingsWith(persisted);
+    const written = Object.fromEntries(
+      storedValues(original)
+        .filter((entry): entry is { key: string; value: string; secure: boolean } => entry.value !== null)
+        .map(({ key, value }) => [key, value]),
+    );
+
+    expect(loadSettings(storageOf(written), false)).toEqual(original);
+  });
+
+  it("falls back to defaults when stored values are corrupt or unknown", () => {
+    const corrupt = {
+      endpointType: "/v1/not-an-endpoint",
+      selectedVoice: "robot",
+      selectedTags: "{not json",
+      selectedGuardrails: JSON.stringify([1, 2]),
+      mcpServerToolRestrictions: JSON.stringify({ good: ["a"], bad: "a" }),
+    };
+    const loaded = loadSettings(storageOf(corrupt), false);
+
+    expect(loaded.endpoint).toBe(EndpointType.CHAT);
+    expect(loaded.voice).toBe(OPEN_AI_VOICES.ALLOY);
+    expect(loaded.tags).toEqual([]);
+    expect(loaded.guardrails).toEqual([]);
+    expect(loaded.toolLimits).toEqual({ good: ["a"] });
+  });
+
+  it("forces the virtual key source when personal keys are disabled", () => {
+    expect(loadSettings(storageOf({ apiKeySource: JSON.stringify("session") }), true).keySource).toBe("custom");
+    expect(loadSettings(storageOf({ apiKeySource: JSON.stringify("session") }), false).keySource).toBe("session");
+  });
+});
+
+describe("withEndpoint", () => {
+  it("clears the model and keeps only a single MCP server when switching to direct tool calls", () => {
+    const next = withEndpoint(settingsWith({ model: "gpt-test", mcpSelection: ["a", "b"] }), EndpointType.MCP);
+
+    expect(next.endpoint).toBe(EndpointType.MCP);
+    expect(next.model).toBeNull();
+    expect(next.mcpSelection).toEqual([]);
+    expect(withEndpoint(settingsWith({ mcpSelection: ["a"] }), EndpointType.MCP).mcpSelection).toEqual(["a"]);
+    expect(withEndpoint(settingsWith({ mcpSelection: [ALL_MCP_SERVERS] }), EndpointType.MCP).mcpSelection).toEqual([]);
+  });
+
+  it("keeps the MCP selection for model endpoints", () => {
+    expect(withEndpoint(settingsWith({ mcpSelection: ["a", "b"] }), EndpointType.RESPONSES).mcpSelection).toEqual([
+      "a",
+      "b",
+    ]);
+  });
+});
+
+describe("toggleMcpItem", () => {
+  it("treats all servers as exclusive with individual servers", () => {
+    expect(toggleMcpItem(["a", "b"], ALL_MCP_SERVERS, true)).toEqual([ALL_MCP_SERVERS]);
+    expect(toggleMcpItem([ALL_MCP_SERVERS], "a", true)).toEqual(["a"]);
+    expect(toggleMcpItem(["a", "b"], "a", false)).toEqual(["b"]);
+  });
+});
+
+describe("withReachableMcp", () => {
+  it("drops servers the current key cannot reach along with their tool limits", () => {
+    const settings = settingsWith({
+      mcpSelection: [ALL_MCP_SERVERS, "kept", "gone"],
+      toolLimits: { kept: ["search"], gone: ["fetch"] },
+    });
+
+    const next = withReachableMcp(settings, new Set(["kept"]));
+
+    expect(next.mcpSelection).toEqual([ALL_MCP_SERVERS, "kept"]);
+    expect(next.toolLimits).toEqual({ kept: ["search"] });
+  });
+
+  it("leaves settings untouched while the catalog is loading or when everything is reachable", () => {
+    const settings = settingsWith({ mcpSelection: ["kept"] });
+
+    expect(withReachableMcp(settings, null)).toBe(settings);
+    expect(withReachableMcp(settings, new Set(["kept", "other"]))).toBe(settings);
+  });
+});
+
+describe("toggleToolLimit", () => {
+  it("narrows an unrestricted server to the remaining tools when one is unchecked", () => {
+    const limits = toggleToolLimit({}, SCOPE, "fetch", false);
+
+    expect(allowedTools(limits, "s", TOOLS)).toEqual(["search", "summarize"]);
+  });
+
+  it("refuses to uncheck the last allowed tool", () => {
+    const limits = { s: ["search"] };
+
+    expect(toggleToolLimit(limits, SCOPE, "search", false)).toBe(limits);
+  });
+
+  it("lifts the restriction once every tool is checked again", () => {
+    const limits = toggleToolLimit({ s: ["search", "fetch"] }, SCOPE, "summarize", true);
+
+    expect(limits.s).toEqual([]);
+    expect(allowedTools(limits, "s", TOOLS)).toEqual(TOOLS);
+  });
+});
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/playgroundSettings.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/playgroundSettings.ts
new file mode 100644
index 00000000000..b502702308b
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/playgroundSettings.ts
@@ -0,0 +1,192 @@
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import type { KeyValuePair } from "@/components/key_value_input";
+import { parseStoredHeaderPairs } from "@/components/llm_calls/request_headers";
+import { OPEN_AI_VOICES, type OpenAIVoice } from "../chat_ui/chatConstants";
+
+export type KeySource = "session" | "custom";
+
+export type ToolLimits = Readonly<Record<string, readonly string[]>>;
+
+export type PlaygroundSettings = Readonly<{
+  keySource: KeySource;
+  virtualKey: string;
+  proxyBaseUrl: string;
+  endpoint: EndpointType;
+  model: string | null;
+  agent: string | null;
+  voice: OpenAIVoice;
+  tags: readonly string[];
+  headerPairs: readonly KeyValuePair[];
+  vectorStores: readonly string[];
+  guardrails: readonly string[];
+  policies: readonly string[];
+  mcpSelection: readonly string[];
+  toolLimits: ToolLimits;
+  directTool: string | null;
+  stream: boolean;
+  simulateFallback: boolean;
+  temperature: number | null;
+  maxTokens: number | null;
+}>;
+
+export type StoredValue = Readonly<{ key: string; value: string | null; secure: boolean }>;
+
+export type SettingsStorage = Readonly<{
+  read: (key: string) => string | null;
+  readSecure: (key: string) => string | null;
+}>;
+
+export const ALL_MCP_SERVERS = "__all__";
+export const TOOLSET_PREFIX = "toolset:";
+
+const ENDPOINTS: readonly string[] = Object.values(EndpointType);
+const VOICES: readonly string[] = Object.values(OPEN_AI_VOICES);
+
+const parseJson = (raw: string | null): unknown => {
+  if (raw === null) return undefined;
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return undefined;
+  }
+};
+
+const isStringList = (value: unknown): value is readonly string[] =>
+  Array.isArray(value) && value.every((item) => typeof item === "string");
+
+const stringList = (raw: string | null): readonly string[] => {
+  const parsed = parseJson(raw);
+  return isStringList(parsed) ? parsed : [];
+};
+
+const toolLimits = (raw: string | null): ToolLimits => {
+  const parsed = parseJson(raw);
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return {};
+  return Object.fromEntries(
+    Object.entries(parsed).filter((entry): entry is [string, string[]] => isStringList(entry[1])),
+  );
+};
+
+const endpoint = (raw: string | null): EndpointType =>
+  ENDPOINTS.includes(raw ?? "") ? (raw as EndpointType) : EndpointType.CHAT;
+
+const voice = (raw: string | null): OpenAIVoice => {
+  const parsed = parseJson(raw);
+  const candidate = typeof parsed === "string" ? parsed : raw;
+  return VOICES.includes(candidate ?? "") ? (candidate as OpenAIVoice) : OPEN_AI_VOICES.ALLOY;
+};
+
+const keySource = (raw: string | null, keysDisabled: boolean): KeySource => {
+  if (keysDisabled) return "custom";
+  const parsed = parseJson(raw);
+  return parsed === "custom" ? "custom" : "session";
+};
+
+export const defaultSettings = (keysDisabled: boolean): PlaygroundSettings => ({
+  keySource: keysDisabled ? "custom" : "session",
+  virtualKey: "",
+  proxyBaseUrl: "",
+  endpoint: EndpointType.CHAT,
+  model: null,
+  agent: null,
+  voice: OPEN_AI_VOICES.ALLOY,
+  tags: [],
+  headerPairs: [],
+  vectorStores: [],
+  guardrails: [],
+  policies: [],
+  mcpSelection: [],
+  toolLimits: {},
+  directTool: null,
+  stream: true,
+  simulateFallback: false,
+  temperature: null,
+  maxTokens: null,
+});
+
+export const loadSettings = (storage: SettingsStorage, keysDisabled: boolean): PlaygroundSettings => ({
+  ...defaultSettings(keysDisabled),
+  keySource: keySource(storage.readSecure("apiKeySource"), keysDisabled),
+  virtualKey: storage.readSecure("apiKey") ?? "",
+  headerPairs: parseStoredHeaderPairs(storage.readSecure("customHeaders")),
+  proxyBaseUrl: storage.read("customProxyBaseUrl") ?? "",
+  endpoint: endpoint(storage.read("endpointType")),
+  model: storage.read("selectedModel"),
+  voice: voice(storage.read("selectedVoice")),
+  tags: stringList(storage.read("selectedTags")),
+  vectorStores: stringList(storage.read("selectedVectorStores")),
+  guardrails: stringList(storage.read("selectedGuardrails")),
+  policies: stringList(storage.read("selectedPolicies")),
+  mcpSelection: stringList(storage.read("selectedMCPServers")),
+  toolLimits: toolLimits(storage.read("mcpServerToolRestrictions")),
+  stream: storage.read("streamingEnabled") !== "false",
+});
+
+export const storedValues = (settings: PlaygroundSettings): readonly StoredValue[] => [
+  { key: "apiKeySource", value: JSON.stringify(settings.keySource), secure: true },
+  { key: "apiKey", value: settings.virtualKey, secure: true },
+  { key: "customHeaders", value: JSON.stringify(settings.headerPairs), secure: true },
+  { key: "customProxyBaseUrl", value: settings.proxyBaseUrl || null, secure: false },
+  { key: "endpointType", value: settings.endpoint, secure: false },
+  { key: "selectedModel", value: settings.model, secure: false },
+  { key: "selectedVoice", value: settings.voice, secure: false },
+  { key: "selectedTags", value: JSON.stringify(settings.tags), secure: false },
+  { key: "selectedVectorStores", value: JSON.stringify(settings.vectorStores), secure: false },
+  { key: "selectedGuardrails", value: JSON.stringify(settings.guardrails), secure: false },
+  { key: "selectedPolicies", value: JSON.stringify(settings.policies), secure: false },
+  { key: "selectedMCPServers", value: JSON.stringify(settings.mcpSelection), secure: false },
+  { key: "mcpServerToolRestrictions", value: JSON.stringify(settings.toolLimits), secure: false },
+  { key: "streamingEnabled", value: String(settings.stream), secure: false },
+];
+
+const singleServer = (selection: readonly string[]): readonly string[] =>
+  selection.length === 1 && selection[0] !== ALL_MCP_SERVERS ? selection : [];
+
+export const withEndpoint = (settings: PlaygroundSettings, next: EndpointType): PlaygroundSettings => ({
+  ...settings,
+  endpoint: next,
+  model: null,
+  agent: null,
+  directTool: null,
+  mcpSelection: next === EndpointType.MCP ? singleServer(settings.mcpSelection) : settings.mcpSelection,
+});
+
+export const toggleMcpItem = (selection: readonly string[], item: string, on: boolean): readonly string[] => {
+  if (!on) return selection.filter((value) => value !== item);
+  if (item === ALL_MCP_SERVERS) return [ALL_MCP_SERVERS];
+  return [...selection.filter((value) => value !== ALL_MCP_SERVERS && value !== item), item];
+};
+
+export const withoutStaleLimits = (limits: ToolLimits, selection: readonly string[]): ToolLimits =>
+  Object.fromEntries(Object.entries(limits).filter(([server]) => selection.includes(server)));
+
+export const withReachableMcp = (
+  settings: PlaygroundSettings,
+  reachable: ReadonlySet<string> | null,
+): PlaygroundSettings => {
+  if (!reachable) return settings;
+  const mcpSelection = settings.mcpSelection.filter((item) => item === ALL_MCP_SERVERS || reachable.has(item));
+  if (mcpSelection.length === settings.mcpSelection.length) return settings;
+  return { ...settings, mcpSelection, toolLimits: withoutStaleLimits(settings.toolLimits, mcpSelection) };
+};
+
+export const allowedTools = (limits: ToolLimits, server: string, tools: readonly string[]): readonly string[] => {
+  const limit = limits[server] ?? [];
+  return limit.length === 0 ? tools : tools.filter((tool) => limit.includes(tool));
+};
+
+export type ToolScope = Readonly<{ server: string; tools: readonly string[] }>;
+
+export const toggleToolLimit = (
+  limits: ToolLimits,
+  { server, tools }: ToolScope,
+  tool: string,
+  on: boolean,
+): ToolLimits => {
+  const current = allowedTools(limits, server, tools);
+  const next = on
+    ? tools.filter((name) => name === tool || current.includes(name))
+    : current.filter((name) => name !== tool);
+  if (next.length === 0) return limits;
+  return { ...limits, [server]: next.length === tools.length ? [] : next };
+};
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/useIsWide.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/useIsWide.ts
new file mode 100644
index 00000000000..17f5e18cf7a
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/useIsWide.ts
@@ -0,0 +1,16 @@
+import { useSyncExternalStore } from "react";
+
+const QUERY = "(min-width: 80rem)";
+
+const subscribe = (onChange: () => void) => {
+  const media = window.matchMedia(QUERY);
+  media.addEventListener("change", onChange);
+  return () => media.removeEventListener("change", onChange);
+};
+
+export const useIsWide = (): boolean =>
+  useSyncExternalStore(
+    subscribe,
+    () => window.matchMedia(QUERY).matches,
+    () => true,
+  );
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundCatalog.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundCatalog.ts
new file mode 100644
index 00000000000..8c046977b8e
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundCatalog.ts
@@ -0,0 +1,147 @@
+import { useQueries, useQuery, useQueryClient, type UseQueryOptions } from "@tanstack/react-query";
+import { fetchAvailableModels, type ModelGroup } from "@/components/llm_calls/fetch_models";
+import type { MCPServer, MCPTool, MCPToolset } from "@/components/mcp_tools/types";
+import {
+  fetchMCPServers,
+  fetchMCPToolsets,
+  getGuardrailsList,
+  getPoliciesList,
+  listMCPTools,
+  tagListCall,
+  vectorStoreListCall,
+} from "@/components/networking";
+import { getPolicyOptionEntries } from "@/components/policies/PolicySelector";
+import type { Policy } from "@/components/policies/types";
+import type { Tag } from "@/components/tag_management/types";
+import type { VectorStore } from "@/components/vector_store_management/types";
+import { fetchAvailableAgents, type Agent } from "../../llm_calls/fetch_agents";
+
+export type PickerOption = Readonly<{ value: string; label: string; description?: string }>;
+
+const EMPTY: readonly never[] = [];
+
+const serverList = (response: MCPServer[] | { data?: MCPServer[] }): readonly MCPServer[] =>
+  Array.isArray(response) ? response : response.data ?? [];
+
+export function usePlaygroundModels(requestKey: string | null) {
+  const options = {
+    queryKey: ["playground", "models", requestKey],
+    queryFn: (): Promise<readonly ModelGroup[]> => fetchAvailableModels(requestKey ?? ""),
+    enabled: Boolean(requestKey),
+    retry: false,
+  } satisfies UseQueryOptions<readonly ModelGroup[]>;
+  return useQuery(options);
+}
+
+export function useMcpCatalog(requestKey: string | null) {
+  const queryClient = useQueryClient();
+  const servers = useQuery<readonly MCPServer[]>({
+    queryKey: ["playground", "mcpServers", requestKey],
+    queryFn: async () => serverList(await fetchMCPServers(requestKey ?? "")),
+    enabled: Boolean(requestKey),
+  });
+  const toolsets = useQuery<readonly MCPToolset[] | null>({
+    queryKey: ["playground", "mcpToolsets", requestKey],
+    queryFn: async () => {
+      const response: unknown = await fetchMCPToolsets(requestKey ?? "").catch(() => null);
+      if (response === null) return null;
+      return Array.isArray(response) ? (response as MCPToolset[]) : [];
+    },
+    enabled: Boolean(requestKey),
+  });
+  return {
+    servers: servers.data ?? EMPTY,
+    toolsets: toolsets.data ?? EMPTY,
+    isLoading: servers.isLoading || toolsets.isLoading,
+    isReady: servers.isSuccess && Boolean(toolsets.data),
+    refreshCredentials: () => {
+      void servers.refetch();
+      void queryClient.invalidateQueries({ queryKey: ["playground", "mcpTools", requestKey] });
+    },
+  };
+}
+
+export type ServerTools = Readonly<{ tools: readonly MCPTool[]; isLoading: boolean; failed: boolean }>;
+
+export function useServerTools(requestKey: string | null, serverIds: readonly string[]) {
+  const results = useQueries({
+    queries: serverIds.map((serverId) => ({
+      queryKey: ["playground", "mcpTools", requestKey, serverId],
+      queryFn: async (): Promise<readonly MCPTool[]> => {
+        const response: { tools?: MCPTool[]; error?: string } = await listMCPTools(requestKey ?? "", serverId);
+        if (response.error) throw new Error(response.error);
+        return response.tools ?? [];
+      },
+      enabled: Boolean(requestKey),
+      staleTime: 60_000,
+    })),
+  });
+  return Object.fromEntries(
+    serverIds.map((serverId, index) => [
+      serverId,
+      {
+        tools: results[index]?.data ?? EMPTY,
+        isLoading: results[index]?.isLoading ?? false,
+        failed: results[index]?.isError ?? false,
+      },
+    ]),
+  ) as Readonly<Record<string, ServerTools>>;
+}
+
+export function usePlaygroundAgents(requestKey: string | null, proxyBaseUrl: string, enabled: boolean) {
+  return useQuery<readonly Agent[]>({
+    queryKey: ["playground", "agents", requestKey, proxyBaseUrl],
+    queryFn: () => fetchAvailableAgents(requestKey ?? "", proxyBaseUrl || undefined),
+    enabled: enabled && Boolean(requestKey),
+  });
+}
+
+export function useGuardrailOptions(uiToken: string | null) {
+  return useQuery<readonly PickerOption[]>({
+    queryKey: ["playground", "guardrails", uiToken],
+    queryFn: async () => {
+      const response: { guardrails?: { guardrail_name?: string | null }[] } = await getGuardrailsList(uiToken ?? "");
+      return (response.guardrails ?? []).flatMap((guardrail) =>
+        guardrail.guardrail_name ? [{ value: guardrail.guardrail_name, label: guardrail.guardrail_name }] : [],
+      );
+    },
+    enabled: Boolean(uiToken),
+  });
+}
+
+export function usePolicyOptions(uiToken: string | null, canView: boolean) {
+  return useQuery<readonly PickerOption[]>({
+    queryKey: ["playground", "policies", uiToken],
+    queryFn: async () => {
+      const response: { policies?: Policy[] } = await getPoliciesList(uiToken ?? "");
+      return getPolicyOptionEntries(response.policies ?? []);
+    },
+    enabled: canView && Boolean(uiToken),
+  });
+}
+
+export function useVectorStoreOptions(uiToken: string | null) {
+  return useQuery<readonly PickerOption[]>({
+    queryKey: ["playground", "vectorStores", uiToken],
+    queryFn: async () => {
+      const response: { data?: VectorStore[] } = await vectorStoreListCall(uiToken ?? "");
+      return (response.data ?? []).map((store) => ({
+        value: store.vector_store_id,
+        label: store.vector_store_name || store.vector_store_id,
+        description: store.vector_store_name ? store.vector_store_id : undefined,
+      }));
+    },
+    enabled: Boolean(uiToken),
+  });
+}
+
+export function useTagOptions(uiToken: string | null) {
+  return useQuery<readonly string[]>({
+    queryKey: ["playground", "tags", uiToken],
+    queryFn: async () => {
+      const response: Record<string, Tag> = await tagListCall(uiToken ?? "");
+      return Object.values(response).map((tag) => tag.name);
+    },
+    enabled: Boolean(uiToken),
+  });
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundSend.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundSend.ts
new file mode 100644
index 00000000000..2bbb45f2e2b
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundSend.ts
@@ -0,0 +1,263 @@
+import { useRef, useState, type RefObject } from "react";
+import { v4 as uuidv4 } from "uuid";
+import { EndpointType } from "@/components/chat_ui/mode_endpoint_mapping";
+import type { MessageType, ReplyTrace } from "@/components/chat_ui/types";
+import { gatewayTraceFromHeaders } from "@/components/llm_calls/reply_trace";
+import type { CustomHeaders } from "@/components/llm_calls/request_headers";
+import type { MCPToolArgumentsFormRef } from "@/components/mcp_tools/MCPToolArgumentsForm";
+import type { MCPServer, MCPToolset } from "@/components/mcp_tools/types";
+import { toast } from "@/lib/toast";
+import type { UseChatHistoryReturn } from "../../hooks/useChatHistory";
+import type { UseCodeInterpreterReturn } from "../../hooks/useCodeInterpreter";
+import { createChatMultimodalMessage } from "../chat_ui/ChatImageUtils";
+import { createMultimodalMessage } from "../chat_ui/ResponsesImageUtils";
+import { addFiles, toAttachment, type DraftFile } from "./composerFiles";
+import { dispatchRequest, type DirectToolCall, type DispatchContext } from "./dispatchRequest";
+import type { AttachKind, Capabilities } from "./endpointCapabilities";
+import type { PlaygroundSettings } from "./playgroundSettings";
+
+const MODEL_ENDPOINTS: readonly EndpointType[] = [
+  EndpointType.CHAT,
+  EndpointType.IMAGE,
+  EndpointType.SPEECH,
+  EndpointType.IMAGE_EDITS,
+  EndpointType.RESPONSES,
+  EndpointType.ANTHROPIC_MESSAGES,
+  EndpointType.EMBEDDINGS,
+  EndpointType.TRANSCRIPTION,
+  EndpointType.INTERACTIONS,
+];
+
+export type SendDeps = Readonly<{
+  settings: PlaygroundSettings;
+  capabilities: Capabilities;
+  apiKey: string | null;
+  signedIn: boolean;
+  customHeaders: CustomHeaders;
+  mcpServers: readonly MCPServer[];
+  mcpToolsets: readonly MCPToolset[];
+  directCall: () => Omit<DirectToolCall, "arguments"> | null;
+  toolArgsForm: RefObject<MCPToolArgumentsFormRef | null>;
+  chat: UseChatHistoryReturn;
+  codeInterpreter: UseCodeInterpreterReturn;
+}>;
+
+const errorText = (error: unknown): string => (error instanceof Error ? error.message : String(error));
+
+const previewFor = (file: File): string | undefined => {
+  const url = URL.createObjectURL(file);
+  return url.startsWith("blob:") ? url : undefined;
+};
+
+const missingInput = (deps: SendDeps, text: string, files: readonly DraftFile[]): string | null => {
+  const { settings, capabilities } = deps;
+  if (settings.endpoint === EndpointType.IMAGE_EDITS && files.length === 0)
+    return "Please upload at least one image for editing";
+  if (settings.endpoint === EndpointType.TRANSCRIPTION && files.length === 0)
+    return "Please upload an audio file for transcription";
+  if (capabilities.textRequired && text.trim() === "") return "";
+  if (settings.endpoint === EndpointType.A2A_AGENTS && !settings.agent)
+    return "Please select an agent to send a message";
+  if (MODEL_ENDPOINTS.includes(settings.endpoint) && !settings.model)
+    return "Please select a model before sending a request";
+  return null;
+};
+
+const apiMessage = async (endpoint: EndpointType, text: string, file: File | undefined) => {
+  if (file && endpoint === EndpointType.RESPONSES) return createMultimodalMessage(text, file);
+  if (file && endpoint === EndpointType.CHAT) return createChatMultimodalMessage(text, file);
+  return { role: "user", content: text };
+};
+
+const targetName = (
+  settings: PlaygroundSettings,
+  direct: Omit<DirectToolCall, "arguments"> | null,
+): string | undefined => {
+  if (settings.endpoint === EndpointType.A2A_AGENTS) return settings.agent ?? undefined;
+  if (settings.endpoint === EndpointType.MCP) return direct?.tool;
+  return settings.model ?? undefined;
+};
+
+const withTrace = (history: MessageType[], from: number, trace: ReplyTrace): MessageType[] => {
+  const replyIndex = history.findLastIndex((message, index) => index > from && message.role === "assistant");
+  if (replyIndex < 0) return history;
+  return history.map((message, index) => (index === replyIndex ? { ...message, trace } : message));
+};
+
+const untilAborted = <T extends object>(target: T, signal: AbortSignal): T =>
+  new Proxy(target, {
+    get: (object, key, receiver) => {
+      const value: unknown = Reflect.get(object, key, receiver);
+      return typeof value === "function"
+        ? (...args: unknown[]) => (signal.aborted ? undefined : value(...args))
+        : value;
+    },
+  });
+
+type Draft = Readonly<{ kind: AttachKind | null; files: readonly DraftFile[] }>;
+
+type PreparedRequest = Readonly<{
+  direct: Omit<DirectToolCall, "arguments"> | null;
+  toolArguments: Record<string, unknown>;
+  userMessage: Awaited<ReturnType<typeof apiMessage>>;
+}>;
+
+export function usePlaygroundSend(deps: SendDeps) {
+  const [text, setText] = useState("");
+  const [draft, setDraft] = useState<Draft>({ kind: null, files: [] });
+  const [isLoading, setIsLoading] = useState(false);
+  const abortRef = useRef<AbortController | null>(null);
+  const preparing = useRef(false);
+  const files = draft.kind === deps.capabilities.attach ? draft.files : [];
+  const setFiles = (next: readonly DraftFile[]) => setDraft({ kind: deps.capabilities.attach, files: next });
+
+  const attach = (incoming: readonly File[]) => {
+    if (!deps.capabilities.attach) return;
+    const result = addFiles(deps.capabilities.attach, files, incoming, previewFor);
+    result.errors.forEach((error) => toast.error(error));
+    setFiles(result.files);
+  };
+
+  const removeFile = (index: number) => {
+    const removed = files[index];
+    if (removed?.previewUrl) URL.revokeObjectURL(removed.previewUrl);
+    setFiles(files.filter((_, i) => i !== index));
+  };
+
+  const stop = () => {
+    abortRef.current?.abort();
+    abortRef.current = null;
+    setIsLoading(false);
+  };
+
+  const clearDraft = () => {
+    stop();
+    files.forEach((file) => file.previewUrl && URL.revokeObjectURL(file.previewUrl));
+    setFiles([]);
+    setText("");
+  };
+
+  const cancel = () => {
+    if (!abortRef.current) return;
+    stop();
+    toast.info("Request cancelled");
+  };
+
+  const prepare = async (): Promise<PreparedRequest | null> => {
+    const { settings } = deps;
+    const missing = missingInput(deps, text, files);
+    if (missing !== null) {
+      if (missing) toast.fromError(missing);
+      return null;
+    }
+    const direct = settings.endpoint === EndpointType.MCP ? deps.directCall() : null;
+    if (settings.endpoint === EndpointType.MCP && !direct) {
+      toast.fromError("Pick an MCP server and a tool to call");
+      return null;
+    }
+    const toolArguments = await (direct
+      ? deps.toolArgsForm.current?.getSubmitValues().catch((error: unknown) => {
+          toast.fromError(error instanceof Error ? error.message : "Please fill in all required parameters");
+          return null;
+        })
+      : Promise.resolve({}));
+    if (toolArguments === null) return null;
+    if (!deps.signedIn) return null;
+    if (!deps.apiKey) {
+      toast.fromError("Please provide a Virtual Key or select Current UI Session");
+      return null;
+    }
+
+    const userMessage = await apiMessage(settings.endpoint, text, files[0]?.file).catch(() => null);
+    if (!userMessage) {
+      toast.fromError("Failed to process the attachment. Please try again.");
+      return null;
+    }
+    return { direct, toolArguments: toolArguments ?? {}, userMessage };
+  };
+
+  const send = async () => {
+    if (preparing.current || abortRef.current) return;
+    preparing.current = true;
+    const prepared = await prepare().finally(() => {
+      preparing.current = false;
+    });
+    if (!prepared || !deps.apiKey) return;
+    const { settings, chat } = deps;
+    const { direct, toolArguments, userMessage } = prepared;
+
+    const traceId = chat.messageTraceId ?? uuidv4();
+    if (!chat.messageTraceId) chat.setMessageTraceId(traceId);
+    const history = chat.chatHistory;
+    const requestedModel = targetName(settings, direct);
+    chat.setChatHistory([
+      ...history,
+      {
+        role: "user",
+        content: text,
+        model: requestedModel,
+        ...(files.length > 0 ? { attachments: files.map(toAttachment) } : {}),
+        ...(direct ? { mcpToolCall: { tool: direct.tool, arguments: toolArguments } } : {}),
+      },
+    ]);
+    chat.clearMCPEvents();
+    deps.codeInterpreter.clearResult();
+    const sentFiles = files.map((draft) => draft.file);
+    setText("");
+    setFiles([]);
+    setIsLoading(true);
+
+    const controller = new AbortController();
+    abortRef.current = controller;
+    const live = untilAborted(chat, controller.signal);
+    const captured: { headers?: Headers; responseId?: string } = {};
+    const trace = (): ReplyTrace => ({
+      ...(captured.headers ? gatewayTraceFromHeaders(captured.headers) : {}),
+      endpoint: settings.endpoint,
+      requestedModel,
+      responseId: captured.responseId,
+    });
+
+    try {
+      const context: DispatchContext = {
+        settings,
+        apiKey: deps.apiKey,
+        text,
+        userMessage,
+        history,
+        traceId,
+        signal: controller.signal,
+        files: sentFiles,
+        customHeaders: deps.customHeaders,
+        mcpServers: deps.mcpServers,
+        mcpToolsets: deps.mcpToolsets,
+        directCall: direct ? { ...direct, arguments: toolArguments } : null,
+        chat: live,
+        codeInterpreter: untilAborted(deps.codeInterpreter, controller.signal),
+        onHeaders: (headers) => {
+          captured.headers = headers;
+        },
+        onResponseId: (responseId) => {
+          captured.responseId = responseId;
+          live.handleResponseId(responseId);
+        },
+      };
+      await dispatchRequest(context);
+      if (controller.signal.aborted) return;
+      chat.setChatHistory((current) => withTrace(current, history.length, trace()));
+    } catch (error) {
+      if (controller.signal.aborted) return;
+      chat.setChatHistory((current) => [
+        ...current,
+        { role: "assistant", content: errorText(error), isError: true, model: requestedModel, trace: trace() },
+      ]);
+    } finally {
+      if (abortRef.current === controller) {
+        abortRef.current = null;
+        setIsLoading(false);
+      }
+    }
+  };
+
+  return { text, setText, files, attach, removeFile, clearDraft, isLoading, send, cancel } as const;
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundSettings.ts b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundSettings.ts
new file mode 100644
index 00000000000..67c485bf56f
--- /dev/null
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/components/chat/usePlaygroundSettings.ts
@@ -0,0 +1,38 @@
+import { useCallback, useEffect, useState } from "react";
+import { getSecureItem, setSecureItem } from "@/utils/secureStorage";
+import { defaultSettings, loadSettings, storedValues, type PlaygroundSettings } from "./playgroundSettings";
+
+export type SettingsUpdate = Partial<PlaygroundSettings> | ((current: PlaygroundSettings) => PlaygroundSettings);
+
+const browserStorage = {
+  read: (key: string) => window.sessionStorage.getItem(key),
+  readSecure: getSecureItem,
+};
+
+const persist = (settings: PlaygroundSettings): void => {
+  storedValues(settings).forEach(({ key, value, secure }) => {
+    try {
+      if (value === null) window.sessionStorage.removeItem(key);
+      else if (secure) setSecureItem(key, value);
+      else window.sessionStorage.setItem(key, value);
+    } catch {
+      return;
+    }
+  });
+};
+
+export function usePlaygroundSettings(keysDisabled: boolean) {
+  const [settings, setSettings] = useState<PlaygroundSettings>(() => loadSettings(browserStorage, keysDisabled));
+
+  useEffect(() => persist(settings), [settings]);
+
+  const update = useCallback(
+    (change: SettingsUpdate) =>
+      setSettings((current) => (typeof change === "function" ? change(current) : { ...current, ...change })),
+    [],
+  );
+
+  const reset = useCallback(() => setSettings(defaultSettings(keysDisabled)), [keysDisabled]);
+
+  return { settings, update, reset } as const;
+}
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/anthropic_messages.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/anthropic_messages.tsx
index e53d6378341..aea8cf56106 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/anthropic_messages.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/anthropic_messages.tsx
@@ -1,3 +1,4 @@
+import { observeResponseHeaders, type ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 import Anthropic from "@anthropic-ai/sdk";
 import { MessageType } from "@/components/chat_ui/types";
 import { TokenUsage } from "@/components/chat_ui/ResponseMetrics";
@@ -36,6 +37,7 @@ export async function makeAnthropicMessagesRequest(
   mcpToolsets?: MCPToolset[],
   streamingEnabled: boolean = true,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ) {
   if (!accessToken) {
     throw new Error("Virtual Key is required");
@@ -55,6 +57,7 @@ export async function makeAnthropicMessagesRequest(
     baseURL: proxyBaseUrl,
     dangerouslyAllowBrowser: true,
     defaultHeaders: headers,
+    ...(onResponseHeaders ? { fetch: observeResponseHeaders(onResponseHeaders) } : {}),
   });
 
   try {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/audio_speech.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/audio_speech.tsx
index e7bf2d3fc3c..872bbaa7146 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/audio_speech.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/audio_speech.tsx
@@ -1,3 +1,4 @@
+import { observeResponseHeaders, type ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 import openai from "openai";
 import { getGatewayBaseUrl } from "@/components/networking";
 import { buildPlaygroundHeaders, type CustomHeaders } from "@/components/llm_calls/request_headers";
@@ -16,6 +17,7 @@ export async function makeOpenAIAudioSpeechRequest(
   speed?: number,
   customBaseUrl?: string,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ) {
   // base url should be the current base_url
   const isLocal = process.env.NODE_ENV === "development";
@@ -28,6 +30,7 @@ export async function makeOpenAIAudioSpeechRequest(
     baseURL: proxyBaseUrl,
     dangerouslyAllowBrowser: true,
     defaultHeaders: buildPlaygroundHeaders(tags, customHeaders),
+    ...(onResponseHeaders ? { fetch: observeResponseHeaders(onResponseHeaders) } : {}),
   });
 
   try {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/audio_transcriptions.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/audio_transcriptions.tsx
index 1063cfe48e0..9232c933ba2 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/audio_transcriptions.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/audio_transcriptions.tsx
@@ -1,3 +1,4 @@
+import { observeResponseHeaders, type ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 import openai from "openai";
 import { getGatewayBaseUrl } from "@/components/networking";
 import { buildPlaygroundHeaders, type CustomHeaders } from "@/components/llm_calls/request_headers";
@@ -16,6 +17,7 @@ export async function makeOpenAIAudioTranscriptionRequest(
   temperature?: number,
   customBaseUrl?: string,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ) {
   // base url should be the current base_url
   const isLocal = process.env.NODE_ENV === "development";
@@ -29,6 +31,7 @@ export async function makeOpenAIAudioTranscriptionRequest(
     baseURL: proxyBaseUrl,
     dangerouslyAllowBrowser: true,
     defaultHeaders: buildPlaygroundHeaders(tags, customHeaders),
+    ...(onResponseHeaders ? { fetch: observeResponseHeaders(onResponseHeaders) } : {}),
   });
 
   try {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/embeddings_api.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/embeddings_api.tsx
index 51854cefcf0..94ba061a8b7 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/embeddings_api.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/embeddings_api.tsx
@@ -1,3 +1,4 @@
+import type { ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 import { toast } from "@/lib/toast";
 import { getGatewayBaseUrl, getGlobalLitellmHeaderName } from "@/components/networking";
 import {
@@ -14,6 +15,7 @@ export async function makeOpenAIEmbeddingsRequest(
   tags?: string[],
   customBaseUrl?: string,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ) {
   if (!accessToken) {
     throw new Error("Virtual Key is required");
@@ -43,6 +45,7 @@ export async function makeOpenAIEmbeddingsRequest(
         input,
       }),
     });
+    onResponseHeaders?.(response.headers);
 
     if (!response.ok) {
       const errorText = await response.text();
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/image_edits.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/image_edits.tsx
index d9211698fae..cc6ec1a0d95 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/image_edits.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/image_edits.tsx
@@ -1,3 +1,4 @@
+import { observeResponseHeaders, type ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 import openai from "openai";
 import { getGatewayBaseUrl } from "@/components/networking";
 import { buildPlaygroundHeaders, type CustomHeaders } from "@/components/llm_calls/request_headers";
@@ -13,6 +14,7 @@ export async function makeOpenAIImageEditsRequest(
   signal?: AbortSignal,
   customBaseUrl?: string,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ) {
   // base url should be the current base_url
   const isLocal = process.env.NODE_ENV === "development";
@@ -26,6 +28,7 @@ export async function makeOpenAIImageEditsRequest(
     baseURL: proxyBaseUrl,
     dangerouslyAllowBrowser: true,
     defaultHeaders: buildPlaygroundHeaders(tags, customHeaders),
+    ...(onResponseHeaders ? { fetch: observeResponseHeaders(onResponseHeaders) } : {}),
   });
 
   try {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/image_generation.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/image_generation.tsx
index 9f39e4ad33b..8955328e4a6 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/image_generation.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/image_generation.tsx
@@ -1,3 +1,4 @@
+import { observeResponseHeaders, type ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 import openai from "openai";
 import { getGatewayBaseUrl } from "@/components/networking";
 import { buildPlaygroundHeaders, type CustomHeaders } from "@/components/llm_calls/request_headers";
@@ -12,6 +13,7 @@ export async function makeOpenAIImageGenerationRequest(
   signal?: AbortSignal,
   customBaseUrl?: string,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ) {
   // base url should be the current base_url
   const isLocal = process.env.NODE_ENV === "development";
@@ -24,6 +26,7 @@ export async function makeOpenAIImageGenerationRequest(
     baseURL: proxyBaseUrl,
     dangerouslyAllowBrowser: true,
     defaultHeaders: buildPlaygroundHeaders(tags, customHeaders),
+    ...(onResponseHeaders ? { fetch: observeResponseHeaders(onResponseHeaders) } : {}),
   });
 
   try {
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/interactions_api.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/interactions_api.tsx
index 6414a9f3b93..d501175429e 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/interactions_api.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/llm_calls/interactions_api.tsx
@@ -1,3 +1,4 @@
+import type { ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 import { toast } from "@/lib/toast";
 import { getGatewayBaseUrl, getGlobalLitellmHeaderName } from "@/components/networking";
 import {
@@ -16,6 +17,7 @@ export async function makeInteractionsRequest(
   customBaseUrl?: string,
   previousInteractionId?: string,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ): Promise<void> {
   if (!accessToken) {
     throw new Error("Virtual Key is required");
@@ -51,6 +53,7 @@ export async function makeInteractionsRequest(
       body: JSON.stringify(body),
       signal,
     });
+    onResponseHeaders?.(response.headers);
 
     if (!response.ok) {
       const errorText = await response.text();
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/page.test.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/page.test.tsx
index 9d6d43de4d9..79fe9478814 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/page.test.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/page.test.tsx
@@ -22,8 +22,8 @@ vi.mock("@/utils/proxyUtils", () => ({
   fetchProxySettings: vi.fn().mockResolvedValue(null),
 }));
 
-vi.mock("@/app/(dashboard)/playground/components/chat_ui/ChatUI", () => ({
-  default: () => <div data-testid="chat-ui" />,
+vi.mock("@/app/(dashboard)/playground/components/chat/PlaygroundChat", () => ({
+  PlaygroundChat: () => <div data-testid="chat-ui" />,
 }));
 
 vi.mock("@/app/(dashboard)/playground/components/compareUI/CompareUI", () => ({
diff --git a/ui/litellm-dashboard/src/app/(dashboard)/playground/page.tsx b/ui/litellm-dashboard/src/app/(dashboard)/playground/page.tsx
index fa5f76317de..4adfbcd1911 100644
--- a/ui/litellm-dashboard/src/app/(dashboard)/playground/page.tsx
+++ b/ui/litellm-dashboard/src/app/(dashboard)/playground/page.tsx
@@ -1,23 +1,22 @@
 "use client";
 
 import { useState, useEffect } from "react";
+import { PlayCircle } from "lucide-react";
 import AgentBuilderView from "@/app/(dashboard)/playground/components/chat_ui/AgentBuilderView";
-import ChatUI from "@/app/(dashboard)/playground/components/chat_ui/ChatUI";
+import { PlaygroundChat, type ProxySettings } from "@/app/(dashboard)/playground/components/chat/PlaygroundChat";
 import CompareUI from "@/app/(dashboard)/playground/components/compareUI/CompareUI";
 import ComplianceUI from "@/app/(dashboard)/playground/components/complianceUI/ComplianceUI";
 import SystemOneUI from "@/app/(dashboard)/playground/components/systemOneUI/SystemOneUI";
 import BetaBadge from "@/components/BetaBadge";
 import useAuthorized from "@/app/(dashboard)/hooks/useAuthorized";
 import { fetchProxySettings } from "@/utils/proxyUtils";
-import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { useUrlTab } from "@/hooks/useUrlTab";
+import { Page, PageTabs, PageTabsContent, PageTabsList, PageTabsTrigger } from "@/components/shared/Page";
+import { PageHeader, PageHeaderDescription, PageHeaderTitle } from "@/components/shared/PageHeader";
 
 const PLAYGROUND_TABS = ["chat", "compare", "compliance", "system-one", "agent-builder"] as const;
 
-interface ProxySettings {
-  PROXY_BASE_URL?: string;
-  LITELLM_UI_API_DOC_BASE_URL?: string | null;
-}
+const TAB_TRIGGER = "h-full group-data-horizontal/tabs:after:-bottom-0.5";
 
 export default function PlaygroundPage() {
   const { accessToken, userRole, userId, disabledPersonalKeyCreation, token, isViewOnly } = useAuthorized();
@@ -52,53 +51,51 @@ export default function PlaygroundPage() {
   }
 
   return (
-    <div className="flex h-full min-h-0 w-full min-w-0 flex-col overflow-hidden">
-      <Tabs
-        value={activeTab}
-        onValueChange={setActiveTab}
-        className="flex min-h-0 min-w-0 flex-1 flex-col gap-0 overflow-hidden"
-      >
-        <TabsList variant="line" className="w-full shrink-0 justify-start overflow-x-auto pb-1">
-          <TabsTrigger value="chat" className="flex-none">
+    <Page className="h-full overflow-hidden pb-0 sm:pb-0">
+      <PageHeader>
+        <PageHeaderTitle>
+          <PlayCircle />
+          Playground
+        </PageHeaderTitle>
+        <PageHeaderDescription>
+          Send test requests through the gateway with any model, key, guardrail or tool
+        </PageHeaderDescription>
+      </PageHeader>
+      <PageTabs value={activeTab} onValueChange={setActiveTab} className="gap-0">
+        <PageTabsList>
+          <PageTabsTrigger value="chat" className={TAB_TRIGGER}>
             Chat
-          </TabsTrigger>
-          <TabsTrigger value="compare" className="flex-none">
+          </PageTabsTrigger>
+          <PageTabsTrigger value="compare" className={TAB_TRIGGER}>
             Compare
-          </TabsTrigger>
-          <TabsTrigger value="compliance" className="flex-none">
+          </PageTabsTrigger>
+          <PageTabsTrigger value="compliance" className={TAB_TRIGGER}>
             Compliance
-          </TabsTrigger>
-          <TabsTrigger value="system-one" className="flex-none">
+          </PageTabsTrigger>
+          <PageTabsTrigger value="system-one" className={TAB_TRIGGER}>
             <BetaBadge>Decisions</BetaBadge>
-          </TabsTrigger>
-          <TabsTrigger value="agent-builder" className="flex-none">
-            Agent Builder (Experimental)
-          </TabsTrigger>
-        </TabsList>
-        <TabsContent
-          value="chat"
-          className="mt-0 h-full min-h-0 min-w-0 overflow-hidden data-hidden:hidden"
-          keepMounted
-        >
-          <ChatUI
+          </PageTabsTrigger>
+          <PageTabsTrigger value="agent-builder" className={TAB_TRIGGER}>
+            Agent builder
+          </PageTabsTrigger>
+        </PageTabsList>
+        <PageTabsContent value="chat" className="overflow-hidden data-hidden:hidden" keepMounted>
+          <PlaygroundChat
             accessToken={accessToken}
-            token={token}
-            userRole={userRole}
-            userID={userId}
             disabledPersonalKeyCreation={disabledPersonalKeyCreation}
             proxySettings={proxySettings}
           />
-        </TabsContent>
-        <TabsContent value="compare" className="mt-0 h-full data-hidden:hidden" keepMounted>
+        </PageTabsContent>
+        <PageTabsContent value="compare" className="overflow-y-auto pt-4 data-hidden:hidden" keepMounted>
           <CompareUI accessToken={accessToken} disabledPersonalKeyCreation={disabledPersonalKeyCreation} />
-        </TabsContent>
-        <TabsContent value="compliance" className="mt-0 h-full data-hidden:hidden" keepMounted>
+        </PageTabsContent>
+        <PageTabsContent value="compliance" className="overflow-y-auto pt-4 data-hidden:hidden" keepMounted>
           <ComplianceUI accessToken={accessToken} disabledPersonalKeyCreation={disabledPersonalKeyCreation} />
-        </TabsContent>
-        <TabsContent value="system-one" className="mt-0 min-h-0 data-hidden:hidden" keepMounted>
+        </PageTabsContent>
+        <PageTabsContent value="system-one" className="overflow-y-auto pt-4 data-hidden:hidden" keepMounted>
           <SystemOneUI accessToken={accessToken} disabledPersonalKeyCreation={disabledPersonalKeyCreation} />
-        </TabsContent>
-        <TabsContent value="agent-builder" className="mt-0 h-full data-hidden:hidden" keepMounted>
+        </PageTabsContent>
+        <PageTabsContent value="agent-builder" className="overflow-y-auto pt-4 data-hidden:hidden" keepMounted>
           <AgentBuilderView
             accessToken={accessToken}
             token={token}
@@ -108,8 +105,8 @@ export default function PlaygroundPage() {
             proxySettings={proxySettings}
             customProxyBaseUrl={proxySettings?.LITELLM_UI_API_DOC_BASE_URL ?? proxySettings?.PROXY_BASE_URL}
           />
-        </TabsContent>
-      </Tabs>
-    </div>
+        </PageTabsContent>
+      </PageTabs>
+    </Page>
   );
 }
diff --git a/ui/litellm-dashboard/src/app/globals.css b/ui/litellm-dashboard/src/app/globals.css
index 57b8d0108ac..1534badbc7e 100644
--- a/ui/litellm-dashboard/src/app/globals.css
+++ b/ui/litellm-dashboard/src/app/globals.css
@@ -493,3 +493,199 @@
     left: 100%;
   }
 }
+
+@property --scroll-fade-b {
+  syntax: "<length-percentage>";
+  inherits: false;
+  initial-value: 0px;
+}
+
+@theme inline {
+  @keyframes scroll-fade-reveal-b {
+    from {
+      --scroll-fade-b: var(--_scroll-fade-size-b, var(--scroll-fade-size, min(12%, calc(var(--spacing) * 10))));
+    }
+    to {
+      --scroll-fade-b: 0px;
+    }
+  }
+}
+
+@utility scroll-fade-b {
+  --_scroll-fade-size-b: var(--scroll-fade-b-size, var(--scroll-fade-size, min(12%, calc(var(--spacing) * 10))));
+  --scroll-fade-mask: linear-gradient(to bottom, #000 0, #000 calc(100% - var(--scroll-fade-b, 0px)), transparent 100%);
+  -webkit-mask-image: var(--scroll-fade-mask);
+  mask-image: var(--scroll-fade-mask);
+  -webkit-mask-composite: source-in;
+  mask-composite: intersect;
+  -webkit-mask-repeat: no-repeat;
+  mask-repeat: no-repeat;
+
+  @supports (animation-timeline: scroll()) {
+    animation: scroll-fade-reveal-b 1ms ease-in-out;
+    animation-timeline: scroll(self y);
+    animation-range: calc(100% - var(--scroll-fade-reveal, calc(var(--spacing) * 24))) 100%;
+    animation-fill-mode: both;
+  }
+
+  @supports not (animation-timeline: scroll()) {
+    --scroll-fade-b: var(--_scroll-fade-size-b);
+  }
+}
+
+@property --scroll-fade-s {
+  syntax: "<length-percentage>";
+  inherits: false;
+  initial-value: 0px;
+}
+
+@theme inline {
+  @keyframes scroll-fade-reveal-s {
+    from {
+      --scroll-fade-s: 0px;
+    }
+    to {
+      --scroll-fade-s: var(--_scroll-fade-size-s, var(--scroll-fade-size, min(12%, calc(var(--spacing) * 10))));
+    }
+  }
+}
+
+@utility scroll-fade-x {
+  --_scroll-fade-size-s: var(--scroll-fade-s-size, var(--scroll-fade-size, min(12%, calc(var(--spacing) * 10))));
+  --_scroll-fade-size-e: var(--scroll-fade-e-size, var(--scroll-fade-size, min(12%, calc(var(--spacing) * 10))));
+  --scroll-fade-inline: linear-gradient(
+    to right,
+    transparent 0,
+    #000 var(--scroll-fade-s, 0px),
+    #000 calc(100% - var(--scroll-fade-e, 0px)),
+    transparent 100%
+  );
+  &:where([dir="rtl"], [dir="rtl"] *) {
+    --scroll-fade-inline: linear-gradient(
+      to left,
+      transparent 0,
+      #000 var(--scroll-fade-s, 0px),
+      #000 calc(100% - var(--scroll-fade-e, 0px)),
+      transparent 100%
+    );
+  }
+  -webkit-mask-image: var(--scroll-fade-mask, var(--scroll-fade-inline));
+  mask-image: var(--scroll-fade-mask, var(--scroll-fade-inline));
+  -webkit-mask-composite: source-in;
+  mask-composite: intersect;
+  -webkit-mask-repeat: no-repeat;
+  mask-repeat: no-repeat;
+
+  @supports (animation-timeline: scroll()) {
+    animation:
+      scroll-fade-reveal-s 1ms ease-in-out,
+      scroll-fade-reveal-e 1ms ease-in-out;
+    animation-timeline: scroll(self inline), scroll(self inline);
+    animation-range:
+      0 var(--scroll-fade-reveal, calc(var(--spacing) * 24)),
+      calc(100% - var(--scroll-fade-reveal, calc(var(--spacing) * 24))) 100%;
+    animation-fill-mode: both;
+  }
+
+  @supports not (animation-timeline: scroll()) {
+    --scroll-fade-s: var(--_scroll-fade-size-s);
+    --scroll-fade-e: var(--_scroll-fade-size-e);
+  }
+}
+
+@property --shimmer-angle {
+  syntax: "<angle>";
+  inherits: true;
+  initial-value: 20deg;
+}
+@property --shimmer-image {
+  syntax: "*";
+  inherits: false;
+}
+@property --shimmer-text-fill {
+  syntax: "*";
+  inherits: false;
+}
+
+@theme inline {
+  @keyframes tw-shimmer {
+    from {
+      background-position: 100% 0;
+    }
+    to {
+      background-position: 0 0;
+    }
+  }
+}
+
+@utility shimmer {
+  --_spread: var(--shimmer-spread, calc(3ch + 40px));
+  --_base: currentColor;
+  --_highlight: var(--shimmer-color, oklch(from currentColor l c h / calc(alpha * 0.2)));
+
+  background-image: var(
+    --shimmer-image,
+    linear-gradient(
+      calc(90deg + var(--shimmer-angle)),
+      var(--_base) calc(50% - var(--_spread)),
+      color-mix(in oklch, var(--_highlight), var(--_base) 50%) calc(50% - var(--_spread) * 0.5),
+      var(--_highlight) 50%,
+      color-mix(in oklch, var(--_highlight), var(--_base) 50%) calc(50% + var(--_spread) * 0.5),
+      var(--_base) calc(50% + var(--_spread))
+    )
+  );
+  background-repeat: no-repeat;
+  background-size: calc(200% + var(--_spread) * 2) 100%;
+  background-position: 0 0;
+  background-clip: text;
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: var(--shimmer-text-fill, transparent);
+  animation: tw-shimmer var(--shimmer-duration, 2s) linear infinite;
+
+  @variant dark {
+    --_highlight: var(--shimmer-color, oklch(from currentColor max(0.8, calc(l + 0.4)) c h / calc(alpha + 0.4)));
+  }
+
+  &:where([dir="rtl"], [dir="rtl"] *) {
+    animation-direction: reverse;
+  }
+}
+
+@utility shimmer-once {
+  animation-iteration-count: 1;
+}
+
+@utility shimmer-reverse {
+  animation-direction: reverse;
+}
+
+@utility shimmer-none {
+  --shimmer-image: none;
+  --shimmer-text-fill: currentColor;
+}
+
+@utility shimmer-color-* {
+  --shimmer-color: --value(--color, [color]);
+  --shimmer-color: color-mix(in oklch, --value(--color, [color]) calc(--modifier(integer) * 1%), transparent);
+}
+
+@utility shimmer-duration-* {
+  --shimmer-duration: calc(--value(integer) * 1ms);
+}
+
+@utility shimmer-spread-* {
+  --shimmer-spread: calc(var(--spacing) * --value(integer));
+  --shimmer-spread: --value([length], [percentage]);
+}
+
+@utility shimmer-angle-* {
+  --shimmer-angle: calc(--value(integer) * 1deg);
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .shimmer {
+    animation: none;
+    background-image: none;
+    -webkit-text-fill-color: currentColor;
+  }
+}
diff --git a/ui/litellm-dashboard/src/components/ModelInfoEditForm.test.tsx b/ui/litellm-dashboard/src/components/ModelInfoEditForm.test.tsx
index ecc0cea8bdf..77d36b7b9ef 100644
--- a/ui/litellm-dashboard/src/components/ModelInfoEditForm.test.tsx
+++ b/ui/litellm-dashboard/src/components/ModelInfoEditForm.test.tsx
@@ -1,10 +1,10 @@
-import { render, screen } from "@testing-library/react";
+import { fireEvent, render, screen } from "@testing-library/react";
 import userEvent, { PointerEventsCheckLevel } from "@testing-library/user-event";
 import { describe, expect, it, vi } from "vitest";
 
 import type { CredentialItem } from "@/components/networking";
 
-import ModelInfoEditForm from "./ModelInfoEditForm";
+import ModelInfoEditForm, { perMillionToPerToken } from "./ModelInfoEditForm";
 
 vi.mock("@/components/networking", async (importOriginal) => {
   const actual = await importOriginal<typeof import("@/components/networking")>();
@@ -55,6 +55,69 @@ const renderForm = ({
     />,
   );
 
+describe("perMillionToPerToken", () => {
+  it.each([
+    ["2.5", 0.0000025],
+    [3, 0.000003],
+    ["0", 0],
+    ["", null],
+    ["  ", null],
+    [null, null],
+    [undefined, null],
+  ])("parses %j into %j per token", (perMillion, perToken) => {
+    expect(perMillionToPerToken.parse(perMillion)).toBe(perToken);
+  });
+
+  it.each(["abc", "-1", -0.5, "Infinity", Number.NaN])("rejects %j", (perMillion) => {
+    expect(perMillionToPerToken.safeParse(perMillion).success).toBe(false);
+  });
+});
+
+describe("ModelInfoEditForm pricing fields", () => {
+  const storedPrices = {
+    model: "gpt-4o",
+    input_cost_per_token: 0.000003,
+    output_cost_per_token: 0.000015,
+    cache_read_input_token_cost: 0.0000003,
+  };
+
+  it("hands the submit handler per-token prices, with null for a cleared field", async () => {
+    const onSubmit = vi.fn().mockResolvedValue(undefined);
+    const user = userEvent.setup({ pointerEventsCheck: PointerEventsCheckLevel.Never });
+    renderForm({ onSubmit, litellmParams: storedPrices });
+
+    expect(screen.getByPlaceholderText("Enter input cost")).toHaveValue(3);
+    fireEvent.change(screen.getByPlaceholderText("Enter input cost"), { target: { value: "2.5" } });
+    fireEvent.change(screen.getByPlaceholderText("Enter output cost"), { target: { value: "" } });
+    await user.click(screen.getByRole("button", { name: /save changes/i }));
+
+    await vi.waitFor(() => expect(onSubmit).toHaveBeenCalledTimes(1));
+    const [values, isFieldTouched] = onSubmit.mock.calls[0];
+    const expectedPrices = {
+      input_cost: 0.0000025,
+      output_cost: null,
+      cache_read_cost: 0.0000003,
+      cache_write_cost: null,
+    };
+    expect(values).toMatchObject(expectedPrices);
+    expect(isFieldTouched("input_cost")).toBe(true);
+    expect(isFieldTouched("cache_read_cost")).toBe(false);
+  });
+
+  it("shows a field error and does not submit a negative price", async () => {
+    const onSubmit = vi.fn().mockResolvedValue(undefined);
+    const user = userEvent.setup({ pointerEventsCheck: PointerEventsCheckLevel.Never });
+    renderForm({ onSubmit, litellmParams: storedPrices });
+
+    fireEvent.change(screen.getByPlaceholderText("Enter output cost"), { target: { value: "-1" } });
+    await user.click(screen.getByRole("button", { name: /save changes/i }));
+
+    expect(await screen.findByText("Enter a price of 0 or more")).toBeInTheDocument();
+    expect(screen.getByPlaceholderText("Enter output cost")).toHaveAttribute("aria-invalid", "true");
+    expect(onSubmit).not.toHaveBeenCalled();
+  });
+});
+
 describe("ModelInfoEditForm existing-credentials picker", () => {
   it("shows the display name beside the credential name, searches by it, and submits the name", async () => {
     const onSubmit = vi.fn().mockResolvedValue(undefined);
diff --git a/ui/litellm-dashboard/src/components/ModelInfoEditForm.tsx b/ui/litellm-dashboard/src/components/ModelInfoEditForm.tsx
index c7860f35100..70fe23202bf 100644
--- a/ui/litellm-dashboard/src/components/ModelInfoEditForm.tsx
+++ b/ui/litellm-dashboard/src/components/ModelInfoEditForm.tsx
@@ -63,59 +63,35 @@ const PTU_EDIT_FIELDS: PtuEditField[] = [
   { name: PTU_END_FIELD, label: "PTU Effective To (UTC)", input: "datetime" },
 ];
 
-export type TouchedPricingField = "input_cost" | "output_cost" | "cache_read_cost" | "cache_write_cost";
-
-const PRICING_FIELDS: readonly TouchedPricingField[] = [
+const PRICING_FIELDS = [
   "input_cost",
   "output_cost",
   "cache_read_cost",
   "cache_write_cost",
+  "cache_write_cost_1h",
 ] as const;
+export type TouchedPricingField = (typeof PRICING_FIELDS)[number];
 
-const COST_SOURCES: Record<TouchedPricingField, { param: string; info: string }> = {
-  input_cost: { param: "input_cost_per_token", info: "input_cost_per_token" },
-  output_cost: { param: "output_cost_per_token", info: "output_cost_per_token" },
-  cache_read_cost: { param: "cache_read_input_token_cost", info: "cache_read_input_token_cost" },
-  cache_write_cost: { param: "cache_creation_input_token_cost", info: "cache_creation_input_token_cost" },
+const COST_SOURCES: Record<TouchedPricingField, string> = {
+  input_cost: "input_cost_per_token",
+  output_cost: "output_cost_per_token",
+  cache_read_cost: "cache_read_input_token_cost",
+  cache_write_cost: "cache_creation_input_token_cost",
+  cache_write_cost_1h: "cache_creation_input_token_cost_above_1hr",
 };
 
-export interface ModelEditFormValues {
-  model_name?: string;
-  litellm_model_name?: string;
-  api_base?: string;
-  custom_llm_provider?: string;
-  organization?: string;
-  tpm?: string | number | null;
-  rpm?: string | number | null;
-  max_retries?: string | number | null;
-  timeout?: string | number | null;
-  stream_timeout?: string | number | null;
-  input_cost?: string | number | null;
-  output_cost?: string | number | null;
-  cache_read_cost?: string | number | null;
-  cache_write_cost?: string | number | null;
-  ptu_count?: string | number | null;
-  cost_per_ptu_per_hour?: string | number | null;
-  ptu_effective_from?: Dayjs | null;
-  ptu_effective_to?: Dayjs | null;
-  cache_control?: boolean;
-  cache_control_injection_points?: CacheControlInjectionPoint[];
-  model_access_group?: string[];
-  guardrails?: string[];
-  vector_store_ids?: string[];
-  tags?: string[];
-  health_check_model?: string | null;
-  litellm_credential_name?: string | null;
-  litellm_extra_params?: string;
-  model_info?: string;
-  team_id?: string;
-}
-
-type ModelEditFieldName = keyof ModelEditFormValues;
-
 const scalar = z.union([z.string(), z.number(), z.null()]).optional();
 const textish = z.string().optional();
 
+const isBlank = (value: string | number | null | undefined): boolean => value == null || String(value).trim() === "";
+
+export const perMillionToPerToken = scalar
+  .refine(
+    (perMillion) => isBlank(perMillion) || (Number.isFinite(Number(perMillion)) && Number(perMillion) >= 0),
+    "Enter a price of 0 or more",
+  )
+  .transform((perMillion) => (isBlank(perMillion) ? null : Number(perMillion) / 1_000_000));
+
 const modelEditShape = {
   model_name: textish,
   litellm_model_name: textish,
@@ -127,10 +103,11 @@ const modelEditShape = {
   max_retries: scalar,
   timeout: scalar,
   stream_timeout: scalar,
-  input_cost: scalar,
-  output_cost: scalar,
-  cache_read_cost: scalar,
-  cache_write_cost: scalar,
+  input_cost: perMillionToPerToken,
+  output_cost: perMillionToPerToken,
+  cache_read_cost: perMillionToPerToken,
+  cache_write_cost: perMillionToPerToken,
+  cache_write_cost_1h: perMillionToPerToken,
   ptu_count: scalar,
   cost_per_ptu_per_hour: scalar,
   ptu_effective_from: z.custom<Dayjs | null>().nullish(),
@@ -148,6 +125,8 @@ const modelEditShape = {
   team_id: textish,
 };
 
+type ModelEditFieldName = keyof typeof modelEditShape;
+
 const isJson = (value: string): boolean => {
   try {
     JSON.parse(value);
@@ -207,6 +186,10 @@ const buildSchema = (ptuEnabled: boolean, isFieldTouched: (field: TouchedPricing
     }
   });
 
+type ModelEditSchema = ReturnType<typeof buildSchema>;
+export type ModelEditFormValues = z.input<ModelEditSchema>;
+export type ModelEditSubmitValues = z.output<ModelEditSchema>;
+
 const perMillionTokens = (...rates: (number | null | undefined)[]): number | null => {
   const rate = rates.find((candidate) => candidate != null);
   return rate == null ? null : rate * 1_000_000;
@@ -243,6 +226,10 @@ export const toModelEditFormValues = (localModelData: any, isWildcardModel: bool
     localModelData.litellm_params?.cache_creation_input_token_cost,
     localModelData.model_info?.cache_creation_input_token_cost,
   ),
+  cache_write_cost_1h: perMillionTokens(
+    localModelData.litellm_params?.cache_creation_input_token_cost_above_1hr,
+    localModelData.model_info?.cache_creation_input_token_cost_above_1hr,
+  ),
   cache_control: localModelData.litellm_params?.cache_control_injection_points ? true : false,
   cache_control_injection_points: localModelData.litellm_params?.cache_control_injection_points || [],
   model_access_group: Array.isArray(localModelData.model_info?.access_groups)
@@ -271,8 +258,8 @@ export const toModelEditFormValues = (localModelData: any, isWildcardModel: bool
 });
 
 const displayCost = (localModelData: any, field: TouchedPricingField): string => {
-  const { param, info } = COST_SOURCES[field];
-  const rate = localModelData?.litellm_params?.[param] ?? localModelData?.model_info?.[info];
+  const key = COST_SOURCES[field];
+  const rate = localModelData?.litellm_params?.[key] ?? localModelData?.model_info?.[key];
   return rate != null ? (Number(rate) * 1_000_000).toFixed(4) : "Not Set";
 };
 
@@ -288,7 +275,7 @@ interface ModelInfoEditFormProps {
   showCacheControl: boolean;
   setShowCacheControl: (checked: boolean) => void;
   onCancel: () => void;
-  onSubmit: (values: ModelEditFormValues, isFieldTouched: (field: TouchedPricingField) => boolean) => Promise<void>;
+  onSubmit: (values: ModelEditSubmitValues, isFieldTouched: (field: TouchedPricingField) => boolean) => Promise<void>;
   modelAccessGroups: string[] | null;
   guardrailsList: string[];
   tagsList: Record<string, Tag>;
@@ -376,10 +363,10 @@ const ModelInfoEditForm: React.FC<ModelInfoEditFormProps> = ({
   };
 
   // react-hook-form refreshes control._options every render, so this rebuild is what the next submit runs.
-  const resolver: Resolver<ModelEditFormValues> = (values, context, options) =>
+  const resolver: Resolver<ModelEditFormValues, unknown, ModelEditSubmitValues> = (values, context, options) =>
     zodResolver(buildSchema(ptuCostAttributionEnabled, isFieldTouched))(values, context, options);
 
-  const form = useForm<ModelEditFormValues>({
+  const form = useForm<ModelEditFormValues, unknown, ModelEditSubmitValues>({
     resolver,
     defaultValues: toModelEditFormValues(localModelData, isWildcardModel),
   });
@@ -527,6 +514,12 @@ const ModelInfoEditForm: React.FC<ModelInfoEditFormProps> = ({
               "Defaults to Input Cost if blank",
               "If left blank on save, defaults to Input Cost (backend falls back to input_cost_per_token).",
             )}
+            {pricingField(
+              "cache_write_cost_1h",
+              "Cache Write Cost (1 hour, per 1M tokens)",
+              "Defaults to the cost map 1 hour rate, else Cache Write Cost",
+              "Rate for prompt cache writes with a 1 hour TTL. If left blank on save, known models use their cost map 1 hour rate, otherwise Cache Write Cost.",
+            )}
 
             {textField("api_base", "API Base", "Enter API base", localModelData.litellm_params?.api_base)}
             {textField(
diff --git a/ui/litellm-dashboard/src/components/add_model/advanced_settings.test.tsx b/ui/litellm-dashboard/src/components/add_model/advanced_settings.test.tsx
index ceb9d1ca713..15a13219d18 100644
--- a/ui/litellm-dashboard/src/components/add_model/advanced_settings.test.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/advanced_settings.test.tsx
@@ -52,6 +52,17 @@ describe("AdvancedSettings", () => {
     });
   });
 
+  it("offers both cache write tiers once custom pricing is on", async () => {
+    renderAdvancedSettings();
+    act(() => {
+      fireEvent.click(screen.getByText("Advanced Settings"));
+    });
+    fireEvent.click(await screen.findByRole("switch", { name: "Custom Pricing" }));
+
+    expect(await screen.findByLabelText(/^Cache Write Cost \(per 1M tokens\)/)).toBeInTheDocument();
+    expect(screen.getByLabelText(/^Cache Write Cost \(1 hour, per 1M tokens\)/)).toBeInTheDocument();
+  });
+
   it("hides every PTU field when PTU cost attribution is disabled", async () => {
     renderAdvancedSettings();
     act(() => {
diff --git a/ui/litellm-dashboard/src/components/add_model/advanced_settings.tsx b/ui/litellm-dashboard/src/components/add_model/advanced_settings.tsx
index eb12e49ca89..6025db8e2e2 100644
--- a/ui/litellm-dashboard/src/components/add_model/advanced_settings.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/advanced_settings.tsx
@@ -49,6 +49,7 @@ const USAGE_COST_FIELDS = [
   "output_cost_per_token",
   "cache_read_input_token_cost",
   "cache_creation_input_token_cost",
+  "cache_creation_input_token_cost_above_1hr",
   "input_cost_per_second",
 ];
 
@@ -393,6 +394,25 @@ const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({
                         />
                       )}
                     </MountedFormField>
+                    <MountedFormField
+                      name="cache_creation_input_token_cost_above_1hr"
+                      label={labelWithHint(
+                        "Cache Write Cost (1 hour, per 1M tokens)",
+                        "Rate for prompt cache writes with a 1 hour TTL (Anthropic's cache_control ttl 1h). If left blank, known models use their cost map 1 hour rate, otherwise Cache Write Cost.",
+                      )}
+                      rules={usageCostRules}
+                      className="mb-4"
+                    >
+                      {(control) => (
+                        <Input
+                          id={control.id}
+                          value={(control.value as string | undefined) ?? ""}
+                          onChange={control.onChange}
+                          onBlur={control.onBlur}
+                          placeholder="Defaults to the cost map 1 hour rate, else Cache Write Cost"
+                        />
+                      )}
+                    </MountedFormField>
                   </>
                 ) : (
                   <MountedFormField
diff --git a/ui/litellm-dashboard/src/components/add_model/handle_add_model_submit.test.tsx b/ui/litellm-dashboard/src/components/add_model/handle_add_model_submit.test.tsx
index 0208acc841f..eafc069338d 100644
--- a/ui/litellm-dashboard/src/components/add_model/handle_add_model_submit.test.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/handle_add_model_submit.test.tsx
@@ -35,6 +35,61 @@ describe("prepareModelAddRequest", () => {
     expect(deployment.modelInfoObj.team_id).toBe("team-123");
   });
 
+  it("converts both cache write tiers from per-million to per-token", async () => {
+    const formValues = {
+      model_mappings: [{ public_name: "claude-sonnet", litellm_model: "anthropic/claude-sonnet-4-6" }],
+      model_name: "anthropic/claude-sonnet-4-6",
+      custom_pricing: true,
+      input_cost_per_token: "3",
+      output_cost_per_token: "15",
+      cache_creation_input_token_cost: "3.75",
+      cache_creation_input_token_cost_above_1hr: "6",
+    };
+
+    const [deployment] = (await prepareModelAddRequest({ ...formValues }, "token", null))!;
+
+    expect(deployment.litellmParamsObj.cache_creation_input_token_cost).toBeCloseTo(0.00000375, 12);
+    expect(deployment.litellmParamsObj.cache_creation_input_token_cost_above_1hr).toBeCloseTo(0.000006, 12);
+  });
+
+  it("converts the pricing once when several models are added together", async () => {
+    const formValues = {
+      model_mappings: [
+        { public_name: "claude-sonnet", litellm_model: "anthropic/claude-sonnet-4-6" },
+        { public_name: "claude-opus", litellm_model: "anthropic/claude-opus-4-2" },
+      ],
+      model_name: "anthropic/claude-sonnet-4-6",
+      custom_pricing: true,
+      input_cost_per_token: "3",
+      cache_creation_input_token_cost: "3.75",
+      cache_creation_input_token_cost_above_1hr: "6",
+    };
+
+    const deployments = (await prepareModelAddRequest({ ...formValues }, "token", null))!;
+
+    expect(deployments).toHaveLength(2);
+    for (const deployment of deployments) {
+      expect(deployment.litellmParamsObj.input_cost_per_token).toBeCloseTo(0.000003, 12);
+      expect(deployment.litellmParamsObj.cache_creation_input_token_cost).toBeCloseTo(0.00000375, 12);
+      expect(deployment.litellmParamsObj.cache_creation_input_token_cost_above_1hr).toBeCloseTo(0.000006, 12);
+    }
+  });
+
+  it("leaves the 1 hour cache write tier unset when its field is blank", async () => {
+    const formValues = {
+      model_mappings: [{ public_name: "claude-sonnet", litellm_model: "anthropic/claude-sonnet-4-6" }],
+      model_name: "anthropic/claude-sonnet-4-6",
+      custom_pricing: true,
+      cache_creation_input_token_cost: "3.75",
+      cache_creation_input_token_cost_above_1hr: "",
+    };
+
+    const [deployment] = (await prepareModelAddRequest({ ...formValues }, "token", null))!;
+
+    expect(deployment.litellmParamsObj).not.toHaveProperty("cache_creation_input_token_cost_above_1hr");
+    expect(deployment.litellmParamsObj.cache_creation_input_token_cost).toBeCloseTo(0.00000375, 12);
+  });
+
   it("uses a lowercase fallback for unrecognized custom providers", async () => {
     const fallbackValues = {
       model_mappings: [
diff --git a/ui/litellm-dashboard/src/components/add_model/handle_add_model_submit.tsx b/ui/litellm-dashboard/src/components/add_model/handle_add_model_submit.tsx
index 5f2747e0415..70b499b108a 100644
--- a/ui/litellm-dashboard/src/components/add_model/handle_add_model_submit.tsx
+++ b/ui/litellm-dashboard/src/components/add_model/handle_add_model_submit.tsx
@@ -24,6 +24,65 @@ export const prepareModelAddRequest = async (formValues: Record<string, any>, ac
       formValues["model"] = wildcardModel;
     }
 
+    // Handle pricing conversion before processing other fields
+    // Use explicit checks to allow 0 (zero cost models for budget bypass)
+    if (
+      formValues.input_cost_per_token !== undefined &&
+      formValues.input_cost_per_token !== null &&
+      formValues.input_cost_per_token !== ""
+    ) {
+      formValues.input_cost_per_token = Number(formValues.input_cost_per_token) / 1000000;
+    }
+    if (
+      formValues.output_cost_per_token !== undefined &&
+      formValues.output_cost_per_token !== null &&
+      formValues.output_cost_per_token !== ""
+    ) {
+      formValues.output_cost_per_token = Number(formValues.output_cost_per_token) / 1000000;
+    }
+
+    // Cache Read Cost: if blank, default to Input Cost (already token-unit converted above)
+    if (
+      formValues.cache_read_input_token_cost !== undefined &&
+      formValues.cache_read_input_token_cost !== null &&
+      formValues.cache_read_input_token_cost !== ""
+    ) {
+      formValues.cache_read_input_token_cost = Number(formValues.cache_read_input_token_cost) / 1000000;
+    } else if (
+      formValues.input_cost_per_token !== undefined &&
+      formValues.input_cost_per_token !== null &&
+      formValues.input_cost_per_token !== ""
+    ) {
+      formValues.cache_read_input_token_cost = Number(formValues.input_cost_per_token);
+    } else {
+      delete formValues.cache_read_input_token_cost;
+    }
+
+    // Cache Write Cost: explicit value if provided, else leave unset so the
+    // backend keeps the model-level default (per-second pricing, model_prices
+    // entries, etc.). Sending 0 here would overwrite that default.
+    // The backend falls back to input_cost_per_token when this key is absent.
+    if (
+      formValues.cache_creation_input_token_cost !== undefined &&
+      formValues.cache_creation_input_token_cost !== null &&
+      formValues.cache_creation_input_token_cost !== ""
+    ) {
+      formValues.cache_creation_input_token_cost = Number(formValues.cache_creation_input_token_cost) / 1000000;
+    } else {
+      delete formValues.cache_creation_input_token_cost;
+    }
+    if (
+      formValues.cache_creation_input_token_cost_above_1hr !== undefined &&
+      formValues.cache_creation_input_token_cost_above_1hr !== null &&
+      formValues.cache_creation_input_token_cost_above_1hr !== ""
+    ) {
+      formValues.cache_creation_input_token_cost_above_1hr =
+        Number(formValues.cache_creation_input_token_cost_above_1hr) / 1000000;
+    } else {
+      delete formValues.cache_creation_input_token_cost_above_1hr;
+    }
+    // Keep input_cost_per_second as is, no conversion needed
+
     // Create a deployment for each mapping
     const deployments = [];
     for (const mapping of modelMappings) {
@@ -34,55 +93,6 @@ export const prepareModelAddRequest = async (formValues: Record<string, any>, ac
       const modelName = mapping.public_name;
       litellmParamsObj["model"] = mapping.litellm_model;
 
-      // Handle pricing conversion before processing other fields
-      // Use explicit checks to allow 0 (zero cost models for budget bypass)
-      if (
-        formValues.input_cost_per_token !== undefined &&
-        formValues.input_cost_per_token !== null &&
-        formValues.input_cost_per_token !== ""
-      ) {
-        formValues.input_cost_per_token = Number(formValues.input_cost_per_token) / 1000000;
-      }
-      if (
-        formValues.output_cost_per_token !== undefined &&
-        formValues.output_cost_per_token !== null &&
-        formValues.output_cost_per_token !== ""
-      ) {
-        formValues.output_cost_per_token = Number(formValues.output_cost_per_token) / 1000000;
-      }
-
-      // Cache Read Cost: if blank, default to Input Cost (already token-unit converted above)
-      if (
-        formValues.cache_read_input_token_cost !== undefined &&
-        formValues.cache_read_input_token_cost !== null &&
-        formValues.cache_read_input_token_cost !== ""
-      ) {
-        formValues.cache_read_input_token_cost = Number(formValues.cache_read_input_token_cost) / 1000000;
-      } else if (
-        formValues.input_cost_per_token !== undefined &&
-        formValues.input_cost_per_token !== null &&
-        formValues.input_cost_per_token !== ""
-      ) {
-        formValues.cache_read_input_token_cost = Number(formValues.input_cost_per_token);
-      } else {
-        delete formValues.cache_read_input_token_cost;
-      }
-
-      // Cache Write Cost: explicit value if provided, else leave unset so the
-      // backend keeps the model-level default (per-second pricing, model_prices
-      // entries, etc.). Sending 0 here would overwrite that default.
-      // The backend falls back to input_cost_per_token when this key is absent.
-      if (
-        formValues.cache_creation_input_token_cost !== undefined &&
-        formValues.cache_creation_input_token_cost !== null &&
-        formValues.cache_creation_input_token_cost !== ""
-      ) {
-        formValues.cache_creation_input_token_cost = Number(formValues.cache_creation_input_token_cost) / 1000000;
-      } else {
-        delete formValues.cache_creation_input_token_cost;
-      }
-      // Keep input_cost_per_second as is, no conversion needed
-
       // Iterate through the key-value pairs in formValues
       litellmParamsObj["model"] = mapping.litellm_model;
       for (const [key, value] of Object.entries(formValues)) {
@@ -155,7 +165,8 @@ export const prepareModelAddRequest = async (formValues: Record<string, any>, ac
           key === "output_cost_per_token" ||
           key === "input_cost_per_second" ||
           key === "cache_read_input_token_cost" ||
-          key === "cache_creation_input_token_cost"
+          key === "cache_creation_input_token_cost" ||
+          key === "cache_creation_input_token_cost_above_1hr"
         ) {
           if (value !== undefined && value !== null && value !== "") {
             litellmParamsObj[key] = Number(value);
diff --git a/ui/litellm-dashboard/src/components/chat_ui/types.ts b/ui/litellm-dashboard/src/components/chat_ui/types.ts
index e208377674a..639a42d6dd6 100644
--- a/ui/litellm-dashboard/src/components/chat_ui/types.ts
+++ b/ui/litellm-dashboard/src/components/chat_ui/types.ts
@@ -1,4 +1,5 @@
 import type { TokenUsage } from "./ResponseMetrics";
+import type { GatewayTrace } from "@/components/llm_calls/reply_trace";
 
 export interface VectorStoreSearchResult {
   score: number;
@@ -25,6 +26,25 @@ export interface A2ATaskMetadata {
   metadata?: Record<string, any>;
 }
 
+export type ReplyTrace = Partial<GatewayTrace> &
+  Readonly<{
+    endpoint: string;
+    requestedModel?: string;
+    responseId?: string;
+  }>;
+
+export type MessageAttachment = Readonly<{
+  name: string;
+  size: number;
+  kind: "image" | "pdf" | "audio";
+  previewUrl?: string;
+}>;
+
+export type McpToolCallDisplay = Readonly<{
+  tool: string;
+  arguments: Readonly<Record<string, unknown>>;
+}>;
+
 export interface MessageType {
   role: string;
   content: string | MultimodalContent[];
@@ -44,6 +64,10 @@ export interface MessageType {
   };
   searchResults?: VectorStoreSearchResponse[];
   a2aMetadata?: A2ATaskMetadata;
+  trace?: ReplyTrace;
+  attachments?: readonly MessageAttachment[];
+  mcpToolCall?: McpToolCallDisplay;
+  isError?: boolean;
 }
 
 export interface MultimodalContent {
diff --git a/ui/litellm-dashboard/src/components/llm_calls/chat_completion.tsx b/ui/litellm-dashboard/src/components/llm_calls/chat_completion.tsx
index 1c4eb65032b..b12a347e34d 100644
--- a/ui/litellm-dashboard/src/components/llm_calls/chat_completion.tsx
+++ b/ui/litellm-dashboard/src/components/llm_calls/chat_completion.tsx
@@ -6,6 +6,7 @@ import { extractPromptCacheTokens } from "@/utils/promptCacheUsage";
 import { parseUsageCost } from "./usage_cost";
 import { buildPlaygroundHeaders, type CustomHeaders } from "./request_headers";
 import { createGatewayClient } from "./gateway_client";
+import { observeResponseHeaders, type ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 
 const completionAsSingleChunk = (completion: ChatCompletion): ChatCompletionChunk =>
   ({
@@ -51,6 +52,7 @@ export async function makeOpenAIChatCompletionRequest(
   mcpToolsets?: MCPToolset[],
   streamingEnabled: boolean = true,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ) {
   // base url should be the current base_url
   const isLocal = process.env.NODE_ENV === "development";
@@ -59,11 +61,13 @@ export async function makeOpenAIChatCompletionRequest(
   }
   const headers = buildPlaygroundHeaders(tags, customHeaders);
 
-  const client = createGatewayClient({
+  const clientOptions = {
     accessToken,
     baseURL: customBaseUrl,
     defaultHeaders: headers,
-  });
+    ...(onResponseHeaders ? { fetch: observeResponseHeaders(onResponseHeaders) } : {}),
+  };
+  const client = createGatewayClient(clientOptions);
 
   try {
     const startTime = Date.now();
@@ -86,12 +90,13 @@ export async function makeOpenAIChatCompletionRequest(
     if (selectedMCPServers && selectedMCPServers.length > 0) {
       if (selectedMCPServers.includes("__all__")) {
         // All MCP Servers selected
-        tools.push({
+        const allServersTool = {
           type: "mcp",
           server_label: "litellm",
           server_url: "litellm_proxy/mcp",
           require_approval: "never",
-        });
+        };
+        tools.push(allServersTool);
       } else {
         // Individual servers/toolsets selected - create one entry per item
         selectedMCPServers.forEach((serverId) => {
@@ -99,24 +104,26 @@ export async function makeOpenAIChatCompletionRequest(
             const toolsetId = serverId.slice("toolset:".length);
             const toolset = mcpToolsets?.find((t) => t.toolset_id === toolsetId);
             const toolsetName = toolset?.toolset_name || toolsetId;
-            tools.push({
+            const toolsetTool = {
               type: "mcp",
               server_label: toolsetName,
               server_url: `litellm_proxy/mcp/${encodeURIComponent(toolsetName)}`,
               require_approval: "never",
-            });
+            };
+            tools.push(toolsetTool);
           } else {
             const server = mcpServers?.find((s) => s.server_id === serverId);
             const serverName = server?.alias || server?.server_name || serverId;
             const allowedTools = mcpServerToolRestrictions?.[serverId] || [];
 
-            tools.push({
+            const serverTool = {
               type: "mcp",
               server_label: "litellm",
               server_url: `litellm_proxy/mcp/${serverName}`,
               require_approval: "never",
               ...(allowedTools.length > 0 ? { allowed_tools: allowedTools } : {}),
-            });
+            };
+            tools.push(serverTool);
           }
         });
       }
diff --git a/ui/litellm-dashboard/src/components/llm_calls/reply_trace.test.ts b/ui/litellm-dashboard/src/components/llm_calls/reply_trace.test.ts
new file mode 100644
index 00000000000..0d5c4715d68
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/llm_calls/reply_trace.test.ts
@@ -0,0 +1,64 @@
+import { describe, expect, it } from "vitest";
+import { gatewayTraceFromHeaders } from "./reply_trace";
+
+describe("gatewayTraceFromHeaders", () => {
+  it("reads routing, timing, cost and guardrail details from the gateway headers", () => {
+    const headers = new Headers([
+      ["x-litellm-call-id", "call-1"],
+      ["x-litellm-model-group", "fast"],
+      ["x-litellm-model-id", "deployment-1"],
+      ["x-litellm-model-name", "provider/model-a"],
+      ["x-litellm-model-api-base", "https://provider.test/v1"],
+      ["x-litellm-attempted-fallbacks", "1"],
+      ["x-litellm-attempted-retries", "2"],
+      ["x-litellm-overhead-duration-ms", "12.5"],
+      ["x-litellm-response-duration-ms", "840"],
+      ["x-litellm-response-cost", "0.0004"],
+      ["x-litellm-applied-guardrails", "pii-mask, toxicity"],
+      ["x-litellm-applied-policies", "strict"],
+      ["x-litellm-cache-key", "abc"],
+    ]);
+    const trace = gatewayTraceFromHeaders(headers);
+
+    const expected = {
+      callId: "call-1",
+      modelGroup: "fast",
+      deploymentId: "deployment-1",
+      providerModel: "provider/model-a",
+      apiBase: "https://provider.test/v1",
+      attemptedFallbacks: 1,
+      attemptedRetries: 2,
+      overheadMs: 12.5,
+      responseMs: 840,
+      cost: 0.0004,
+      appliedGuardrails: ["pii-mask", "toxicity"],
+      appliedPolicies: ["strict"],
+      cacheHit: true,
+    };
+    expect(trace).toEqual(expected);
+  });
+
+  it("leaves details unset when headers are missing, blank or not numeric", () => {
+    const trace = gatewayTraceFromHeaders(
+      new Headers({
+        "x-litellm-model-group": "  ",
+        "x-litellm-attempted-fallbacks": "none",
+        "x-litellm-applied-guardrails": " , ",
+      }),
+    );
+
+    expect(trace.modelGroup).toBeUndefined();
+    expect(trace.attemptedFallbacks).toBeUndefined();
+    expect(trace.appliedGuardrails).toEqual([]);
+    expect(trace.cacheHit).toBe(false);
+  });
+
+  it("leaves policies unknown when the gateway's own headers are hidden from the page", () => {
+    const hidden = gatewayTraceFromHeaders(new Headers({ "x-litellm-applied-guardrails": "pii-mask" }));
+    const visible = gatewayTraceFromHeaders(new Headers({ "x-litellm-call-id": "call-1" }));
+
+    expect(hidden.appliedGuardrails).toEqual(["pii-mask"]);
+    expect(hidden.appliedPolicies).toBeUndefined();
+    expect(visible.appliedPolicies).toEqual([]);
+  });
+});
diff --git a/ui/litellm-dashboard/src/components/llm_calls/reply_trace.ts b/ui/litellm-dashboard/src/components/llm_calls/reply_trace.ts
new file mode 100644
index 00000000000..9beb79c7fc6
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/llm_calls/reply_trace.ts
@@ -0,0 +1,49 @@
+export type GatewayTrace = Readonly<{
+  callId?: string;
+  modelGroup?: string;
+  deploymentId?: string;
+  providerModel?: string;
+  apiBase?: string;
+  attemptedFallbacks?: number;
+  attemptedRetries?: number;
+  overheadMs?: number;
+  responseMs?: number;
+  cost?: number;
+  appliedGuardrails: readonly string[];
+  appliedPolicies?: readonly string[];
+  cacheHit: boolean;
+}>;
+
+const text = (headers: Headers, name: string): string | undefined => {
+  const value = headers.get(name)?.trim();
+  return value ? value : undefined;
+};
+
+const number = (headers: Headers, name: string): number | undefined => {
+  const value = text(headers, name);
+  if (value === undefined) return undefined;
+  const parsed = Number(value);
+  return Number.isFinite(parsed) ? parsed : undefined;
+};
+
+const list = (headers: Headers, name: string): readonly string[] =>
+  (text(headers, name) ?? "")
+    .split(",")
+    .map((item) => item.trim())
+    .filter((item) => item !== "");
+
+export const gatewayTraceFromHeaders = (headers: Headers): GatewayTrace => ({
+  callId: text(headers, "x-litellm-call-id"),
+  modelGroup: text(headers, "x-litellm-model-group"),
+  deploymentId: text(headers, "x-litellm-model-id"),
+  providerModel: text(headers, "x-litellm-model-name"),
+  apiBase: text(headers, "x-litellm-model-api-base"),
+  attemptedFallbacks: number(headers, "x-litellm-attempted-fallbacks"),
+  attemptedRetries: number(headers, "x-litellm-attempted-retries"),
+  overheadMs: number(headers, "x-litellm-overhead-duration-ms"),
+  responseMs: number(headers, "x-litellm-response-duration-ms"),
+  cost: number(headers, "x-litellm-response-cost"),
+  appliedGuardrails: list(headers, "x-litellm-applied-guardrails"),
+  appliedPolicies: headers.has("x-litellm-call-id") ? list(headers, "x-litellm-applied-policies") : undefined,
+  cacheHit: text(headers, "x-litellm-cache-key") !== undefined,
+});
diff --git a/ui/litellm-dashboard/src/components/llm_calls/responses_api.tsx b/ui/litellm-dashboard/src/components/llm_calls/responses_api.tsx
index 1f717e488e9..9eb85bc624e 100644
--- a/ui/litellm-dashboard/src/components/llm_calls/responses_api.tsx
+++ b/ui/litellm-dashboard/src/components/llm_calls/responses_api.tsx
@@ -1,3 +1,4 @@
+import { observeResponseHeaders, type ResponseHeadersListener } from "@/lib/http/observeResponseHeaders";
 import openai from "openai";
 import { MessageType } from "../chat_ui/types";
 import { TokenUsage } from "../chat_ui/ResponseMetrics";
@@ -87,6 +88,7 @@ export async function makeOpenAIResponsesRequest(
   streamingEnabled: boolean = true,
   onTotalLatency?: (latency: number) => void,
   customHeaders?: CustomHeaders,
+  onResponseHeaders?: ResponseHeadersListener,
 ) {
   if (!accessToken) {
     throw new Error("Virtual Key is required");
@@ -111,6 +113,7 @@ export async function makeOpenAIResponsesRequest(
     baseURL: proxyBaseUrl,
     dangerouslyAllowBrowser: true,
     defaultHeaders: headers,
+    ...(onResponseHeaders ? { fetch: observeResponseHeaders(onResponseHeaders) } : {}),
   });
 
   try {
@@ -143,12 +146,13 @@ export async function makeOpenAIResponsesRequest(
     if (selectedMCPServers && selectedMCPServers.length > 0) {
       if (selectedMCPServers.includes("__all__")) {
         // All MCP Servers selected
-        tools.push({
+        const allServersTool = {
           type: "mcp",
           server_label: "litellm",
           server_url: `${mcpBaseUrl}/mcp`,
           require_approval: "never",
-        });
+        };
+        tools.push(allServersTool);
       } else {
         // Individual servers/toolsets selected - create one entry per item
         selectedMCPServers.forEach((serverId) => {
@@ -157,12 +161,13 @@ export async function makeOpenAIResponsesRequest(
             const toolsetId = serverId.slice("toolset:".length);
             const toolset = mcpToolsets?.find((t) => t.toolset_id === toolsetId);
             const toolsetName = toolset?.toolset_name || toolsetId;
-            tools.push({
+            const toolsetTool = {
               type: "mcp",
               server_label: toolsetName,
               server_url: `${mcpBaseUrl}/mcp/${encodeURIComponent(toolsetName)}`,
               require_approval: "never",
-            });
+            };
+            tools.push(toolsetTool);
           } else {
             const server = mcpServers?.find((s) => s.server_id === serverId);
             // Use server_name for both routing and labelling. server_name is the
@@ -170,13 +175,14 @@ export async function makeOpenAIResponsesRequest(
             const routeName = server?.server_name || serverId;
             const allowedTools = mcpServerToolRestrictions?.[serverId] || [];
 
-            tools.push({
+            const serverTool = {
               type: "mcp",
               server_label: routeName, // unique per request — collisions cause silent tool-routing failures
               server_url: `${mcpBaseUrl}/mcp/${encodeURIComponent(routeName)}`,
               require_approval: "never",
               ...(allowedTools.length > 0 ? { allowed_tools: allowedTools } : {}),
-            });
+            };
+            tools.push(serverTool);
           }
         });
       }
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/types.test.tsx b/ui/litellm-dashboard/src/components/mcp_tools/types.test.tsx
index 10a1bb4b669..f555fc1efa9 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/types.test.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/types.test.tsx
@@ -333,6 +333,14 @@ describe("preservedAdminCredentials vs preservedDeclaredAppCredentials", () => {
     expect(preservedAdminCredentials(credentials)).toEqual({ client_id: "cid", upstream_resource: "auto" });
   });
 
+  it("preserves admin-typed scopes and drops blank ones", () => {
+    expect(preservedAdminCredentials({ client_id: "cid", scopes: ["api://mcp/.default", ""] })).toEqual({
+      client_id: "cid",
+      scopes: ["api://mcp/.default"],
+    });
+    expect(preservedAdminCredentials({ client_id: "cid", scopes: [] })).toEqual({ client_id: "cid" });
+  });
+
   // The two helpers answer different questions and must not be collapsed: "has the admin declared an
   // OAuth app" gates the app-may-not-match-upstream warning, so a resource-only server must read as
   // having no declared app.
diff --git a/ui/litellm-dashboard/src/components/mcp_tools/types.tsx b/ui/litellm-dashboard/src/components/mcp_tools/types.tsx
index 2a6b3f2793b..22fd64f10d8 100644
--- a/ui/litellm-dashboard/src/components/mcp_tools/types.tsx
+++ b/ui/litellm-dashboard/src/components/mcp_tools/types.tsx
@@ -181,10 +181,23 @@ export const preservedDeclaredAppCredentials = (
 // Everything the admin typed into `credentials` and nothing minted: the declared app plus the config
 // keys. This is what must survive the invalidation reset and what a client-forwarded row may persist,
 // so dropping a key from here silently discards admin input on an unrelated edit.
+const adminScopes = (value: unknown): string[] | undefined => {
+  if (!Array.isArray(value)) return undefined;
+  const kept = value.filter((scope): scope is string => typeof scope === "string" && scope !== "");
+  return kept.length > 0 ? kept : undefined;
+};
+
 export const preservedAdminCredentials = (
   credentials: Record<string, unknown> | null | undefined,
-): Record<string, string> | undefined =>
-  pickStringCredentials(credentials, [...DECLARED_APP_CREDENTIAL_KEYS, ...ADMIN_CONFIG_CREDENTIAL_KEYS]);
+): Record<string, string | string[]> | undefined => {
+  const strings = pickStringCredentials(credentials, [
+    ...DECLARED_APP_CREDENTIAL_KEYS,
+    ...ADMIN_CONFIG_CREDENTIAL_KEYS,
+  ]);
+  const scopes = adminScopes(credentials?.scopes);
+  if (scopes === undefined) return strings;
+  return { ...(strings ?? {}), scopes };
+};
 
 // Drop minted token keys, keeping everything else (the declared app plus any non-token config).
 export const withoutMintedTokenCredentials = (
diff --git a/ui/litellm-dashboard/src/components/model_info_view.test.tsx b/ui/litellm-dashboard/src/components/model_info_view.test.tsx
index 79717988292..6e7bc9a86d7 100644
--- a/ui/litellm-dashboard/src/components/model_info_view.test.tsx
+++ b/ui/litellm-dashboard/src/components/model_info_view.test.tsx
@@ -1695,13 +1695,54 @@ describe("ModelInfoView", () => {
       const [cacheRead, cacheWrite] = screen.getAllByPlaceholderText("Defaults to Input Cost if blank");
       await user.type(cacheRead, "5");
       await user.type(cacheWrite, "9");
+      await user.type(screen.getByPlaceholderText("Defaults to the cost map 1 hour rate, else Cache Write Cost"), "15");
 
       const payload = await save(user);
 
-      expect(payload.litellm_params).toMatchObject({
+      const expectedPricing = {
         output_cost_per_token: 0.000012,
         cache_read_input_token_cost: 0.000005,
         cache_creation_input_token_cost: 0.000009,
+        cache_creation_input_token_cost_above_1hr: 0.000015,
+      };
+      expect(payload.litellm_params).toMatchObject(expectedPricing);
+    });
+
+    describe("1 hour cache write tier", () => {
+      const withCacheWriteTiers = {
+        ...defaultModelData,
+        litellm_params: {
+          ...defaultModelData.litellm_params,
+          cache_creation_input_token_cost: 0.00000375,
+          cache_creation_input_token_cost_above_1hr: 0.000006,
+        },
+      };
+
+      beforeEach(() => {
+        mockUseModelsInfo.mockReturnValue({ data: { data: [withCacheWriteTiers] }, isLoading: false, error: null });
+        mockModelInfoV1Call.mockResolvedValue({ data: [withCacheWriteTiers] });
+      });
+
+      it("shows both configured cache write rates per million tokens", async () => {
+        render(<ModelInfoView {...DEFAULT_ADMIN_PROPS} />, { wrapper });
+
+        expect(await screen.findByText("Cache Write Cost (1 hour, per 1M tokens)")).toBeInTheDocument();
+        expect(screen.getByText("3.7500")).toBeInTheDocument();
+        expect(screen.getByText("6.0000")).toBeInTheDocument();
+      });
+
+      it("clearing the 1 hour rate sends an explicit null and keeps the 5 minute rate", async () => {
+        const user = userEvent.setup();
+        await enterEditMode(user);
+
+        const oneHour = screen.getByPlaceholderText("Defaults to the cost map 1 hour rate, else Cache Write Cost");
+        expect(oneHour).toHaveValue(6);
+        await user.clear(oneHour);
+
+        const payload = await save(user);
+
+        expect(payload.litellm_params.cache_creation_input_token_cost_above_1hr).toBeNull();
+        expect(payload.litellm_params.cache_creation_input_token_cost).toBe(0.00000375);
       });
     });
 
@@ -2107,6 +2148,72 @@ describe("ModelInfoView", () => {
       expect(payload.litellm_params.input_cost_per_token).toBe(5 / 1_000_000);
     });
 
+    const pricingInputs = () => [
+      screen.getByPlaceholderText("Enter input cost"),
+      screen.getByPlaceholderText("Enter output cost"),
+      ...screen.getAllByPlaceholderText("Defaults to Input Cost if blank"),
+      screen.getByPlaceholderText("Defaults to the cost map 1 hour rate, else Cache Write Cost"),
+    ];
+
+    it("refuses a negative price on every pricing field and never calls the API", async () => {
+      const user = userEvent.setup();
+      await enterEditMode(user);
+      for (const input of pricingInputs()) {
+        fireEvent.change(input, { target: { value: "-5" } });
+      }
+
+      await user.click(screen.getByRole("button", { name: /save changes/i }));
+
+      expect(await screen.findAllByText("Enter a price of 0 or more")).toHaveLength(5);
+      expect(mockModelPatchUpdateCall).not.toHaveBeenCalled();
+    });
+
+    it("sends a zero price as 0 and lets the cache read cost follow a zero input cost", async () => {
+      const user = userEvent.setup();
+      await enterEditMode(user);
+      setInputCost("0");
+      fireEvent.change(screen.getByPlaceholderText("Enter output cost"), { target: { value: "0" } });
+
+      const payload = await save(user);
+
+      expect(payload.litellm_params).toMatchObject({
+        input_cost_per_token: 0,
+        output_cost_per_token: 0,
+        cache_read_input_token_cost: 0,
+      });
+    });
+
+    it("sends an explicit null for a cleared cache read cost instead of falling back to the input cost", async () => {
+      const user = userEvent.setup();
+      await enterEditMode(user);
+      setInputCost("2");
+      const [cacheRead] = screen.getAllByPlaceholderText("Defaults to Input Cost if blank");
+      fireEvent.change(cacheRead, { target: { value: "1" } });
+      fireEvent.change(cacheRead, { target: { value: "" } });
+
+      const payload = await save(user);
+
+      expect(payload.litellm_params.input_cost_per_token).toBe(0.000002);
+      expect(payload.litellm_params.cache_read_input_token_cost).toBeNull();
+    });
+
+    it("keeps a stored cache read cost when only the input cost changes", async () => {
+      const withCacheRead = {
+        ...defaultModelData,
+        litellm_params: { ...defaultModelData.litellm_params, cache_read_input_token_cost: 0.000001 },
+      };
+      mockUseModelsInfo.mockReturnValue({ data: { data: [withCacheRead] }, isLoading: false, error: null });
+      mockModelInfoV1Call.mockResolvedValue({ data: [withCacheRead] });
+      const user = userEvent.setup();
+      await enterEditMode(user);
+      setInputCost("2");
+
+      const payload = await save(user);
+
+      expect(payload.litellm_params.input_cost_per_token).toBe(0.000002);
+      expect(payload.litellm_params.cache_read_input_token_cost).toBe(0.000001);
+    });
+
     it.fails(
       "sends only the edited input cost (expected to fail until the forms revamp, tri-state PATCH tracker)",
       async () => {
diff --git a/ui/litellm-dashboard/src/components/model_info_view.tsx b/ui/litellm-dashboard/src/components/model_info_view.tsx
index 21fad41b2e5..ae34b17d0e8 100644
--- a/ui/litellm-dashboard/src/components/model_info_view.tsx
+++ b/ui/litellm-dashboard/src/components/model_info_view.tsx
@@ -46,7 +46,7 @@ import {
 import { Logo } from "@/components/molecules/logo/Logo";
 import { ModelPricingSummary } from "@/components/molecules/models/ModelPricingSummary";
 import UpdateModelCredentialsModal from "./update_model_credentials_modal";
-import ModelInfoEditForm, { type ModelEditFormValues, type TouchedPricingField } from "./ModelInfoEditForm";
+import ModelInfoEditForm, { type ModelEditSubmitValues, type TouchedPricingField } from "./ModelInfoEditForm";
 import { Tag } from "./tag_management/types";
 import { getDisplayModelName } from "./view_model/model_name_display";
 import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from "@/components/ui/dialog";
@@ -262,7 +262,7 @@ export default function ModelInfoView({
   };
 
   const handleModelUpdate = async (
-    values: ModelEditFormValues,
+    values: ModelEditSubmitValues,
     isFieldTouched: (field: TouchedPricingField) => boolean,
   ) => {
     try {
@@ -295,51 +295,24 @@ export default function ModelInfoView({
       };
 
       if (isFieldTouched("input_cost")) {
-        if (values.input_cost !== undefined && values.input_cost !== null && values.input_cost !== "") {
-          updatedLitellmParams.input_cost_per_token = Number(values.input_cost) / 1_000_000;
-        } else {
-          // Explicit null signals the backend to remove the pricing override.
-          updatedLitellmParams.input_cost_per_token = null;
-        }
+        updatedLitellmParams.input_cost_per_token = values.input_cost;
       }
       if (isFieldTouched("output_cost")) {
-        if (values.output_cost !== undefined && values.output_cost !== null && values.output_cost !== "") {
-          updatedLitellmParams.output_cost_per_token = Number(values.output_cost) / 1_000_000;
-        } else {
-          updatedLitellmParams.output_cost_per_token = null;
+        updatedLitellmParams.output_cost_per_token = values.output_cost;
+      }
+      if (isFieldTouched("cache_read_cost")) {
+        updatedLitellmParams.cache_read_input_token_cost = values.cache_read_cost;
+      } else if (isFieldTouched("input_cost")) {
+        const cacheReadCost = values.cache_read_cost ?? values.input_cost;
+        if (cacheReadCost !== null) {
+          updatedLitellmParams.cache_read_input_token_cost = cacheReadCost;
         }
       }
-
-      // Cache Read Cost:
-      //   - explicit value provided → use it
-      //   - field touched but empty → explicit null (signals backend to remove override)
-      //   - only input_cost touched → fall back to input_cost (guarded against null)
-      if (isFieldTouched("cache_read_cost") || isFieldTouched("input_cost")) {
-        if (values.cache_read_cost !== undefined && values.cache_read_cost !== null && values.cache_read_cost !== "") {
-          updatedLitellmParams.cache_read_input_token_cost = Number(values.cache_read_cost) / 1_000_000;
-        } else if (isFieldTouched("cache_read_cost")) {
-          updatedLitellmParams.cache_read_input_token_cost = null;
-        } else if (
-          updatedLitellmParams.input_cost_per_token !== undefined &&
-          updatedLitellmParams.input_cost_per_token !== null
-        ) {
-          updatedLitellmParams.cache_read_input_token_cost = updatedLitellmParams.input_cost_per_token;
-        }
-      }
-
-      // Cache Write Cost: explicit value if provided, else explicit null so the
-      // backend removes the override and falls back to the model-level default.
-      // Sending 0 here would persist a zero rate even when the user intended to unset it.
       if (isFieldTouched("cache_write_cost")) {
-        if (
-          values.cache_write_cost !== undefined &&
-          values.cache_write_cost !== null &&
-          values.cache_write_cost !== ""
-        ) {
-          updatedLitellmParams.cache_creation_input_token_cost = Number(values.cache_write_cost) / 1_000_000;
-        } else {
-          updatedLitellmParams.cache_creation_input_token_cost = null;
-        }
+        updatedLitellmParams.cache_creation_input_token_cost = values.cache_write_cost;
+      }
+      if (isFieldTouched("cache_write_cost_1h")) {
+        updatedLitellmParams.cache_creation_input_token_cost_above_1hr = values.cache_write_cost_1h;
       }
 
       const storedCredentialName: string | null = localModelData?.litellm_params?.litellm_credential_name ?? null;
diff --git a/ui/litellm-dashboard/src/components/ui/accordion.tsx b/ui/litellm-dashboard/src/components/ui/accordion.tsx
new file mode 100644
index 00000000000..7138415251f
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/accordion.tsx
@@ -0,0 +1,59 @@
+import { Accordion as AccordionPrimitive } from "@base-ui/react/accordion";
+import { cn } from "@/lib/cva.config";
+import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
+
+function Accordion({ className, ...props }: AccordionPrimitive.Root.Props) {
+  return <AccordionPrimitive.Root data-slot="accordion" className={cn("flex w-full flex-col", className)} {...props} />;
+}
+
+function AccordionItem({ className, ...props }: AccordionPrimitive.Item.Props) {
+  return (
+    <AccordionPrimitive.Item data-slot="accordion-item" className={cn("not-last:border-b", className)} {...props} />
+  );
+}
+
+function AccordionTrigger({ className, children, ...props }: AccordionPrimitive.Trigger.Props) {
+  return (
+    <AccordionPrimitive.Header className="flex">
+      <AccordionPrimitive.Trigger
+        data-slot="accordion-trigger"
+        className={cn(
+          "group/accordion-trigger relative flex flex-1 items-start justify-between rounded-md border border-transparent py-4 text-left text-sm font-medium transition-all outline-none hover:underline focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 focus-visible:after:border-ring aria-disabled:pointer-events-none aria-disabled:opacity-50 **:data-[slot=accordion-trigger-icon]:ml-auto **:data-[slot=accordion-trigger-icon]:size-4 **:data-[slot=accordion-trigger-icon]:text-muted-foreground",
+          className,
+        )}
+        {...props}
+      >
+        {children}
+        <ChevronDownIcon
+          data-slot="accordion-trigger-icon"
+          className="pointer-events-none shrink-0 group-aria-expanded/accordion-trigger:hidden"
+        />
+        <ChevronUpIcon
+          data-slot="accordion-trigger-icon"
+          className="pointer-events-none hidden shrink-0 group-aria-expanded/accordion-trigger:inline"
+        />
+      </AccordionPrimitive.Trigger>
+    </AccordionPrimitive.Header>
+  );
+}
+
+function AccordionContent({ className, children, ...props }: AccordionPrimitive.Panel.Props) {
+  return (
+    <AccordionPrimitive.Panel
+      data-slot="accordion-content"
+      className="overflow-hidden text-sm data-open:animate-accordion-down data-closed:animate-accordion-up"
+      {...props}
+    >
+      <div
+        className={cn(
+          "h-(--accordion-panel-height) pt-0 pb-4 data-ending-style:h-0 data-starting-style:h-0 [&_a]:underline [&_a]:underline-offset-3 [&_a]:hover:text-foreground [&_p:not(:last-child)]:mb-4",
+          className,
+        )}
+      >
+        {children}
+      </div>
+    </AccordionPrimitive.Panel>
+  );
+}
+
+export { Accordion, AccordionItem, AccordionTrigger, AccordionContent };
diff --git a/ui/litellm-dashboard/src/components/ui/attachment.tsx b/ui/litellm-dashboard/src/components/ui/attachment.tsx
new file mode 100644
index 00000000000..939843fad85
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/attachment.tsx
@@ -0,0 +1,185 @@
+import * as React from "react";
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
+import { cva, type VariantProps } from "class-variance-authority";
+import { cn } from "@/lib/cva.config";
+
+import { Button } from "@/components/ui/button";
+
+const attachmentVariants = cva(
+  "group/attachment relative flex w-fit max-w-full min-w-0 shrink-0 flex-wrap rounded-xl border bg-card text-card-foreground transition-colors focus-within:ring-1 focus-within:ring-ring/50 has-[>a,>button]:hover:bg-muted/50 data-[state=error]:border-destructive/30 data-[state=idle]:border-dashed",
+  {
+    variants: {
+      size: {
+        default:
+          "gap-2 text-sm has-data-[slot=attachment-content]:px-2.5 has-data-[slot=attachment-content]:py-2 has-data-[slot=attachment-media]:p-2",
+        sm: "gap-2.5 text-xs has-data-[slot=attachment-content]:px-2 has-data-[slot=attachment-content]:py-1.5 has-data-[slot=attachment-media]:p-1.5",
+        xs: "gap-1.5 rounded-lg text-xs has-data-[slot=attachment-content]:px-1.5 has-data-[slot=attachment-content]:py-1 has-data-[slot=attachment-media]:p-1",
+      },
+      orientation: {
+        horizontal: "min-w-40 items-center",
+        vertical: "w-24 flex-col has-data-[slot=attachment-content]:w-30",
+      },
+    },
+  },
+);
+
+function Attachment({
+  className,
+  state = "done",
+  size = "default",
+  orientation = "horizontal",
+  ...props
+}: React.ComponentProps<"div"> &
+  VariantProps<typeof attachmentVariants> & {
+    state?: "idle" | "uploading" | "processing" | "error" | "done";
+  }) {
+  return (
+    <div
+      data-slot="attachment"
+      data-state={state}
+      data-size={size}
+      data-orientation={orientation}
+      className={cn(attachmentVariants({ size, orientation }), className)}
+      {...props}
+    />
+  );
+}
+
+const attachmentMediaVariants = cva(
+  "relative flex aspect-square w-10 shrink-0 items-center justify-center overflow-hidden rounded-lg bg-muted text-foreground group-data-[orientation=vertical]/attachment:w-full group-data-[size=sm]/attachment:w-8 group-data-[size=xs]/attachment:w-7 group-data-[size=xs]/attachment:rounded-md group-data-[state=error]/attachment:bg-destructive/10 group-data-[state=error]/attachment:text-destructive group-data-[orientation=vertical]/attachment:*:data-[slot=spinner]:size-6! [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 group-data-[orientation=vertical]/attachment:[&_svg:not([class*='size-'])]:size-6 group-data-[size=xs]/attachment:[&_svg:not([class*='size-'])]:size-3.5",
+  {
+    variants: {
+      variant: {
+        icon: "",
+        image:
+          "opacity-60 group-data-[state=done]/attachment:opacity-100 group-data-[state=idle]/attachment:opacity-100 *:[img]:aspect-square *:[img]:w-full *:[img]:object-cover",
+      },
+    },
+    defaultVariants: {
+      variant: "icon",
+    },
+  },
+);
+
+function AttachmentMedia({
+  className,
+  variant = "icon",
+  ...props
+}: React.ComponentProps<"div"> & VariantProps<typeof attachmentMediaVariants>) {
+  return (
+    <div
+      data-slot="attachment-media"
+      data-variant={variant}
+      className={cn(attachmentMediaVariants({ variant }), className)}
+      {...props}
+    />
+  );
+}
+
+function AttachmentContent({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="attachment-content"
+      className={cn(
+        "max-w-full min-w-0 flex-1 leading-tight group-data-[orientation=vertical]/attachment:px-1",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function AttachmentTitle({ className, ...props }: React.ComponentProps<"span">) {
+  return (
+    <span
+      data-slot="attachment-title"
+      className={cn(
+        "block max-w-full min-w-0 truncate font-medium group-data-[state=processing]/attachment:shimmer group-data-[state=uploading]/attachment:shimmer",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function AttachmentDescription({ className, ...props }: React.ComponentProps<"span">) {
+  return (
+    <span
+      data-slot="attachment-description"
+      className={cn(
+        "mt-0.5 block min-w-0 truncate text-xs text-muted-foreground group-data-[state=error]/attachment:text-destructive/80",
+        "max-w-full",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function AttachmentActions({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="attachment-actions"
+      className={cn(
+        "relative z-20 flex shrink-0 items-center group-data-[orientation=vertical]/attachment:absolute group-data-[orientation=vertical]/attachment:top-3 group-data-[orientation=vertical]/attachment:right-3 group-data-[orientation=vertical]/attachment:gap-1",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function AttachmentAction({ className, variant, size = "icon-xs", ...props }: React.ComponentProps<typeof Button>) {
+  return (
+    <Button
+      data-slot="attachment-action"
+      variant={variant ?? "ghost"}
+      size={size}
+      className={cn(className)}
+      {...props}
+    />
+  );
+}
+
+function AttachmentTrigger({ className, render, type, ...props }: useRender.ComponentProps<"button">) {
+  return useRender({
+    defaultTagName: "button",
+    props: mergeProps<"button">(
+      {
+        type: render ? type : type ?? "button",
+        className: cn("absolute inset-0 z-10 outline-none", className),
+      },
+      props,
+    ),
+    render,
+    state: {
+      slot: "attachment-trigger",
+    },
+  });
+}
+
+function AttachmentGroup({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="attachment-group"
+      className={cn(
+        "flex min-w-0 scroll-fade-x snap-x snap-mandatory scroll-px-1 scrollbar-none gap-3 overflow-x-auto overscroll-x-contain py-1 *:data-[slot=attachment]:flex-none *:data-[slot=attachment]:snap-start",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export {
+  Attachment,
+  AttachmentGroup,
+  AttachmentMedia,
+  AttachmentContent,
+  AttachmentTitle,
+  AttachmentDescription,
+  AttachmentActions,
+  AttachmentAction,
+  AttachmentTrigger,
+};
diff --git a/ui/litellm-dashboard/src/components/ui/item.tsx b/ui/litellm-dashboard/src/components/ui/item.tsx
new file mode 100644
index 00000000000..a29d8ea75c8
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/item.tsx
@@ -0,0 +1,179 @@
+import * as React from "react";
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
+import { cva, type VariantProps } from "class-variance-authority";
+import { cn } from "@/lib/cva.config";
+
+import { Separator } from "@/components/ui/separator";
+
+function ItemGroup({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      role="list"
+      data-slot="item-group"
+      className={cn(
+        "group/item-group flex w-full flex-col gap-4 has-data-[size=sm]:gap-2.5 has-data-[size=xs]:gap-2",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function ItemSeparator({ className, ...props }: React.ComponentProps<typeof Separator>) {
+  return <Separator data-slot="item-separator" orientation="horizontal" className={cn("my-2", className)} {...props} />;
+}
+
+const itemVariants = cva(
+  "group/item flex w-full flex-wrap items-center rounded-md border text-sm transition-colors duration-100 outline-none focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 [a]:transition-colors [a]:hover:bg-muted",
+  {
+    variants: {
+      variant: {
+        default: "border-transparent",
+        outline: "border-border",
+        muted: "border-transparent bg-muted/50",
+      },
+      size: {
+        default: "gap-3.5 px-4 py-3.5",
+        sm: "gap-2.5 px-3 py-2.5",
+        xs: "gap-2 px-2.5 py-2 in-data-[slot=dropdown-menu-content]:p-0",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  },
+);
+
+function Item({
+  className,
+  variant = "default",
+  size = "default",
+  render,
+  ...props
+}: useRender.ComponentProps<"div"> & VariantProps<typeof itemVariants>) {
+  return useRender({
+    defaultTagName: "div",
+    props: mergeProps<"div">(
+      {
+        className: cn(itemVariants({ variant, size, className })),
+      },
+      props,
+    ),
+    render,
+    state: {
+      slot: "item",
+      variant,
+      size,
+    },
+  });
+}
+
+const itemMediaVariants = cva(
+  "flex shrink-0 items-center justify-center gap-2 group-has-data-[slot=item-description]/item:translate-y-0.5 group-has-data-[slot=item-description]/item:self-start [&_svg]:pointer-events-none",
+  {
+    variants: {
+      variant: {
+        default: "bg-transparent",
+        icon: "[&_svg:not([class*='size-'])]:size-4",
+        image:
+          "size-10 overflow-hidden rounded-sm group-data-[size=sm]/item:size-8 group-data-[size=xs]/item:size-6 [&_img]:size-full [&_img]:object-cover",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+    },
+  },
+);
+
+function ItemMedia({
+  className,
+  variant = "default",
+  ...props
+}: React.ComponentProps<"div"> & VariantProps<typeof itemMediaVariants>) {
+  return (
+    <div
+      data-slot="item-media"
+      data-variant={variant}
+      className={cn(itemMediaVariants({ variant, className }))}
+      {...props}
+    />
+  );
+}
+
+function ItemContent({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="item-content"
+      className={cn(
+        "flex flex-1 flex-col gap-1 group-data-[size=xs]/item:gap-0 [&+[data-slot=item-content]]:flex-none",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function ItemTitle({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="item-title"
+      className={cn(
+        "line-clamp-1 flex w-fit items-center gap-2 text-sm leading-snug font-medium underline-offset-4",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function ItemDescription({ className, ...props }: React.ComponentProps<"p">) {
+  return (
+    <p
+      data-slot="item-description"
+      className={cn(
+        "line-clamp-2 text-left text-sm leading-normal font-normal text-muted-foreground group-data-[size=xs]/item:text-xs [&>a]:underline [&>a]:underline-offset-4 [&>a:hover]:text-primary",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function ItemActions({ className, ...props }: React.ComponentProps<"div">) {
+  return <div data-slot="item-actions" className={cn("flex items-center gap-2", className)} {...props} />;
+}
+
+function ItemHeader({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="item-header"
+      className={cn("flex basis-full items-center justify-between gap-2", className)}
+      {...props}
+    />
+  );
+}
+
+function ItemFooter({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="item-footer"
+      className={cn("flex basis-full items-center justify-between gap-2", className)}
+      {...props}
+    />
+  );
+}
+
+export {
+  Item,
+  ItemMedia,
+  ItemContent,
+  ItemActions,
+  ItemGroup,
+  ItemSeparator,
+  ItemTitle,
+  ItemDescription,
+  ItemHeader,
+  ItemFooter,
+};
diff --git a/ui/litellm-dashboard/src/components/ui/kbd.tsx b/ui/litellm-dashboard/src/components/ui/kbd.tsx
new file mode 100644
index 00000000000..518a4f5f0ff
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/kbd.tsx
@@ -0,0 +1,20 @@
+import { cn } from "@/lib/cva.config";
+
+function Kbd({ className, ...props }: React.ComponentProps<"kbd">) {
+  return (
+    <kbd
+      data-slot="kbd"
+      className={cn(
+        "pointer-events-none inline-flex h-5 w-fit min-w-5 items-center justify-center gap-1 rounded-sm bg-muted px-1 font-sans text-xs font-medium text-muted-foreground select-none in-data-[slot=tooltip-content]:bg-background/20 in-data-[slot=tooltip-content]:text-background dark:in-data-[slot=tooltip-content]:bg-background/10 [&_svg:not([class*='size-'])]:size-3",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function KbdGroup({ className, ...props }: React.ComponentProps<"div">) {
+  return <kbd data-slot="kbd-group" className={cn("inline-flex items-center gap-1", className)} {...props} />;
+}
+
+export { Kbd, KbdGroup };
diff --git a/ui/litellm-dashboard/src/components/ui/marker.tsx b/ui/litellm-dashboard/src/components/ui/marker.tsx
new file mode 100644
index 00000000000..731507ae582
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/marker.tsx
@@ -0,0 +1,67 @@
+import * as React from "react";
+import { mergeProps } from "@base-ui/react/merge-props";
+import { useRender } from "@base-ui/react/use-render";
+import { cva, type VariantProps } from "class-variance-authority";
+import { cn } from "@/lib/cva.config";
+
+const markerVariants = cva(
+  "group/marker relative flex min-h-4 w-full items-center gap-2 text-left text-sm text-muted-foreground [&_svg:not([class*='size-'])]:size-4 [a]:underline [a]:underline-offset-3 [a]:hover:text-foreground",
+  {
+    variants: {
+      variant: {
+        default: "",
+        separator:
+          "before:mr-1 before:h-px before:min-w-0 before:flex-1 before:bg-border after:ml-1 after:h-px after:min-w-0 after:flex-1 after:bg-border",
+        border: "border-b border-border pb-2",
+      },
+    },
+  },
+);
+
+function Marker({
+  className,
+  variant = "default",
+  render,
+  ...props
+}: useRender.ComponentProps<"div"> & VariantProps<typeof markerVariants>) {
+  return useRender({
+    defaultTagName: "div",
+    props: mergeProps<"div">(
+      {
+        className: cn(markerVariants({ variant, className })),
+      },
+      props,
+    ),
+    render,
+    state: {
+      slot: "marker",
+      variant,
+    },
+  });
+}
+
+function MarkerIcon({ className, ...props }: React.ComponentProps<"span">) {
+  return (
+    <span
+      data-slot="marker-icon"
+      aria-hidden="true"
+      className={cn("size-4 shrink-0 [&_svg:not([class*='size-'])]:size-4", className)}
+      {...props}
+    />
+  );
+}
+
+function MarkerContent({ className, ...props }: React.ComponentProps<"span">) {
+  return (
+    <span
+      data-slot="marker-content"
+      className={cn(
+        "min-w-0 wrap-break-word group-data-[variant=separator]/marker:flex-none group-data-[variant=separator]/marker:text-center *:[a]:underline *:[a]:underline-offset-3 *:[a]:hover:text-foreground",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export { Marker, MarkerIcon, MarkerContent, markerVariants };
diff --git a/ui/litellm-dashboard/src/components/ui/message-scroller.tsx b/ui/litellm-dashboard/src/components/ui/message-scroller.tsx
new file mode 100644
index 00000000000..f8e64a81262
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/message-scroller.tsx
@@ -0,0 +1,117 @@
+"use client";
+
+import * as React from "react";
+import {
+  MessageScroller as MessageScrollerPrimitive,
+  useMessageScroller,
+  useMessageScrollerScrollable,
+  useMessageScrollerVisibility,
+} from "@shadcn/react/message-scroller";
+import { cn } from "@/lib/cva.config";
+
+import { Button } from "@/components/ui/button";
+import { ArrowDownIcon } from "lucide-react";
+
+function MessageScrollerProvider(props: React.ComponentProps<typeof MessageScrollerPrimitive.Provider>) {
+  return <MessageScrollerPrimitive.Provider {...props} />;
+}
+
+function MessageScroller({ className, ...props }: React.ComponentProps<typeof MessageScrollerPrimitive.Root>) {
+  return (
+    <MessageScrollerPrimitive.Root
+      data-slot="message-scroller"
+      className={cn("group/message-scroller relative flex size-full min-h-0 flex-col overflow-hidden", className)}
+      {...props}
+    />
+  );
+}
+
+function MessageScrollerViewport({
+  className,
+  ...props
+}: React.ComponentProps<typeof MessageScrollerPrimitive.Viewport>) {
+  return (
+    <MessageScrollerPrimitive.Viewport
+      data-slot="message-scroller-viewport"
+      className={cn(
+        "size-full min-h-0 min-w-0 scroll-fade-b scrollbar-thin scrollbar-gutter-stable overflow-y-auto overscroll-contain contain-content data-autoscrolling:scrollbar-thumb-transparent data-autoscrolling:scrollbar-track-transparent data-pending-scroll:invisible",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function MessageScrollerContent({
+  className,
+  ...props
+}: React.ComponentProps<typeof MessageScrollerPrimitive.Content>) {
+  return (
+    <MessageScrollerPrimitive.Content
+      data-slot="message-scroller-content"
+      className={cn("flex h-max min-h-full flex-col gap-8", className)}
+      {...props}
+    />
+  );
+}
+
+function MessageScrollerItem({
+  className,
+  scrollAnchor = false,
+  ...props
+}: React.ComponentProps<typeof MessageScrollerPrimitive.Item>) {
+  return (
+    <MessageScrollerPrimitive.Item
+      data-slot="message-scroller-item"
+      scrollAnchor={scrollAnchor}
+      className={cn("min-w-0 shrink-0 [contain-intrinsic-size:auto_10rem] [content-visibility:auto]", className)}
+      {...props}
+    />
+  );
+}
+
+function MessageScrollerButton({
+  direction = "end",
+  className,
+  children,
+  render,
+  variant = "secondary",
+  size = "icon-sm",
+  ...props
+}: React.ComponentProps<typeof MessageScrollerPrimitive.Button> &
+  Pick<React.ComponentProps<typeof Button>, "variant" | "size">) {
+  return (
+    <MessageScrollerPrimitive.Button
+      data-slot="message-scroller-button"
+      data-direction={direction}
+      data-variant={variant}
+      data-size={size}
+      direction={direction}
+      className={cn(
+        "absolute inset-s-1/2 -translate-x-1/2 border-border bg-background text-foreground transition-[translate,scale,opacity] duration-200 hover:bg-muted hover:text-foreground data-[active=false]:pointer-events-none data-[active=false]:scale-95 data-[active=false]:opacity-0 data-[active=false]:duration-400 data-[active=false]:ease-[cubic-bezier(0.7,0,0.84,0)] data-[active=true]:translate-y-0 data-[active=true]:scale-100 data-[active=true]:opacity-100 data-[active=true]:ease-[cubic-bezier(0.23,1,0.32,1)] data-[direction=end]:bottom-4 data-[direction=end]:data-[active=false]:translate-y-full data-[direction=start]:top-4 data-[direction=start]:data-[active=false]:-translate-y-full rtl:translate-x-1/2 data-[direction=start]:[&_svg]:rotate-180",
+        className,
+      )}
+      render={render ?? <Button variant={variant} size={size} />}
+      {...props}
+    >
+      {children ?? (
+        <>
+          <ArrowDownIcon />
+          <span className="sr-only">{direction === "end" ? "Scroll to end" : "Scroll to start"}</span>
+        </>
+      )}
+    </MessageScrollerPrimitive.Button>
+  );
+}
+
+export {
+  MessageScrollerProvider,
+  MessageScroller,
+  MessageScrollerViewport,
+  MessageScrollerContent,
+  MessageScrollerItem,
+  MessageScrollerButton,
+  useMessageScroller,
+  useMessageScrollerScrollable,
+  useMessageScrollerVisibility,
+};
diff --git a/ui/litellm-dashboard/src/components/ui/message.tsx b/ui/litellm-dashboard/src/components/ui/message.tsx
new file mode 100644
index 00000000000..a0beaffc4a1
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/message.tsx
@@ -0,0 +1,74 @@
+import * as React from "react";
+import { cn } from "@/lib/cva.config";
+
+function MessageGroup({ className, ...props }: React.ComponentProps<"div">) {
+  return <div data-slot="message-group" className={cn("flex min-w-0 flex-col gap-2", className)} {...props} />;
+}
+
+function Message({ className, align = "start", ...props }: React.ComponentProps<"div"> & { align?: "start" | "end" }) {
+  return (
+    <div
+      data-slot="message"
+      data-align={align}
+      className={cn(
+        "group/message relative flex w-full min-w-0 gap-2 text-sm data-[align=end]:flex-row-reverse",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function MessageAvatar({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="message-avatar"
+      className={cn(
+        "flex w-fit min-w-8 shrink-0 items-center justify-center self-end overflow-hidden rounded-full bg-muted group-has-data-[slot=message-footer]/message:-translate-y-8",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function MessageContent({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="message-content"
+      className={cn(
+        "flex w-full min-w-0 flex-col gap-2.5 wrap-break-word group-data-[align=end]/message:*:data-slot:self-end",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function MessageHeader({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="message-header"
+      className={cn(
+        "flex max-w-full min-w-0 items-center px-3 text-xs font-medium text-muted-foreground group-has-data-[variant=ghost]/message:px-0",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+function MessageFooter({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="message-footer"
+      className={cn(
+        "flex max-w-full min-w-0 items-center px-3 text-xs font-medium text-muted-foreground group-has-data-[variant=ghost]/message:px-0 group-data-[align=end]/message:justify-end",
+        className,
+      )}
+      {...props}
+    />
+  );
+}
+
+export { MessageGroup, Message, MessageAvatar, MessageContent, MessageFooter, MessageHeader };
diff --git a/ui/litellm-dashboard/src/components/ui/spinner.tsx b/ui/litellm-dashboard/src/components/ui/spinner.tsx
new file mode 100644
index 00000000000..4d7c373863b
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/spinner.tsx
@@ -0,0 +1,16 @@
+import { cn } from "@/lib/cva.config";
+import { Loader2Icon } from "lucide-react";
+
+function Spinner({ className, ...props }: React.ComponentProps<"svg">) {
+  return (
+    <Loader2Icon
+      data-slot="spinner"
+      role="status"
+      aria-label="Loading"
+      className={cn("size-4 animate-spin", className)}
+      {...props}
+    />
+  );
+}
+
+export { Spinner };
diff --git a/ui/litellm-dashboard/src/components/ui/toggle-group.tsx b/ui/litellm-dashboard/src/components/ui/toggle-group.tsx
new file mode 100644
index 00000000000..912ca1fb123
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/toggle-group.tsx
@@ -0,0 +1,87 @@
+"use client";
+
+import * as React from "react";
+import { Toggle as TogglePrimitive } from "@base-ui/react/toggle";
+import { ToggleGroup as ToggleGroupPrimitive } from "@base-ui/react/toggle-group";
+import { type VariantProps } from "class-variance-authority";
+import { cn } from "@/lib/cva.config";
+
+import { toggleVariants } from "@/components/ui/toggle";
+
+const ToggleGroupContext = React.createContext<
+  VariantProps<typeof toggleVariants> & {
+    spacing?: number;
+    orientation?: "horizontal" | "vertical";
+  }
+>({
+  size: "default",
+  variant: "default",
+  spacing: 2,
+  orientation: "horizontal",
+});
+
+function ToggleGroup({
+  className,
+  variant,
+  size,
+  spacing = 2,
+  orientation = "horizontal",
+  children,
+  ...props
+}: ToggleGroupPrimitive.Props &
+  VariantProps<typeof toggleVariants> & {
+    spacing?: number;
+    orientation?: "horizontal" | "vertical";
+  }) {
+  return (
+    <ToggleGroupPrimitive
+      data-slot="toggle-group"
+      data-variant={variant}
+      data-size={size}
+      data-spacing={spacing}
+      data-orientation={orientation}
+      style={{ "--gap": spacing } as React.CSSProperties}
+      className={cn(
+        "group/toggle-group flex w-fit flex-row items-center gap-[--spacing(var(--gap))] rounded-md data-[spacing=0]:data-[variant=outline]:shadow-xs data-vertical:flex-col data-vertical:items-stretch",
+        className,
+      )}
+      {...props}
+    >
+      <ToggleGroupContext.Provider value={{ variant, size, spacing, orientation }}>
+        {children}
+      </ToggleGroupContext.Provider>
+    </ToggleGroupPrimitive>
+  );
+}
+
+function ToggleGroupItem({
+  className,
+  children,
+  variant = "default",
+  size = "default",
+  ...props
+}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {
+  const context = React.useContext(ToggleGroupContext);
+
+  return (
+    <TogglePrimitive
+      data-slot="toggle-group-item"
+      data-variant={context.variant || variant}
+      data-size={context.size || size}
+      data-spacing={context.spacing}
+      className={cn(
+        "shrink-0 group-data-[spacing=0]/toggle-group:rounded-none group-data-[spacing=0]/toggle-group:px-2 group-data-[spacing=0]/toggle-group:shadow-none focus:z-10 focus-visible:z-10 group-data-[spacing=0]/toggle-group:has-data-[icon=inline-end]:pr-1.5 group-data-[spacing=0]/toggle-group:has-data-[icon=inline-start]:pl-1.5 group-data-horizontal/toggle-group:data-[spacing=0]:first:rounded-l-md group-data-vertical/toggle-group:data-[spacing=0]:first:rounded-t-md group-data-horizontal/toggle-group:data-[spacing=0]:last:rounded-r-md group-data-vertical/toggle-group:data-[spacing=0]:last:rounded-b-md data-[state=on]:bg-muted group-data-horizontal/toggle-group:data-[spacing=0]:data-[variant=outline]:border-l-0 group-data-vertical/toggle-group:data-[spacing=0]:data-[variant=outline]:border-t-0 group-data-horizontal/toggle-group:data-[spacing=0]:data-[variant=outline]:first:border-l group-data-vertical/toggle-group:data-[spacing=0]:data-[variant=outline]:first:border-t",
+        toggleVariants({
+          variant: context.variant || variant,
+          size: context.size || size,
+        }),
+        className,
+      )}
+      {...props}
+    >
+      {children}
+    </TogglePrimitive>
+  );
+}
+
+export { ToggleGroup, ToggleGroupItem };
diff --git a/ui/litellm-dashboard/src/components/ui/toggle.tsx b/ui/litellm-dashboard/src/components/ui/toggle.tsx
new file mode 100644
index 00000000000..8d99074c73d
--- /dev/null
+++ b/ui/litellm-dashboard/src/components/ui/toggle.tsx
@@ -0,0 +1,37 @@
+"use client";
+
+import { Toggle as TogglePrimitive } from "@base-ui/react/toggle";
+import { cva, type VariantProps } from "class-variance-authority";
+import { cn } from "@/lib/cva.config";
+
+const toggleVariants = cva(
+  "group/toggle inline-flex items-center justify-center gap-1 rounded-md text-sm font-medium whitespace-nowrap transition-[color,box-shadow] outline-none hover:bg-muted hover:text-foreground focus-visible:border-ring focus-visible:ring-[3px] focus-visible:ring-ring/50 disabled:pointer-events-none disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20 aria-pressed:bg-muted dark:aria-invalid:ring-destructive/40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
+  {
+    variants: {
+      variant: {
+        default: "bg-transparent",
+        outline: "border border-input bg-transparent shadow-xs hover:bg-muted",
+      },
+      size: {
+        default: "h-9 min-w-9 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
+        sm: "h-8 min-w-8 px-2.5 has-data-[icon=inline-end]:pr-1.5 has-data-[icon=inline-start]:pl-1.5",
+        lg: "h-10 min-w-10 px-2.5 has-data-[icon=inline-end]:pr-2 has-data-[icon=inline-start]:pl-2",
+      },
+    },
+    defaultVariants: {
+      variant: "default",
+      size: "default",
+    },
+  },
+);
+
+function Toggle({
+  className,
+  variant = "default",
+  size = "default",
+  ...props
+}: TogglePrimitive.Props & VariantProps<typeof toggleVariants>) {
+  return <TogglePrimitive data-slot="toggle" className={cn(toggleVariants({ variant, size, className }))} {...props} />;
+}
+
+export { Toggle, toggleVariants };
diff --git a/ui/litellm-dashboard/src/lib/http/observeResponseHeaders.ts b/ui/litellm-dashboard/src/lib/http/observeResponseHeaders.ts
new file mode 100644
index 00000000000..9f22086d746
--- /dev/null
+++ b/ui/litellm-dashboard/src/lib/http/observeResponseHeaders.ts
@@ -0,0 +1,9 @@
+export type ResponseHeadersListener = (headers: Headers) => void;
+
+export const observeResponseHeaders =
+  (onHeaders: ResponseHeadersListener): typeof fetch =>
+  async (input, init) => {
+    const response = await fetch(input, init);
+    onHeaders(response.headers);
+    return response;
+  };
diff --git a/ui/litellm-dashboard/src/lib/http/schema.d.ts b/ui/litellm-dashboard/src/lib/http/schema.d.ts
index 6f6eae1f98e..7fae3437f22 100644
--- a/ui/litellm-dashboard/src/lib/http/schema.d.ts
+++ b/ui/litellm-dashboard/src/lib/http/schema.d.ts
@@ -26991,6 +26991,12 @@ export interface components {
              * @default true
              */
             fail_on_error: boolean | null;
+            /**
+             * Forward Messages As Sent
+             * @description Only honored by guardrail='generic_guardrail_api'. When True, structured_messages reaches the guardrail exactly as the client sent it, so rows can carry provider-native content blocks and keys the OpenAI chat types do not declare. Default False sends OpenAI-format chat rows with undeclared keys removed.
+             * @default false
+             */
+            forward_messages_as_sent: boolean | null;
             /**
              * Guard Name
              * @description Name of the guardrail in guardrails.ai
@@ -27480,8 +27486,10 @@ export interface components {
         };
         /** Body_token_endpoint__mcp_server_name__token_post */
         Body_token_endpoint__mcp_server_name__token_post: {
+            /** Assertion */
+            assertion?: string | null;
             /** Client Id */
-            client_id: string;
+            client_id?: string | null;
             /** Client Secret */
             client_secret?: string | null;
             /** Code */
@@ -27507,8 +27515,10 @@ export interface components {
         };
         /** Body_token_endpoint_token_post */
         Body_token_endpoint_token_post: {
+            /** Assertion */
+            assertion?: string | null;
             /** Client Id */
-            client_id: string;
+            client_id?: string | null;
             /** Client Secret */
             client_secret?: string | null;
             /** Code */
@@ -35315,6 +35325,8 @@ export interface components {
             regional_processing_uplift_multiplier_eu?: number | null;
             /** Regional Processing Uplift Multiplier Us */
             regional_processing_uplift_multiplier_us?: number | null;
+            /** Responses Api Version */
+            responses_api_version?: string | null;
             /** Rpm */
             rpm?: number | null;
             /** S3 Access Key Id */
@@ -36467,6 +36479,12 @@ export interface components {
              * @description HTTP timeout in seconds for checking attached files. Default: 10.
              */
             file_guardrail_timeout?: number | null;
+            /**
+             * Forward Messages As Sent
+             * @description Only honored by guardrail='generic_guardrail_api'. When True, structured_messages reaches the guardrail exactly as the client sent it, so rows can carry provider-native content blocks and keys the OpenAI chat types do not declare. Default False sends OpenAI-format chat rows with undeclared keys removed.
+             * @default false
+             */
+            forward_messages_as_sent: boolean | null;
             /**
              * Gateway Name
              * @description noma_v2 only: name of this gateway, used as the gateway_host label on Noma scans
@@ -37288,6 +37306,8 @@ export interface components {
             id_jag_resource_client_secret?: string | null;
             /** Id Jag Resource Token Endpoint */
             id_jag_resource_token_endpoint?: string | null;
+            /** Id Jag Subject Source */
+            id_jag_subject_source?: string | null;
             /** Redirect Uris */
             redirect_uris?: string[] | null;
             /** Scopes */
@@ -49923,6 +49943,8 @@ export interface components {
             blocked?: boolean | null;
             /** Cache Creation Input Token Cost */
             cache_creation_input_token_cost?: number | null;
+            /** Cache Creation Input Token Cost Above 1Hr */
+            cache_creation_input_token_cost_above_1hr?: number | null;
             /** Cache Read Input Token Cost */
             cache_read_input_token_cost?: number | null;
             /** Cost Per Ptu Per Hour */
@@ -50530,6 +50552,8 @@ export interface components {
             regional_processing_uplift_multiplier_eu?: number | null;
             /** Regional Processing Uplift Multiplier Us */
             regional_processing_uplift_multiplier_us?: number | null;
+            /** Responses Api Version */
+            responses_api_version?: string | null;
             /** Rpm */
             rpm?: number | null;
             /** S3 Access Key Id */
diff --git a/uv.lock b/uv.lock
index 922f00b9a1d..d473444177d 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1145,19 +1145,22 @@ wheels = [
 
 [[package]]
 name = "claude-agent-sdk"
-version = "0.1.44"
+version = "0.2.165"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyio" },
+    { name = "jsonschema" },
     { name = "mcp" },
+    { name = "sniffio" },
     { name = "typing-extensions", marker = "python_full_version < '3.11'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/30/40/5661e10daf69ee5c864f82a1888cc33c9378b2d7f7d11db3c2360aef3a30/claude_agent_sdk-0.1.44.tar.gz", hash = "sha256:8629436e7af367a1cbc81aa2a58a93aa68b8b2e4e14b0c5be5ac3627bd462c1b", size = 62439, upload-time = "2026-02-26T01:17:28.118Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7f/45/10f00a408b480926b5e340e3507562ede1e30d4ce5b73eea9ccc3468a9e6/claude_agent_sdk-0.2.165.tar.gz", hash = "sha256:1bfa8e7a6bb36e82de9a12324c9bcfa6eebd4f96ee5890f0c656d50445240ff8", size = 365169, upload-time = "2026-10-08T18:18:49.528Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e9/1a/dcde83a6477bfdf8c5510fd84006cca763296e6bc5576e90cd89b97ec034/claude_agent_sdk-0.1.44-py3-none-macosx_11_0_arm64.whl", hash = "sha256:1dd976ad3efb673aefd5037dc75ee7926fb5033c4b9ab7382897ab647fed74e6", size = 55828889, upload-time = "2026-02-26T01:17:15.474Z" },
-    { url = "https://files.pythonhosted.org/packages/4b/33/3b161256956968e18c81e2b2650fed7d2a1144d51042ed6317848643e5d7/claude_agent_sdk-0.1.44-py3-none-manylinux_2_17_aarch64.whl", hash = "sha256:d35b38ca40fa28f50fa88705599a298ab30c121c56b53655025eeceb463ac399", size = 70795212, upload-time = "2026-02-26T01:17:18.873Z" },
-    { url = "https://files.pythonhosted.org/packages/17/cb/67af9796dad77a94dfe851138f5ffc9e2e0a14407ba55fea07462c1cc8e5/claude_agent_sdk-0.1.44-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:853c15501f71a913a6cc6b40dc0b24b9505166cad164206b8eab229889e670b8", size = 71424685, upload-time = "2026-02-26T01:17:22.345Z" },
-    { url = "https://files.pythonhosted.org/packages/46/cd/2d3806c791250a76de2c1be863fc01d420729ad61496253e3d3033464c72/claude_agent_sdk-0.1.44-py3-none-win_amd64.whl", hash = "sha256:597e2fcad372086f93e4f6a380d3088ec4dd9b9efce309c5281b52a256fd5d25", size = 73493771, upload-time = "2026-02-26T01:17:25.837Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/a7/a7226ae5e7fa3f225d99a0acf12ee354c4af9c953661f66bbcd424e48853/claude_agent_sdk-0.2.165-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7f7017bb59eaf77b9a7c7ce3b9ed2c8a397b8201c8630f011bb1b955290f06e4", size = 97973182, upload-time = "2026-10-08T18:18:56.039Z" },
+    { url = "https://files.pythonhosted.org/packages/5c/9d/1eaa82f8dbafa63a3fb26aabc088be307c4977438269cc6cb10056a32e99/claude_agent_sdk-0.2.165-py3-none-macosx_11_0_x86_64.whl", hash = "sha256:f4b5c6f536062e3af72357b1235f05ad4513230a32a3c639341a91a607d2df1e", size = 102479136, upload-time = "2026-10-08T18:19:01.908Z" },
+    { url = "https://files.pythonhosted.org/packages/40/4a/93fe172811bcd7704c4c4776d5eed1bb1881ba440d86e0f8e5cbbec0dca9/claude_agent_sdk-0.2.165-py3-none-manylinux_2_17_aarch64.whl", hash = "sha256:46a47e1e1075a8f2b7976f6bd5aa06c5610cb322c47cdc5b728fb25d02691164", size = 107447420, upload-time = "2026-10-08T18:19:09.571Z" },
+    { url = "https://files.pythonhosted.org/packages/57/81/a0d3ff04ae7045218566b36d1c78729c3fc7550877e154697f263ac5122e/claude_agent_sdk-0.2.165-py3-none-manylinux_2_17_x86_64.whl", hash = "sha256:9dbee4bfc69f0bb27ee455afdc19d78f958540a99217d2e28831fb9b7d496f08", size = 107800988, upload-time = "2026-10-08T18:19:16.24Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/d8/1685e8fc14bae5b9cbcfd6f4f6ca8b7ae8fd497a8bbf9c108978dd98620b/claude_agent_sdk-0.2.165-py3-none-win_amd64.whl", hash = "sha256:cf41dc1b1019bc7321b695d621fc94e6d8982c095cfb7d433d5c293e356a2404", size = 110401968, upload-time = "2026-10-08T18:19:24.136Z" },
 ]
 
 [[package]]
@@ -4880,7 +4883,7 @@ ci = [
     { name = "assemblyai", specifier = "==0.52.4" },
     { name = "beautifulsoup4", specifier = "==4.14.3" },
     { name = "blockbuster", specifier = "==1.5.26" },
-    { name = "claude-agent-sdk", specifier = "==0.1.44" },
+    { name = "claude-agent-sdk", specifier = "==0.2.165" },
     { name = "detect-secrets", specifier = "==1.5.0" },
     { name = "google-cloud-speech", specifier = "==2.40.0" },
     { name = "google-generativeai", specifier = "==0.8.6" },